зеркало из https://github.com/github/ruby.git
r18455 reverted.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr
Родитель
1bca9ada54
Коммит
94dc1e0b4a
|
|
@ -30,12 +30,6 @@ Sat Aug 9 21:10:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
|||
* configure.in (rb_cv_rshift_sign, rb_cv_binary_elf): get rid of
|
||||
AC_TRY_RUN.
|
||||
|
||||
Sat Aug 9 19:28:50 2008 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* transcode.c (transcode_char_start): arguments changed.
|
||||
(transcode_restartable): arguments changed to avoid *in_pos points
|
||||
out of buffer by decreasing *in_pos.
|
||||
|
||||
Sat Aug 9 16:33:21 2008 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* transcode_data.h (rb_transcoding): new fields: next_info and next_byte.
|
||||
|
|
|
|||
179
transcode.c
179
transcode.c
|
|
@ -328,20 +328,20 @@ output_replacement_character(unsigned char **out_pp, rb_encoding *enc)
|
|||
|
||||
static const unsigned char *
|
||||
transcode_char_start(rb_transcoding *my_transcoding,
|
||||
const unsigned char *in_start,
|
||||
ssize_t char_start,
|
||||
ssize_t pos)
|
||||
const unsigned char **in_pos,
|
||||
const unsigned char *in_p,
|
||||
int readlen)
|
||||
{
|
||||
const unsigned char *ptr;
|
||||
if (char_start < 0) {
|
||||
/* -char_start == my_transcoding->readlen */
|
||||
int restlen = pos-char_start - my_transcoding->readlen;
|
||||
if (in_p - *in_pos < readlen) {
|
||||
int restlen = readlen - my_transcoding->readlen;
|
||||
MEMCPY(TRANSCODING_READBUF(my_transcoding) + my_transcoding->readlen,
|
||||
in_start, unsigned char, restlen);
|
||||
in_p - restlen, unsigned char, restlen);
|
||||
my_transcoding->readlen = readlen;
|
||||
ptr = TRANSCODING_READBUF(my_transcoding);
|
||||
}
|
||||
else {
|
||||
ptr = in_start + char_start;
|
||||
ptr = in_p - readlen;
|
||||
}
|
||||
return ptr;
|
||||
}
|
||||
|
|
@ -355,67 +355,61 @@ typedef enum {
|
|||
} transcode_result_t;
|
||||
|
||||
static transcode_result_t
|
||||
transcode_restartable(rb_transcoding *tc,
|
||||
const unsigned char *in_start,
|
||||
const unsigned char *in_stop,
|
||||
ssize_t *in_moved_ret,
|
||||
unsigned char **out_pos,
|
||||
unsigned char *out_stop,
|
||||
transcode_restartable(const unsigned char **in_pos, unsigned char **out_pos,
|
||||
const unsigned char *in_stop, unsigned char *out_stop,
|
||||
rb_transcoding *my_transcoding,
|
||||
const int opt)
|
||||
|
||||
{
|
||||
const rb_transcoder *tr = tc->transcoder;
|
||||
int unitlen = tr->input_unit_length;
|
||||
|
||||
ssize_t char_start;
|
||||
ssize_t pos;
|
||||
size_t in_size;
|
||||
const rb_transcoder *my_transcoder = my_transcoding->transcoder;
|
||||
int unitlen = my_transcoder->input_unit_length;
|
||||
|
||||
const unsigned char *in_p;
|
||||
unsigned char *out_p;
|
||||
|
||||
unsigned char empty_buf;
|
||||
unsigned char *empty_ptr = &empty_buf;
|
||||
|
||||
int readlen;
|
||||
const BYTE_LOOKUP *next_table;
|
||||
VALUE next_info;
|
||||
unsigned char next_byte;
|
||||
|
||||
if (!in_start)
|
||||
in_start = in_stop = empty_ptr;
|
||||
char_start = -tc->readlen;
|
||||
pos = 0;
|
||||
in_size = in_stop - in_start;
|
||||
unsigned char empty_buf;
|
||||
unsigned char *empty_ptr = &empty_buf;
|
||||
|
||||
if (!in_pos) {
|
||||
in_pos = (const unsigned char **)&empty_ptr;
|
||||
in_stop = empty_ptr;
|
||||
}
|
||||
|
||||
if (!out_pos) {
|
||||
out_pos = &empty_ptr;
|
||||
out_stop = empty_ptr;
|
||||
}
|
||||
out_p = *out_pos;
|
||||
|
||||
next_table = tc->next_table;
|
||||
next_info = tc->next_info;
|
||||
next_byte = tc->next_byte;
|
||||
in_p = *in_pos;
|
||||
out_p = *out_pos;
|
||||
readlen = my_transcoding->readlen;
|
||||
next_table = my_transcoding->next_table;
|
||||
next_info = my_transcoding->next_info;
|
||||
next_byte = my_transcoding->next_byte;
|
||||
|
||||
#define SUSPEND(ret, num) \
|
||||
do { \
|
||||
tc->resume_position = (num); \
|
||||
if (tc->readlen < pos-char_start) \
|
||||
MEMCPY(TRANSCODING_READBUF(tc)+tc->readlen, \
|
||||
in_start+(char_start+tc->readlen), \
|
||||
my_transcoding->resume_position = (num); \
|
||||
if (my_transcoding->readlen < readlen) \
|
||||
MEMCPY(TRANSCODING_READBUF(my_transcoding)+my_transcoding->readlen, \
|
||||
in_p - (readlen-my_transcoding->readlen), \
|
||||
unsigned char, \
|
||||
pos-char_start - tc->readlen); \
|
||||
readlen-my_transcoding->readlen); \
|
||||
*in_pos = in_p; \
|
||||
*out_pos = out_p; \
|
||||
tc->readlen = pos-char_start; \
|
||||
tc->next_table = next_table; \
|
||||
tc->next_info = next_info; \
|
||||
tc->next_byte = next_byte; \
|
||||
if (in_moved_ret) \
|
||||
*in_moved_ret = pos; \
|
||||
my_transcoding->readlen = readlen; \
|
||||
my_transcoding->next_table = next_table; \
|
||||
my_transcoding->next_info = next_info; \
|
||||
my_transcoding->next_byte = next_byte; \
|
||||
return ret; \
|
||||
resume_label ## num:; \
|
||||
} while (0)
|
||||
|
||||
switch (tc->resume_position) {
|
||||
switch (my_transcoding->resume_position) {
|
||||
case 0: break;
|
||||
case 1: goto resume_label1;
|
||||
case 2: goto resume_label2;
|
||||
|
|
@ -434,18 +428,17 @@ transcode_restartable(rb_transcoding *tc,
|
|||
}
|
||||
|
||||
while (1) {
|
||||
if (in_size <= pos) {
|
||||
if (in_stop <= in_p) {
|
||||
if (!(opt & PARTIAL_INPUT))
|
||||
break;
|
||||
SUSPEND(transcode_ibuf_empty, 7);
|
||||
continue;
|
||||
}
|
||||
|
||||
tc->readlen = 0;
|
||||
char_start = pos;
|
||||
next_table = tr->conv_tree_start;
|
||||
next_byte = (unsigned char)in_start[pos];
|
||||
pos++;
|
||||
my_transcoding->readlen = readlen = 0;
|
||||
next_table = my_transcoder->conv_tree_start;
|
||||
next_byte = (unsigned char)*in_p++;
|
||||
readlen++;
|
||||
follow_byte:
|
||||
if (next_byte < next_table->base[0] || next_table->base[1] < next_byte)
|
||||
next_info = INVALID;
|
||||
|
|
@ -461,13 +454,13 @@ transcode_restartable(rb_transcoding *tc,
|
|||
continue;
|
||||
case 0x00: case 0x04: case 0x08: case 0x0C:
|
||||
case 0x10: case 0x14: case 0x18: case 0x1C:
|
||||
while (in_size <= pos) {
|
||||
while (in_p >= in_stop) {
|
||||
if (!(opt & PARTIAL_INPUT))
|
||||
goto invalid;
|
||||
SUSPEND(transcode_ibuf_empty, 5);
|
||||
}
|
||||
next_byte = (unsigned char)in_start[pos];
|
||||
pos++;
|
||||
next_byte = (unsigned char)*in_p++;
|
||||
readlen++;
|
||||
next_table = (const BYTE_LOOKUP *)next_info;
|
||||
goto follow_byte;
|
||||
case ZERObt: /* drop input */
|
||||
|
|
@ -495,42 +488,58 @@ transcode_restartable(rb_transcoding *tc,
|
|||
*out_p++ = getBT3(next_info);
|
||||
continue;
|
||||
case FUNii:
|
||||
next_info = (VALUE)(*tr->func_ii)(tc, next_info);
|
||||
next_info = (VALUE)(*my_transcoder->func_ii)(my_transcoding, next_info);
|
||||
goto follow_info;
|
||||
case FUNsi:
|
||||
{
|
||||
const unsigned char *char_start_ptr;
|
||||
char_start_ptr = transcode_char_start(tc, in_start, char_start, pos);
|
||||
next_info = (VALUE)(*tr->func_si)(tc, char_start_ptr, (size_t)(pos-char_start));
|
||||
const unsigned char *char_start;
|
||||
char_start = transcode_char_start(my_transcoding, in_pos, in_p, readlen);
|
||||
next_info = (VALUE)(*my_transcoder->func_si)(my_transcoding, char_start, (size_t)readlen);
|
||||
break;
|
||||
}
|
||||
case FUNio:
|
||||
while (out_stop - out_p < tr->max_output) { SUSPEND(transcode_obuf_full, 13); }
|
||||
out_p += (VALUE)(*tr->func_io)(tc, next_info, out_p);
|
||||
while (out_stop - out_p < my_transcoder->max_output) { SUSPEND(transcode_obuf_full, 13); }
|
||||
out_p += (VALUE)(*my_transcoder->func_io)(my_transcoding, next_info, out_p);
|
||||
break;
|
||||
case FUNso:
|
||||
{
|
||||
const unsigned char *char_start_ptr;
|
||||
while (out_stop - out_p < tr->max_output) { SUSPEND(transcode_obuf_full, 14); }
|
||||
char_start_ptr = transcode_char_start(tc, in_start, char_start, pos);
|
||||
out_p += (VALUE)(*tr->func_so)(tc, char_start_ptr, (size_t)(pos-char_start), out_p);
|
||||
const unsigned char *char_start;
|
||||
while (out_stop - out_p < my_transcoder->max_output) { SUSPEND(transcode_obuf_full, 14); }
|
||||
char_start = transcode_char_start(my_transcoding, in_pos, in_p, readlen);
|
||||
out_p += (VALUE)(*my_transcoder->func_so)(my_transcoding, char_start, (size_t)readlen, out_p);
|
||||
break;
|
||||
}
|
||||
case INVALID:
|
||||
if (pos-char_start <= unitlen) {
|
||||
while ((opt & PARTIAL_INPUT) && in_size - char_start < unitlen) {
|
||||
pos = in_size;
|
||||
SUSPEND(transcode_ibuf_empty, 8);
|
||||
{
|
||||
int step;
|
||||
if (readlen <= unitlen) {
|
||||
while ((opt & PARTIAL_INPUT) && readlen + (in_stop - in_p) < unitlen) {
|
||||
step = in_stop - in_p;
|
||||
readlen += step;
|
||||
in_p = in_stop;
|
||||
SUSPEND(transcode_ibuf_empty, 8);
|
||||
}
|
||||
if (readlen + (in_stop - in_p) <= unitlen) {
|
||||
step = in_stop - in_p;
|
||||
readlen += step;
|
||||
in_p = in_stop;
|
||||
}
|
||||
else {
|
||||
step = unitlen - readlen;
|
||||
readlen = unitlen;
|
||||
in_p += step;
|
||||
}
|
||||
}
|
||||
if (in_size - char_start <= unitlen)
|
||||
pos = in_size;
|
||||
else
|
||||
pos = char_start + unitlen;
|
||||
else {
|
||||
/* xxx: step may be negative.
|
||||
* possibly in_p is lesser than *in_pos.
|
||||
* caller may want to access readbuf. */
|
||||
step = ((readlen - 1) / unitlen) * unitlen - readlen;
|
||||
in_p += step;
|
||||
readlen += step;
|
||||
}
|
||||
goto invalid;
|
||||
}
|
||||
else {
|
||||
pos = char_start + ((pos-char_start-1) / unitlen) * unitlen;
|
||||
}
|
||||
goto invalid;
|
||||
case UNDEF:
|
||||
goto undef;
|
||||
}
|
||||
|
|
@ -546,11 +555,11 @@ transcode_restartable(rb_transcoding *tc,
|
|||
}
|
||||
|
||||
/* cleanup */
|
||||
if (tr->finish_func) {
|
||||
while (out_stop - out_p < tr->max_output) {
|
||||
if (my_transcoder->finish_func) {
|
||||
while (out_stop - out_p < my_transcoder->max_output) {
|
||||
SUSPEND(transcode_obuf_full, 4);
|
||||
}
|
||||
out_p += tr->finish_func(tc, out_p);
|
||||
out_p += my_transcoder->finish_func(my_transcoding, out_p);
|
||||
}
|
||||
while (1)
|
||||
SUSPEND(transcode_finished, 6);
|
||||
|
|
@ -585,7 +594,6 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
|
|||
const rb_transcoder *my_transcoder = my_transcoding->transcoder;
|
||||
transcode_result_t ret;
|
||||
unsigned char *out_start = *out_pos;
|
||||
ssize_t in_moved;
|
||||
|
||||
my_transcoding->resume_position = 0;
|
||||
my_transcoding->readlen = 0;
|
||||
|
|
@ -600,8 +608,7 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
|
|||
} while(0)
|
||||
|
||||
resume:
|
||||
ret = transcode_restartable(my_transcoding, *in_pos, in_stop, &in_moved, out_pos, out_stop, opt);
|
||||
*in_pos += in_moved;
|
||||
ret = transcode_restartable(in_pos, out_pos, in_stop, out_stop, my_transcoding, opt);
|
||||
if (ret == transcode_invalid_input) {
|
||||
/* deal with invalid byte sequence */
|
||||
/* todo: add more alternative behaviors */
|
||||
|
|
@ -656,7 +663,6 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
|
|||
transcode_result_t ret;
|
||||
unsigned char *out_start = *out_pos;
|
||||
const unsigned char *ptr;
|
||||
ssize_t in_moved;
|
||||
|
||||
my_transcoding->resume_position = 0;
|
||||
my_transcoding->readlen = 0;
|
||||
|
|
@ -679,15 +685,14 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
|
|||
if (ret == transcode_ibuf_empty) {
|
||||
if (ptr < in_stop) {
|
||||
input_byte = *ptr;
|
||||
ret = transcode_restartable(my_transcoding, p, p+1, &in_moved, out_pos, out_stop, opt|PARTIAL_INPUT);
|
||||
p += in_moved;
|
||||
ret = transcode_restartable(&p, out_pos, p+1, out_stop, my_transcoding, opt|PARTIAL_INPUT);
|
||||
}
|
||||
else {
|
||||
ret = transcode_restartable(my_transcoding, NULL, NULL, NULL, out_pos, out_stop, opt);
|
||||
ret = transcode_restartable(NULL, out_pos, NULL, out_stop, my_transcoding, opt);
|
||||
}
|
||||
}
|
||||
else {
|
||||
ret = transcode_restartable(my_transcoding, NULL, NULL, NULL, out_pos, out_stop, opt|PARTIAL_INPUT);
|
||||
ret = transcode_restartable(NULL, out_pos, NULL, out_stop, my_transcoding, opt|PARTIAL_INPUT);
|
||||
}
|
||||
if (&input_byte != p)
|
||||
ptr += p - &input_byte;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче