mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* enc/unicode.c: Expansion of some code repetition in preparation for
elimination of common code pieces. (with Kimihito Matsui) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ed921b85dc
commit
8679f113e9
2 changed files with 19 additions and 9 deletions
|
@ -1,3 +1,9 @@
|
|||
Tue Mar 15 16:17:09 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
|
||||
|
||||
* enc/unicode.c: Expansion of some code repetition in preparation for
|
||||
elimination of common code pieces.
|
||||
(with Kimihito Matsui)
|
||||
|
||||
Tue Mar 15 13:49:23 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
|
||||
|
||||
* enc/unicode.c: Additional macros and code to use mapping data in
|
||||
|
|
|
@ -725,9 +725,7 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP,
|
|||
SpecialsStart += SpecialsLengthExtract(*SpecialsStart);
|
||||
}
|
||||
if (OnigCaseFoldFlags(folded->n)&ONIGENC_CASE_DOWN_SPECIAL) {
|
||||
if (flags&ONIGENC_CASE_DOWN_SPECIAL)
|
||||
goto SpecialsCopy;
|
||||
else
|
||||
if (!(flags&ONIGENC_CASE_DOWN_SPECIAL))
|
||||
SpecialsStart += SpecialsLengthExtract(*SpecialsStart);
|
||||
}
|
||||
/* if we pass here, we know we use special upcasing, and are at the right position */
|
||||
|
@ -737,12 +735,15 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP,
|
|||
if (count==1)
|
||||
code = SpecialsCodepointExtract(*next);
|
||||
else if (count==2) {
|
||||
to += ONIGENC_CODE_TO_MBC(enc, SpecialsCodepointExtract(*next++), to);
|
||||
code = SpecialsCodepointExtract(*next++);
|
||||
to += ONIGENC_CODE_TO_MBC(enc, code, to);
|
||||
code = *next;
|
||||
}
|
||||
else { /* count == 3 */
|
||||
to += ONIGENC_CODE_TO_MBC(enc, SpecialsCodepointExtract(*next++), to);
|
||||
to += ONIGENC_CODE_TO_MBC(enc, *next++, to);
|
||||
code = SpecialsCodepointExtract(*next++);
|
||||
to += ONIGENC_CODE_TO_MBC(enc, code, to);
|
||||
code = *next++;
|
||||
to += ONIGENC_CODE_TO_MBC(enc, code, to);
|
||||
code = *next;
|
||||
}
|
||||
}
|
||||
|
@ -752,12 +753,15 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP,
|
|||
if (count==1)
|
||||
code = *next;
|
||||
else if (count==2) {
|
||||
to += ONIGENC_CODE_TO_MBC(enc, *next++, to);
|
||||
code = *next++;
|
||||
to += ONIGENC_CODE_TO_MBC(enc, code, to);
|
||||
code = *next;
|
||||
}
|
||||
else { /* count == 3 */
|
||||
to += ONIGENC_CODE_TO_MBC(enc, *next++, to);
|
||||
to += ONIGENC_CODE_TO_MBC(enc, *next++, to);
|
||||
code = *next++;
|
||||
to += ONIGENC_CODE_TO_MBC(enc, code, to);
|
||||
code = *next++;
|
||||
to += ONIGENC_CODE_TO_MBC(enc, code, to);
|
||||
code = *next;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue