diff options
| author | duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-15 04:49:24 +0000 |
|---|---|---|
| committer | duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-15 04:49:24 +0000 |
| commit | 00cc59a0547a953cbf162f24585c8e6edaa58df3 () | |
| tree | 49ff256794149efd319ada81f74ef86dbdba09a8 /enc/unicode.c | |
| parent | 5d6349aefe952d0cd206f0b9ef882259135b13eb (diff) | |
* enc/unicode.c: Additional macros and code to use mapping data in
CaseMappingSpecials array. (with Kimihito Matsui) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | enc/unicode.c | 88 |
1 files changed, 67 insertions, 21 deletions
@@ -137,15 +137,29 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y) return 1; } /* macros to shorten "enc/unicode/casefold.h", undefined immediately after including the file */ #define U ONIGENC_CASE_UPCASE #define D ONIGENC_CASE_DOWNCASE #define F ONIGENC_CASE_FOLD -#define ST 0 -#define SU 0 -#define SL 0 #define I(n) 0 -#define L(n) 0 #include "enc/unicode/casefold.h" @@ -158,12 +172,6 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y) #undef I #undef L -/* macros related to ONIGENC_CASE flags */ -/* defined here because not used in other files */ -#define OnigSpecialIndexMask (((1<<OnigSpecialIndexWidth)-1)<<OnigSpecialIndexWidth) -#define OnigSpecialIndexEncode(n) (((n)<<OnigSpecialIndexShift)&OnigSpecialIndexMask) -#define OnigSpecialIndexDecode(n) (((n)&OnigSpecialIndexMask)>>OnigSpecialIndexShift) - #include "enc/unicode/name2ctype.h" #define CODE_RANGES_NUM numberof(CodeRanges) @@ -654,6 +662,7 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP, OnigUChar *to_start = to; OnigCaseFoldType flags = *flagP; to_end -= CASE_MAPPING_SLACK; /* hopelessly preliminary implementation, just dealing with ASCII and Turkic */ while (*pp<end && to<=to_end) { @@ -701,19 +710,56 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP, } else if ((folded = onigenc_unicode_fold_lookup(code)) != 0) { if (flags&OnigCaseFoldFlags(folded->n)) { - int count = OnigCodePointCount(folded->n); - const OnigCodePoint *next = folded->code; MODIFIED; - if (count==1) - code = *next; - else if (count==2) { - to += ONIGENC_CODE_TO_MBC(enc, *next++, to); - code = *next; } - else { /* count == 3 */ - to += ONIGENC_CODE_TO_MBC(enc, *next++, to); - to += ONIGENC_CODE_TO_MBC(enc, *next++, to); - code = *next; } } } |