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

* enc/unicode.c: Handle DOTLESS_i by hand because it isn't involved in folding.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55164 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
duerst 2016-05-25 10:07:19 +00:00
parent 05c631eefd
commit 46647ac8df
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed May 25 19:07:19 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/unicode.c: Handle DOTLESS_i by hand because it isn't involved in folding.
Wed May 25 18:30:53 2016 NARUSE, Yui <naruse@ruby-lang.org> Wed May 25 18:30:53 2016 NARUSE, Yui <naruse@ruby-lang.org>
* regparse.c (fetch_token_in_cc): raise error if given octal escaped * regparse.c (fetch_token_in_cc): raise error if given octal escaped

6
enc/unicode.c
View File

@ -701,7 +701,7 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP,
const CodePointList3 *folded; const CodePointList3 *folded;
if (code==I_WITH_DOT_ABOVE) { if (code==I_WITH_DOT_ABOVE) {
if (flags&ONIGENC_CASE_DOWNCASE) { if (flags&(ONIGENC_CASE_DOWNCASE|ONIGENC_CASE_FOLD)) {
MODIFIED; MODIFIED;
code = 'i'; code = 'i';
if (!(flags&ONIGENC_CASE_FOLD_TURKISH_AZERI)) { /* make dot above explicit */ if (!(flags&ONIGENC_CASE_FOLD_TURKISH_AZERI)) { /* make dot above explicit */
@ -710,6 +710,10 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP,
} }
} }
} }
else if (code==DOTLESS_i) { /* handle this manually, because it isn't involved in folding */
if (flags&ONIGENC_CASE_UPCASE)
MODIFIED, code = 'I';
}
else if ((folded = onigenc_unicode_fold_lookup(code)) != 0) { /* data about character found in CaseFold_11_Table */ else if ((folded = onigenc_unicode_fold_lookup(code)) != 0) { /* data about character found in CaseFold_11_Table */
if ((flags&ONIGENC_CASE_TITLECASE) /* Titlecase needed, */ if ((flags&ONIGENC_CASE_TITLECASE) /* Titlecase needed, */
&& (OnigCaseFoldFlags(folded->n)&ONIGENC_CASE_IS_TITLECASE)) { /* but already Titlecase */ && (OnigCaseFoldFlags(folded->n)&ONIGENC_CASE_IS_TITLECASE)) { /* but already Titlecase */