archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix: DON'T move in_p because before in_p is replaced by buffered data.

Browse source 
* transcode.c: NOMAP is now multibyte direct map.

* transcode.c: remove ASIS.

* transcode_data.h: ditto.

* tool/transcode-tb (ActionMap#generate_info): remove :asis.

* tool/transcode-tb (ActionMap#generate_info): add :nomap0.

* enc/trans/utf8_mac.trans: replace :asis by :nomap0.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2009-05-05 00:05:11 +00:00
parent 92c89f12fb
commit 3abca796f4
5 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
transcode.c
View file

@ -505,7 +505,6 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos,
case 30: goto resume_label30;
case 31: goto resume_label31;
case 32: goto resume_label32;
case 33: goto resume_label33;
}
while (1) {
@ -541,15 +540,14 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos,
follow_info:
switch (next_info & 0x1F) {
case NOMAP:
SUSPEND_OBUF(3); *out_p++ = next_byte;
continue;
case ASIS:
{
const unsigned char *p = inchar_start;
while (p < in_p) {
SUSPEND_OBUF(33); *out_p++ = (unsigned char)*p++;
const unsigned char *pend = in_p;
in_p = inchar_start;
while (in_p < pend) {
next_byte = (unsigned char)*in_p++;
SUSPEND_OBUF(3); *out_p++ = next_byte;
}
}
}
continue;
case 0x00: case 0x04: case 0x08: case 0x0C:
case 0x10: case 0x14: case 0x18: case 0x1C: