1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* regex.c (re_adjust_startpos): fix for SJIS.

Browse Source 
* regex.c (mbc_startpos): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2002-01-30 07:00:58 +00:00
parent 7ddde51c68
commit ae2d54d91d
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Jan 30 15:58:04 2002 K.Kosako <kosako@sofnec.co.jp>
* regex.c (re_adjust_startpos): fix for SJIS.
* regex.c (mbc_startpos): ditto.
Wed Jan 30 02:25:38 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> Wed Jan 30 02:25:38 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* regex.c (re_adjust_startpos): search start of multibyte * regex.c (re_adjust_startpos): search start of multibyte

18
regex.c
View File

@ -3080,13 +3080,19 @@ re_adjust_startpos(bufp, string, size, startpos, range)
if (current_mbctype && startpos>0 && !(bufp->options&RE_OPTIMIZE_BMATCH)) { if (current_mbctype && startpos>0 && !(bufp->options&RE_OPTIMIZE_BMATCH)) {
int i = mbc_startpos(string, startpos); int i = mbc_startpos(string, startpos);
if (i < startpos && range > 0) { if (i < startpos) {
if (range > 0) {
startpos = i + mbclen(string[i]); startpos = i + mbclen(string[i]);
} }
else { else {
int len = mbclen(string[i]);
if (i + len <= startpos)
startpos = i + len;
else
startpos = i; startpos = i;
} }
} }
}
return startpos; return startpos;
} }
@ -4570,10 +4576,16 @@ mbc_startpos(string, pos)
switch (current_mbctype) { switch (current_mbctype) {
case MBCTYPE_EUC: case MBCTYPE_EUC:
case MBCTYPE_SJIS:
/* double byte char only */
return i + ((pos - i) & ~1); return i + ((pos - i) & ~1);
case MBCTYPE_SJIS:
while (i + (w = mbclen(string[i])) < pos) {
i += w;
}
return i;
case MBCTYPE_UTF8: case MBCTYPE_UTF8:
return i;
default: default:
return pos; return pos;
} }