From 8679f113e949e2484f105fa27a1334342c244b3c Mon Sep 17 00:00:00 2001 From: duerst Date: Tue, 15 Mar 2016 07:17:09 +0000 Subject: * 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 --- enc/unicode.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'enc/unicode.c') diff --git a/enc/unicode.c b/enc/unicode.c index 5a46982a5e..a52bb3324c 100644 --- a/enc/unicode.c +++ b/enc/unicode.c @@ -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; } } -- cgit v1.2.3