1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* enc/iso_8859_1.c, enc/iso_8859_4.c: Avoid setting modification flag if

there is no modification.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
duerst 2016-07-13 06:19:07 +00:00
parent 7b653bd019
commit b9cd6920d2
3 changed files with 8 additions and 6 deletions

View file

@ -1,3 +1,8 @@
Wed Jul 13 15:19:03 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/iso_8859_1.c, enc/iso_8859_4.c: Avoid setting modification flag if
there is no modification.
Wed Jul 13 14:40:04 2016 Martin Duerst <duerst@it.aoyama.ac.jp> Wed Jul 13 14:40:04 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/iso_8859_5.c, test/ruby/enc/test_case_comprehensive.rb: * enc/iso_8859_5.c, test/ruby/enc/test_case_comprehensive.rb:

View file

@ -284,13 +284,11 @@ case_map (OnigCaseFoldType* flagP, const OnigUChar** pp,
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
code += 0x20; code += 0x20;
} }
else if (code==0xAA || code==0xBA || code==0xB5 || code==0xFF) ;
else if ((EncISO_8859_1_CtypeTable[code]&BIT_CTYPE_LOWER) else if ((EncISO_8859_1_CtypeTable[code]&BIT_CTYPE_LOWER)
&& (flags&ONIGENC_CASE_UPCASE)) { && (flags&ONIGENC_CASE_UPCASE)) {
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
if (code==0xAA || code==0xBA || code==0xB5 || code==0xFF) code -= 0x20;
;
else
code -= 0x20;
} }
*to++ = code; *to++ = code;
if (flags&ONIGENC_CASE_TITLECASE) /* switch from titlecase to lowercase for capitalize */ if (flags&ONIGENC_CASE_TITLECASE) /* switch from titlecase to lowercase for capitalize */

View file

@ -252,14 +252,13 @@ case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
code = ENC_ISO_8859_4_TO_LOWER_CASE(code); code = ENC_ISO_8859_4_TO_LOWER_CASE(code);
} }
else if (code==0xA2) ;
else if ((EncISO_8859_4_CtypeTable[code]&BIT_CTYPE_LOWER) else if ((EncISO_8859_4_CtypeTable[code]&BIT_CTYPE_LOWER)
&& (flags&ONIGENC_CASE_UPCASE)) { && (flags&ONIGENC_CASE_UPCASE)) {
flags |= ONIGENC_CASE_MODIFIED; flags |= ONIGENC_CASE_MODIFIED;
if (code>=0xA0&&code<=0xBF) { if (code>=0xA0&&code<=0xBF) {
if (code==0xBF) if (code==0xBF)
code -= 0x02; code -= 0x02;
else if (code==0xA2)
;
else else
code -= 0x10; code -= 0x10;
} }