X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/374ca955a76ecab1204ca8bfa63ff9238d998416..b331163bffd790ced0e88b73f44f86d49ccc48a5:/icuSources/common/uniset_props.cpp diff --git a/icuSources/common/uniset_props.cpp b/icuSources/common/uniset_props.cpp index c0ffa87c..d3388939 100644 --- a/icuSources/common/uniset_props.cpp +++ b/icuSources/common/uniset_props.cpp @@ -1,7 +1,7 @@ /* ******************************************************************************* * -* Copyright (C) 1999-2004, International Business Machines +* Copyright (C) 1999-2014, International Business Machines * Corporation and others. All Rights Reserved. * ******************************************************************************* @@ -28,21 +28,24 @@ #include "uset_imp.h" #include "ruleiter.h" #include "cmemory.h" -#include "uhash.h" #include "ucln_cmn.h" #include "util.h" #include "uvector.h" #include "uprops.h" #include "propname.h" -#include "unormimp.h" +#include "normalizer2impl.h" #include "ucase.h" +#include "ubidi_props.h" #include "uinvchar.h" +#include "uprops.h" #include "charstr.h" #include "cstring.h" #include "mutex.h" +#include "umutex.h" #include "uassert.h" #include "hash.h" -#include "ucmp8.h" + +U_NAMESPACE_USE // initial storage. Must be >= 0 // *** same as in uniset.cpp ! *** @@ -66,100 +69,211 @@ #define UPPER_N ((UChar)78) /*N*/ #define EQUALS ((UChar)0x003D) /*=*/ -static const UChar POSIX_OPEN[] = { SET_OPEN,COLON,0 }; // "[:" +//static const UChar POSIX_OPEN[] = { SET_OPEN,COLON,0 }; // "[:" static const UChar POSIX_CLOSE[] = { COLON,SET_CLOSE,0 }; // ":]" -static const UChar PERL_OPEN[] = { BACKSLASH,LOWER_P,0 }; // "\\p" -static const UChar PERL_CLOSE[] = { CLOSE_BRACE,0 }; // "}" -static const UChar NAME_OPEN[] = { BACKSLASH,UPPER_N,0 }; // "\\N" +//static const UChar PERL_OPEN[] = { BACKSLASH,LOWER_P,0 }; // "\\p" +//static const UChar PERL_CLOSE[] = { CLOSE_BRACE,0 }; // "}" +//static const UChar NAME_OPEN[] = { BACKSLASH,UPPER_N,0 }; // "\\N" static const UChar HYPHEN_RIGHT_BRACE[] = {HYPHEN,SET_CLOSE,0}; /*-]*/ // Special property set IDs static const char ANY[] = "ANY"; // [\u0000-\U0010FFFF] static const char ASCII[] = "ASCII"; // [\u0000-\u007F] +static const char ASSIGNED[] = "Assigned"; // [:^Cn:] // Unicode name property alias #define NAME_PROP "na" #define NAME_PROP_LENGTH 2 -// TODO: Remove the following special-case code when -// these four C99-compatibility properties are implemented -// as enums/names. +/** + * Delimiter string used in patterns to close a category reference: + * ":]". Example: "[:Lu:]". + */ +//static const UChar CATEGORY_CLOSE[] = {COLON, SET_CLOSE, 0x0000}; /* ":]" */ + +// Cached sets ------------------------------------------------------------- *** + U_CDECL_BEGIN - typedef UBool (U_CALLCONV *C99_Property_Function)(UChar32); -U_CDECL_END -static const struct C99_Map { - const char* name; - C99_Property_Function func; -} C99_DISPATCH[] = { - // These three entries omitted; they clash with PropertyAliases - // names for Unicode properties, so UnicodeSet already maps them - // to those properties. - //{ "alpha", u_isalpha }, - //{ "lower", u_islower }, - //{ "upper", u_isupper }, - - // MUST be in SORTED order - { "blank", u_isblank }, - { "cntrl", u_iscntrl }, - { "digit", u_isdigit }, - { "graph", u_isgraph }, - { "print", u_isprint }, - { "punct", u_ispunct }, - { "space", u_isspace }, - { "title", u_istitle }, - { "xdigit", u_isxdigit } -}; -#define C99_COUNT (9) - -// TEMPORARY: Remove when deprecated category code constructor is removed. -static const UChar CATEGORY_NAMES[] = { - // Must be kept in sync with uchar.h/UCharCategory - 0x43, 0x6E, /* "Cn" */ - 0x4C, 0x75, /* "Lu" */ - 0x4C, 0x6C, /* "Ll" */ - 0x4C, 0x74, /* "Lt" */ - 0x4C, 0x6D, /* "Lm" */ - 0x4C, 0x6F, /* "Lo" */ - 0x4D, 0x6E, /* "Mn" */ - 0x4D, 0x65, /* "Me" */ - 0x4D, 0x63, /* "Mc" */ - 0x4E, 0x64, /* "Nd" */ - 0x4E, 0x6C, /* "Nl" */ - 0x4E, 0x6F, /* "No" */ - 0x5A, 0x73, /* "Zs" */ - 0x5A, 0x6C, /* "Zl" */ - 0x5A, 0x70, /* "Zp" */ - 0x43, 0x63, /* "Cc" */ - 0x43, 0x66, /* "Cf" */ - 0x43, 0x6F, /* "Co" */ - 0x43, 0x73, /* "Cs" */ - 0x50, 0x64, /* "Pd" */ - 0x50, 0x73, /* "Ps" */ - 0x50, 0x65, /* "Pe" */ - 0x50, 0x63, /* "Pc" */ - 0x50, 0x6F, /* "Po" */ - 0x53, 0x6D, /* "Sm" */ - 0x53, 0x63, /* "Sc" */ - 0x53, 0x6B, /* "Sk" */ - 0x53, 0x6F, /* "So" */ - 0x50, 0x69, /* "Pi" */ - 0x50, 0x66, /* "Pf" */ - 0x00 +static UBool U_CALLCONV uset_cleanup(); + +struct Inclusion { + UnicodeSet *fSet; + UInitOnce fInitOnce; }; +static Inclusion gInclusions[UPROPS_SRC_COUNT]; // cached getInclusions() + +static UnicodeSet *uni32Singleton; +static icu::UInitOnce uni32InitOnce = U_INITONCE_INITIALIZER; + +//---------------------------------------------------------------- +// Inclusions list +//---------------------------------------------------------------- + +// USetAdder implementation +// Does not use uset.h to reduce code dependencies +static void U_CALLCONV +_set_add(USet *set, UChar32 c) { + ((UnicodeSet *)set)->add(c); +} + +static void U_CALLCONV +_set_addRange(USet *set, UChar32 start, UChar32 end) { + ((UnicodeSet *)set)->add(start, end); +} + +static void U_CALLCONV +_set_addString(USet *set, const UChar *str, int32_t length) { + ((UnicodeSet *)set)->add(UnicodeString((UBool)(length<0), str, length)); +} /** - * Delimiter string used in patterns to close a category reference: - * ":]". Example: "[:Lu:]". + * Cleanup function for UnicodeSet */ -static const UChar CATEGORY_CLOSE[] = {COLON, SET_CLOSE, 0x0000}; /* ":]" */ +static UBool U_CALLCONV uset_cleanup(void) { + for(int32_t i = UPROPS_SRC_NONE; i < UPROPS_SRC_COUNT; ++i) { + Inclusion &in = gInclusions[i]; + delete in.fSet; + in.fSet = NULL; + in.fInitOnce.reset(); + } + + delete uni32Singleton; + uni32Singleton = NULL; + uni32InitOnce.reset(); + return TRUE; +} + +U_CDECL_END U_NAMESPACE_BEGIN -static UnicodeSet *INCLUSIONS[UPROPS_SRC_COUNT] = { NULL }; // cached getInclusions() +/* +Reduce excessive reallocation, and make it easier to detect initialization problems. +Usually you don't see smaller sets than this for Unicode 5.0. +*/ +#define DEFAULT_INCLUSION_CAPACITY 3072 + +void U_CALLCONV UnicodeSet_initInclusion(int32_t src, UErrorCode &status) { + // This function is invoked only via umtx_initOnce(). + // This function is a friend of class UnicodeSet. + + U_ASSERT(src >=0 && srcensureCapacity(DEFAULT_INCLUSION_CAPACITY, status); + switch(src) { + case UPROPS_SRC_CHAR: + uchar_addPropertyStarts(&sa, &status); + break; + case UPROPS_SRC_PROPSVEC: + upropsvec_addPropertyStarts(&sa, &status); + break; + case UPROPS_SRC_CHAR_AND_PROPSVEC: + uchar_addPropertyStarts(&sa, &status); + upropsvec_addPropertyStarts(&sa, &status); + break; +#if !UCONFIG_NO_NORMALIZATION + case UPROPS_SRC_CASE_AND_NORM: { + const Normalizer2Impl *impl=Normalizer2Factory::getNFCImpl(status); + if(U_SUCCESS(status)) { + impl->addPropertyStarts(&sa, status); + } + ucase_addPropertyStarts(ucase_getSingleton(), &sa, &status); + break; + } + case UPROPS_SRC_NFC: { + const Normalizer2Impl *impl=Normalizer2Factory::getNFCImpl(status); + if(U_SUCCESS(status)) { + impl->addPropertyStarts(&sa, status); + } + break; + } + case UPROPS_SRC_NFKC: { + const Normalizer2Impl *impl=Normalizer2Factory::getNFKCImpl(status); + if(U_SUCCESS(status)) { + impl->addPropertyStarts(&sa, status); + } + break; + } + case UPROPS_SRC_NFKC_CF: { + const Normalizer2Impl *impl=Normalizer2Factory::getNFKC_CFImpl(status); + if(U_SUCCESS(status)) { + impl->addPropertyStarts(&sa, status); + } + break; + } + case UPROPS_SRC_NFC_CANON_ITER: { + const Normalizer2Impl *impl=Normalizer2Factory::getNFCImpl(status); + if(U_SUCCESS(status)) { + impl->addCanonIterPropertyStarts(&sa, status); + } + break; + } +#endif + case UPROPS_SRC_CASE: + ucase_addPropertyStarts(ucase_getSingleton(), &sa, &status); + break; + case UPROPS_SRC_BIDI: + ubidi_addPropertyStarts(ubidi_getSingleton(), &sa, &status); + break; + default: + status = U_INTERNAL_PROGRAM_ERROR; + break; + } -static CompactByteArray* CASE_EQUIV_CBA = NULL; // for closeOver(USET_CASE) + if (U_FAILURE(status)) { + delete incl; + incl = NULL; + return; + } + // Compact for caching + incl->compact(); + ucln_common_registerCleanup(UCLN_COMMON_USET, uset_cleanup); +} + + + +const UnicodeSet* UnicodeSet::getInclusions(int32_t src, UErrorCode &status) { + U_ASSERT(src >=0 && srcfreeze(); + } + ucln_common_registerCleanup(UCLN_COMMON_USET, uset_cleanup); +} + + +U_CFUNC UnicodeSet * +uniset_getUnicode32Instance(UErrorCode &errorCode) { + umtx_initOnce(uni32InitOnce, &createUni32Set, errorCode); + return uni32Singleton; +} // helper functions for matching of pattern syntax pieces ------------------ *** // these functions are parallel to the PERL_OPEN etc. strings above @@ -174,10 +288,10 @@ isPerlOpen(const UnicodeString &pattern, int32_t pos) { return pattern.charAt(pos)==BACKSLASH && ((c=pattern.charAt(pos+1))==LOWER_P || c==UPPER_P); } -static inline UBool +/*static inline UBool isPerlClose(const UnicodeString &pattern, int32_t pos) { return pattern.charAt(pos)==CLOSE_BRACE; -} +}*/ static inline UBool isNameOpen(const UnicodeString &pattern, int32_t pos) { @@ -189,10 +303,10 @@ isPOSIXOpen(const UnicodeString &pattern, int32_t pos) { return pattern.charAt(pos)==SET_OPEN && pattern.charAt(pos+1)==COLON; } -static inline UBool +/*static inline UBool isPOSIXClose(const UnicodeString &pattern, int32_t pos) { return pattern.charAt(pos)==COLON && pattern.charAt(pos+1)==SET_CLOSE; -} +}*/ // TODO memory debugging provided inside uniset.cpp // could be made available here but probably obsolete with use of modern @@ -211,182 +325,69 @@ isPOSIXClose(const UnicodeString &pattern, int32_t pos) { */ UnicodeSet::UnicodeSet(const UnicodeString& pattern, UErrorCode& status) : - len(0), capacity(START_EXTRA), bufferCapacity(0), - list(0), buffer(0), strings(0) -{ - if(U_SUCCESS(status)){ - list = (UChar32*) uprv_malloc(sizeof(UChar32) * capacity); - /* test for NULL */ - if(list == NULL) { - status = U_MEMORY_ALLOCATION_ERROR; - }else{ - allocateStrings(); - applyPattern(pattern, USET_IGNORE_SPACE, NULL, status); - } - } - _dbgct(this); -} - -/** - * Constructs a set from the given pattern, optionally ignoring - * white space. See the class description for the syntax of the - * pattern language. - * @param pattern a string specifying what characters are in the set - * @param options bitmask for options to apply to the pattern. - * Valid options are USET_IGNORE_SPACE and USET_CASE_INSENSITIVE. - */ -UnicodeSet::UnicodeSet(const UnicodeString& pattern, - uint32_t options, - const SymbolTable* symbols, - UErrorCode& status) : - len(0), capacity(START_EXTRA), bufferCapacity(0), - list(0), buffer(0), strings(0) -{ - if(U_SUCCESS(status)){ - list = (UChar32*) uprv_malloc(sizeof(UChar32) * capacity); - /* test for NULL */ - if(list == NULL) { - status = U_MEMORY_ALLOCATION_ERROR; - }else{ - allocateStrings(); - applyPattern(pattern, options, symbols, status); - } - } - _dbgct(this); -} - -UnicodeSet::UnicodeSet(const UnicodeString& pattern, ParsePosition& pos, - uint32_t options, - const SymbolTable* symbols, - UErrorCode& status) : - len(0), capacity(START_EXTRA), bufferCapacity(0), - list(0), buffer(0), strings(0) + len(0), capacity(START_EXTRA), list(0), bmpSet(0), buffer(0), + bufferCapacity(0), patLen(0), pat(NULL), strings(NULL), stringSpan(NULL), + fFlags(0) { if(U_SUCCESS(status)){ list = (UChar32*) uprv_malloc(sizeof(UChar32) * capacity); /* test for NULL */ if(list == NULL) { - status = U_MEMORY_ALLOCATION_ERROR; + status = U_MEMORY_ALLOCATION_ERROR; }else{ - allocateStrings(); - applyPattern(pattern, pos, options, symbols, status); + allocateStrings(status); + applyPattern(pattern, status); } } _dbgct(this); } -#ifdef U_USE_UNICODESET_DEPRECATES -/** - * DEPRECATED Constructs a set from the given Unicode character category. - * @param category an integer indicating the character category as - * defined in uchar.h. - * @deprecated To be removed after 2002-DEC-31 - */ -UnicodeSet::UnicodeSet(int8_t category, UErrorCode& status) : - len(0), capacity(START_EXTRA), bufferCapacity(0), - list(0), buffer(0), strings(0) -{ - static const UChar OPEN[] = { 91, 58, 0 }; // "[:" - static const UChar CLOSE[]= { 58, 93, 0 }; // ":]" - if (U_SUCCESS(status)) { - if (category < 0 || category >= U_CHAR_CATEGORY_COUNT) { - status = U_ILLEGAL_ARGUMENT_ERROR; - } else { - UnicodeString pattern(FALSE, CATEGORY_NAMES + category*2, 2); - pattern.insert(0, OPEN); - pattern.append(CLOSE); - list = (UChar32*) uprv_malloc(sizeof(UChar32) * capacity); - /* test for NULL */ - if(list == NULL) { - status = U_MEMORY_ALLOCATION_ERROR; - }else{ - allocateStrings(); - applyPattern(pattern, status); - } - } - } - _dbgct(this); -} -#endif - //---------------------------------------------------------------- // Public API //---------------------------------------------------------------- -/** - * Modifies this set to represent the set specified by the given - * pattern, optionally ignoring white space. See the class - * description for the syntax of the pattern language. - * @param pattern a string specifying what characters are in the set - * @param ignoreSpaces if true, all spaces in the - * pattern are ignored. Spaces are those characters for which - * uprv_isRuleWhiteSpace() is true. - * Characters preceded by '\\' are escaped, losing any special - * meaning they otherwise have. Spaces may be included by - * escaping them. - * @exception IllegalArgumentException if the pattern - * contains a syntax error. - */ -UnicodeSet& UnicodeSet::applyPattern(const UnicodeString& pattern, - UErrorCode& status) { - return applyPattern(pattern, USET_IGNORE_SPACE, NULL, status); -} - - -/** - * Modifies this set to represent the set specified by the given - * pattern, optionally ignoring white space. See the class - * description for the syntax of the pattern language. - * @param pattern a string specifying what characters are in the set - * @param options bitmask for options to apply to the pattern. - * Valid options are USET_IGNORE_SPACE and USET_CASE_INSENSITIVE. - */ UnicodeSet& UnicodeSet::applyPattern(const UnicodeString& pattern, - uint32_t options, - const SymbolTable* symbols, UErrorCode& status) { - if (U_FAILURE(status)) { - return *this; - } - + // Equivalent to + // return applyPattern(pattern, USET_IGNORE_SPACE, NULL, status); + // but without dependency on closeOver(). ParsePosition pos(0); - applyPattern(pattern, pos, options, symbols, status); + applyPatternIgnoreSpace(pattern, pos, NULL, status); if (U_FAILURE(status)) return *this; int32_t i = pos.getIndex(); - - if (options & USET_IGNORE_SPACE) { - // Skip over trailing whitespace - ICU_Utility::skipWhitespace(pattern, i, TRUE); - } - + // Skip over trailing whitespace + ICU_Utility::skipWhitespace(pattern, i, TRUE); if (i != pattern.length()) { status = U_ILLEGAL_ARGUMENT_ERROR; } return *this; } -UnicodeSet& UnicodeSet::applyPattern(const UnicodeString& pattern, - ParsePosition& pos, - uint32_t options, - const SymbolTable* symbols, - UErrorCode& status) { +void +UnicodeSet::applyPatternIgnoreSpace(const UnicodeString& pattern, + ParsePosition& pos, + const SymbolTable* symbols, + UErrorCode& status) { if (U_FAILURE(status)) { - return *this; + return; + } + if (isFrozen()) { + status = U_NO_WRITE_PERMISSION; + return; } // Need to build the pattern in a temporary string because // _applyPattern calls add() etc., which set pat to empty. UnicodeString rebuiltPat; RuleCharacterIterator chars(pattern, symbols, pos); - applyPattern(chars, symbols, rebuiltPat, options, status); - if (U_FAILURE(status)) return *this; + applyPattern(chars, symbols, rebuiltPat, USET_IGNORE_SPACE, NULL, status); + if (U_FAILURE(status)) return; if (chars.inVariable()) { // syntaxError(chars, "Extra chars in variable value"); status = U_MALFORMED_SET; - return *this; + return; } - pat = rebuiltPat; - return *this; + setPattern(rebuiltPat); } /** @@ -439,6 +440,7 @@ void UnicodeSet::applyPattern(RuleCharacterIterator& chars, const SymbolTable* symbols, UnicodeString& rebuiltPat, uint32_t options, + UnicodeSet& (UnicodeSet::*caseClosure)(int32_t attribute), UErrorCode& ec) { if (U_FAILURE(ec)) return; @@ -530,13 +532,14 @@ void UnicodeSet::applyPattern(RuleCharacterIterator& chars, } else if (symbols != 0) { const UnicodeFunctor *m = symbols->lookupMatcher(c); if (m != 0) { - if (m->getDynamicClassID() != UnicodeSet::getStaticClassID()) { + const UnicodeSet *ms = dynamic_cast(m); + if (ms == NULL) { ec = U_MALFORMED_SET; return; } // casting away const, but `nested' won't be modified // (important not to modify stored set) - nested = (UnicodeSet*) m; + nested = const_cast(ms); setMode = 3; } } @@ -574,7 +577,7 @@ void UnicodeSet::applyPattern(RuleCharacterIterator& chars, } switch (setMode) { case 1: - nested->applyPattern(chars, symbols, patLocal, options, ec); + nested->applyPattern(chars, symbols, patLocal, options, caseClosure, ec); break; case 2: chars.skipIgnored(opts); @@ -653,7 +656,7 @@ void UnicodeSet::applyPattern(RuleCharacterIterator& chars, c = chars.next(opts, literal, ec); if (U_FAILURE(ec)) return; if (c == 0x5D /*']'*/ && !literal) { - patLocal.append(HYPHEN_RIGHT_BRACE); + patLocal.append(HYPHEN_RIGHT_BRACE, 2); mode = 2; continue; } @@ -806,10 +809,10 @@ void UnicodeSet::applyPattern(RuleCharacterIterator& chars, * patterns like /[^abc]/i work. */ if ((options & USET_CASE_INSENSITIVE) != 0) { - closeOver(USET_CASE); + (this->*caseClosure)(USET_CASE_INSENSITIVE); } else if ((options & USET_ADD_CASE_MAPPINGS) != 0) { - closeOver(USET_ADD_CASE_MAPPINGS); + (this->*caseClosure)(USET_ADD_CASE_MAPPINGS); } if (invert) { complement(); @@ -822,6 +825,10 @@ void UnicodeSet::applyPattern(RuleCharacterIterator& chars, } else { _generatePattern(rebuiltPat, FALSE); } + if (isBogus() && U_SUCCESS(ec)) { + // We likely ran out of memory. AHHH! + ec = U_MEMORY_ALLOCATION_ERROR; + } } //---------------------------------------------------------------- @@ -838,9 +845,10 @@ static UBool generalCategoryMaskFilter(UChar32 ch, void* context) { } static UBool versionFilter(UChar32 ch, void* context) { - UVersionInfo v, none = { 0, 0, 0, 0}; - UVersionInfo* version = (UVersionInfo*)context; + static const UVersionInfo none = { 0, 0, 0, 0 }; + UVersionInfo v; u_charAge(ch, v); + UVersionInfo* version = (UVersionInfo*)context; return uprv_memcmp(&v, &none, sizeof(v)) > 0 && uprv_memcmp(&v, version, sizeof(v)) <= 0; } @@ -854,6 +862,9 @@ static UBool intPropertyFilter(UChar32 ch, void* context) { return u_getIntPropertyValue((UChar32) ch, c->prop) == c->value; } +static UBool scriptExtensionsFilter(UChar32 ch, void* context) { + return uscript_hasScript(ch, *(UScriptCode*)context); +} /** * Generic filter-based scanning code for UCD property UnicodeSets. @@ -862,20 +873,17 @@ void UnicodeSet::applyFilter(UnicodeSet::Filter filter, void* context, int32_t src, UErrorCode &status) { - // Walk through all Unicode characters, noting the start + if (U_FAILURE(status)) return; + + // Logically, walk through all Unicode characters, noting the start // and end of each range for which filter.contain(c) is // true. Add each range to a set. // - // To improve performance, use the INCLUSIONS set, which + // To improve performance, use an inclusions set which // encodes information about character ranges that are known - // to have identical properties. INCLUSIONS contains - // only the first characters of such ranges. - // - // TODO Where possible, instead of scanning over code points, - // use internal property data to initialize UnicodeSets for - // those properties. Scanning code points is slow. - if (U_FAILURE(status)) return; - + // to have identical properties. + // getInclusions(src) contains exactly the first characters of + // same-value ranges for the given properties "source". const UnicodeSet* inclusions = getInclusions(src, status); if (U_FAILURE(status)) { return; @@ -884,7 +892,7 @@ void UnicodeSet::applyFilter(UnicodeSet::Filter filter, clear(); UChar32 startHasProperty = -1; - int limitRange = inclusions->getRangeCount(); + int32_t limitRange = inclusions->getRangeCount(); for (int j=0; j= 0) { add((UChar32)startHasProperty, (UChar32)0x10FFFF); } + if (isBogus() && U_SUCCESS(status)) { + // We likely ran out of memory. AHHH! + status = U_MEMORY_ALLOCATION_ERROR; + } } static UBool mungeCharName(char* dst, const char* src, int32_t dstCapacity) { @@ -933,20 +945,15 @@ static UBool mungeCharName(char* dst, const char* src, int32_t dstCapacity) { #define FAIL(ec) {ec=U_ILLEGAL_ARGUMENT_ERROR; return *this;} -// TODO: Remove the following special-case code when -// these four C99-compatibility properties are implemented -// as enums/names. -static UBool c99Filter(UChar32 ch, void* context) { - struct C99_Map* m = (struct C99_Map*) context; - return m->func(ch); -} - UnicodeSet& UnicodeSet::applyIntPropertyValue(UProperty prop, int32_t value, UErrorCode& ec) { - if (U_FAILURE(ec)) return *this; + if (U_FAILURE(ec) || isFrozen()) return *this; if (prop == UCHAR_GENERAL_CATEGORY_MASK) { applyFilter(generalCategoryMaskFilter, &value, UPROPS_SRC_CHAR, ec); + } else if (prop == UCHAR_SCRIPT_EXTENSIONS) { + UScriptCode script = (UScriptCode)value; + applyFilter(scriptExtensionsFilter, &script, UPROPS_SRC_PROPSVEC, ec); } else { IntPropertyContext c = {prop, value}; applyFilter(intPropertyFilter, &c, uprops_getSource(prop), ec); @@ -958,7 +965,7 @@ UnicodeSet& UnicodeSet::applyPropertyAlias(const UnicodeString& prop, const UnicodeString& value, UErrorCode& ec) { - if (U_FAILURE(ec)) return *this; + if (U_FAILURE(ec) || isFrozen()) return *this; // prop and value used to be converted to char * using the default // converter instead of the invariant conversion. @@ -971,15 +978,17 @@ UnicodeSet::applyPropertyAlias(const UnicodeString& prop, ) { FAIL(ec); } - CharString pname(prop); - CharString vname(value); + CharString pname, vname; + pname.appendInvariantChars(prop, ec); + vname.appendInvariantChars(value, ec); + if (U_FAILURE(ec)) return *this; UProperty p; int32_t v; - UBool mustNotBeEmpty = FALSE; + UBool mustNotBeEmpty = FALSE, invert = FALSE; if (value.length() > 0) { - p = u_getPropertyEnum(pname); + p = u_getPropertyEnum(pname.data()); if (p == UCHAR_INVALID_CODE) FAIL(ec); // Treat gc as gcm @@ -990,14 +999,14 @@ UnicodeSet::applyPropertyAlias(const UnicodeString& prop, if ((p >= UCHAR_BINARY_START && p < UCHAR_BINARY_LIMIT) || (p >= UCHAR_INT_START && p < UCHAR_INT_LIMIT) || (p >= UCHAR_MASK_START && p < UCHAR_MASK_LIMIT)) { - v = u_getPropertyValueEnum(p, vname); + v = u_getPropertyValueEnum(p, vname.data()); if (v == UCHAR_INVALID_CODE) { // Handle numeric CCC if (p == UCHAR_CANONICAL_COMBINING_CLASS || p == UCHAR_TRAIL_CANONICAL_COMBINING_CLASS || p == UCHAR_LEAD_CANONICAL_COMBINING_CLASS) { char* end; - double value = uprv_strtod(vname, &end); + double value = uprv_strtod(vname.data(), &end); v = (int32_t) value; if (v != value || v < 0 || *end != 0) { // non-integral or negative value, or trailing junk @@ -1018,24 +1027,20 @@ UnicodeSet::applyPropertyAlias(const UnicodeString& prop, case UCHAR_NUMERIC_VALUE: { char* end; - double value = uprv_strtod(vname, &end); + double value = uprv_strtod(vname.data(), &end); if (*end != 0) { FAIL(ec); } applyFilter(numericValueFilter, &value, UPROPS_SRC_CHAR, ec); return *this; } - break; case UCHAR_NAME: - case UCHAR_UNICODE_1_NAME: { // Must munge name, since u_charFromName() does not do // 'loose' matching. char buf[128]; // it suffices that this be > uprv_getMaxCharNameLength - if (!mungeCharName(buf, vname, sizeof(buf))) FAIL(ec); - UCharNameChoice choice = (p == UCHAR_NAME) ? - U_EXTENDED_CHAR_NAME : U_UNICODE_10_CHAR_NAME; - UChar32 ch = u_charFromName(choice, buf, &ec); + if (!mungeCharName(buf, vname.data(), sizeof(buf))) FAIL(ec); + UChar32 ch = u_charFromName(U_EXTENDED_CHAR_NAME, buf, &ec); if (U_SUCCESS(ec)) { clear(); add(ch); @@ -1044,18 +1049,26 @@ UnicodeSet::applyPropertyAlias(const UnicodeString& prop, FAIL(ec); } } - break; + case UCHAR_UNICODE_1_NAME: + // ICU 49 deprecates the Unicode_1_Name property APIs. + FAIL(ec); case UCHAR_AGE: { // Must munge name, since u_versionFromString() does not do // 'loose' matching. char buf[128]; - if (!mungeCharName(buf, vname, sizeof(buf))) FAIL(ec); + if (!mungeCharName(buf, vname.data(), sizeof(buf))) FAIL(ec); UVersionInfo version; u_versionFromString(version, buf); - applyFilter(versionFilter, &version, UPROPS_SRC_CHAR, ec); + applyFilter(versionFilter, &version, UPROPS_SRC_PROPSVEC, ec); return *this; } + case UCHAR_SCRIPT_EXTENSIONS: + v = u_getPropertyValueEnum(UCHAR_SCRIPT, vname.data()); + if (v == UCHAR_INVALID_CODE) { + FAIL(ec); + } + // fall through to calling applyIntPropertyValue() break; default: // p is a non-binary, non-enumerated property that we @@ -1069,43 +1082,36 @@ UnicodeSet::applyPropertyAlias(const UnicodeString& prop, // value is empty. Interpret as General Category, Script, or // Binary property. p = UCHAR_GENERAL_CATEGORY_MASK; - v = u_getPropertyValueEnum(p, pname); + v = u_getPropertyValueEnum(p, pname.data()); if (v == UCHAR_INVALID_CODE) { p = UCHAR_SCRIPT; - v = u_getPropertyValueEnum(p, pname); + v = u_getPropertyValueEnum(p, pname.data()); if (v == UCHAR_INVALID_CODE) { - p = u_getPropertyEnum(pname); + p = u_getPropertyEnum(pname.data()); if (p >= UCHAR_BINARY_START && p < UCHAR_BINARY_LIMIT) { v = 1; - } else if (0 == uprv_comparePropertyNames(ANY, pname)) { + } else if (0 == uprv_comparePropertyNames(ANY, pname.data())) { set(MIN_VALUE, MAX_VALUE); return *this; - } else if (0 == uprv_comparePropertyNames(ASCII, pname)) { + } else if (0 == uprv_comparePropertyNames(ASCII, pname.data())) { set(0, 0x7F); return *this; + } else if (0 == uprv_comparePropertyNames(ASSIGNED, pname.data())) { + // [:Assigned:]=[:^Cn:] + p = UCHAR_GENERAL_CATEGORY_MASK; + v = U_GC_CN_MASK; + invert = TRUE; } else { - - // TODO: Remove the following special-case code when - // these four C99-compatibility properties are implemented - // as enums/names. - for (int32_t i=0; iadd(c); -} - -static void U_CALLCONV -_set_addRange(USet *set, UChar32 start, UChar32 end) { - ((UnicodeSet *)set)->add(start, end); -} - -static void U_CALLCONV -_set_addString(USet *set, const UChar *str, int32_t length) { - ((UnicodeSet *)set)->add(UnicodeString((UBool)(length<0), str, length)); -} - -/** - * Cleanup function for UnicodeSet - */ -static UBool U_CALLCONV uset_cleanup(void) { - int32_t i; - - for(i = UPROPS_SRC_NONE; i < UPROPS_SRC_COUNT; ++i) { - if (INCLUSIONS[i] != NULL) { - delete INCLUSIONS[i]; - INCLUSIONS[i] = NULL; - } - } - - if (CASE_EQUIV_HASH != NULL) { - delete CASE_EQUIV_HASH; - CASE_EQUIV_HASH = NULL; - } - - if (CASE_EQUIV_CBA != NULL) { - ucmp8_close(CASE_EQUIV_CBA); - CASE_EQUIV_CBA = NULL; - } - - return TRUE; -} - -U_CDECL_END - -const UnicodeSet* UnicodeSet::getInclusions(int32_t src, UErrorCode &status) { - umtx_lock(NULL); - UBool f = (INCLUSIONS[src] == NULL); - umtx_unlock(NULL); - if (f) { - UnicodeSet* incl = new UnicodeSet(); - USetAdder sa = { - (USet *)incl, - _set_add, - _set_addRange, - _set_addString - }; - - if (incl != NULL) { - switch(src) { - case UPROPS_SRC_CHAR: - uchar_addPropertyStarts(&sa, &status); - break; - case UPROPS_SRC_HST: - uhst_addPropertyStarts(&sa, &status); - break; -#if !UCONFIG_NO_NORMALIZATION - case UPROPS_SRC_NORM: - unorm_addPropertyStarts(&sa, &status); - break; -#endif - case UPROPS_SRC_CASE: - ucase_addPropertyStarts(ucase_getSingleton(&status), &sa, &status); - break; - default: - status = U_INTERNAL_PROGRAM_ERROR; - break; - } - if (U_SUCCESS(status)) { - umtx_lock(NULL); - if (INCLUSIONS[src] == NULL) { - INCLUSIONS[src] = incl; - incl = NULL; - ucln_common_registerCleanup(UCLN_COMMON_USET, uset_cleanup); - } - umtx_unlock(NULL); - } - delete incl; - } else { - status = U_MEMORY_ALLOCATION_ERROR; - } - } - return INCLUSIONS[src]; -} - -//---------------------------------------------------------------- -// Case folding API -//---------------------------------------------------------------- - -// add the result of a full case mapping to the set -// use str as a temporary string to avoid constructing one -static inline void -addCaseMapping(UnicodeSet &set, int32_t result, const UChar *full, UnicodeString &str) { - if(result >= 0) { - if(result > UCASE_MAX_STRING_LENGTH) { - // add a single-code point case mapping - set.add(result); - } else { - // add a string case mapping from full with length result - str.setTo((UBool)FALSE, full, result); - set.add(str); - } - } - // result < 0: the code point mapped to itself, no need to add it - // see ucase.h -} - -UnicodeSet& UnicodeSet::closeOver(int32_t attribute) { - if ((attribute & USET_CASE) != 0) { - UnicodeSet foldSet; - UnicodeString str; - int32_t n = getRangeCount(); - for (int32_t i=0; isize() > 0) { - for (int32_t j=0; jsize(); ++j) { - str = * (const UnicodeString*) strings->elementAt(j); - foldSet.caseCloseOne(str.foldCase()); - } - } - *this = foldSet; - } - else if ((attribute & USET_ADD_CASE_MAPPINGS)) { - UnicodeSet foldSet(*this); - UnicodeString str; - UErrorCode status = U_ZERO_ERROR; - UCaseProps *csp = ucase_getSingleton(&status); - if (U_SUCCESS(status)) { - int32_t n = getRangeCount(); - UChar32 result; - const UChar *full; - int32_t locCache = 0; - - for (int32_t i=0; isize() > 0) { - Locale root(""); -#if !UCONFIG_NO_BREAK_ITERATION - BreakIterator *bi = BreakIterator::createWordInstance(root, status); -#endif - if (U_SUCCESS(status)) { - const UnicodeString *pStr; - - for (int32_t j=0; jsize(); ++j) { - pStr = (const UnicodeString *) strings->elementAt(j); - (str = *pStr).toLower(root); - foldSet.add(str); -#if !UCONFIG_NO_BREAK_ITERATION - (str = *pStr).toTitle(bi, root); - foldSet.add(str); -#endif - (str = *pStr).toUpper(root); - foldSet.add(str); - (str = *pStr).foldCase(); - foldSet.add(str); - } - } -#if !UCONFIG_NO_BREAK_ITERATION - delete bi; -#endif - } - *this = foldSet; - } - } - return *this; -} - -//---------------------------------------------------------------- -// Case folding implementation -//---------------------------------------------------------------- - -/** - * Data structure representing a case-fold equivalency class. It is a - * SET containing 0 or more code units, and 0 or more strings of - * length 2 code units or longer. - * - * This class is implemented as a 8-UChar buffer with a few - * convenience methods on it. The format of the buffer: - * - All single code units in this set, followed by a terminating - * zero. If none, then just a terminating zero. - * - Zero or more 0-terminated strings, each of length >= 2 - * code units. - * - A single terminating (UChar)0. - * - * Usage: - * - * const CaseEquivClass& c = ...; - * const UChar* p; - * for (c.getStrings(p); *p; c.nextString(p)) { - * foo(p); - * } - */ -class CaseEquivClass { -public: - UChar data[8]; - - /** - * Return the string of single code units. May be "". Will never - * be NULL. - */ - const UChar* getSingles() const { - return data; - } - - /** - * Return the first multi-code-unit string. May be "" if there - * are none. Will never be NULL. - * @param p pointer to be set to point to the first string. - */ - void getStrings(const UChar*& p) const { - p = data; - nextString(p); - } - - /** - * Advance a pointer from one multi-code-unit string to the next. - * May advance 'p' to point to "" if there are no more. - * Do NOT call if *p == 0. - * @param p pointer to be advanced to point to the next string. - */ - static void nextString(const UChar*& p) { - while (*p++) {} - } -}; - -/** - * IMPORTANT: The following two static data arrays represent the - * information used to do case closure. The first array is an array - * of pairs. That is, for each even index e, entries [e] and [e+1] - * form a pair of case equivalent code units. The entry at [e] is the - * folded one, that is, the one for which u_foldCase(x)==x. - * - * The second static array is an array of CaseEquivClass objects. - * Since these objects are just adorned UChar[] arrays, they can be - * initialized in place in the array, and all of them can live in a - * single piece of static memory, with no heap allocation. - */ - -// MACHINE-GENERATED: Do not edit (see com.ibm.icu.dev.tools.translit.UnicodeSetCloseOver) -static const UChar CASE_PAIRS[] = { - 0x0061,0x0041,0x0062,0x0042,0x0063,0x0043,0x0064,0x0044,0x0065,0x0045, - 0x0066,0x0046,0x0067,0x0047,0x0068,0x0048,0x0069,0x0049,0x006A,0x004A, - 0x006C,0x004C,0x006D,0x004D,0x006E,0x004E,0x006F,0x004F,0x0070,0x0050, - 0x0071,0x0051,0x0072,0x0052,0x0074,0x0054,0x0075,0x0055,0x0076,0x0056, - 0x0077,0x0057,0x0078,0x0058,0x0079,0x0059,0x007A,0x005A,0x00E0,0x00C0, - 0x00E1,0x00C1,0x00E2,0x00C2,0x00E3,0x00C3,0x00E4,0x00C4,0x00E6,0x00C6, - 0x00E7,0x00C7,0x00E8,0x00C8,0x00E9,0x00C9,0x00EA,0x00CA,0x00EB,0x00CB, - 0x00EC,0x00CC,0x00ED,0x00CD,0x00EE,0x00CE,0x00EF,0x00CF,0x00F0,0x00D0, - 0x00F1,0x00D1,0x00F2,0x00D2,0x00F3,0x00D3,0x00F4,0x00D4,0x00F5,0x00D5, - 0x00F6,0x00D6,0x00F8,0x00D8,0x00F9,0x00D9,0x00FA,0x00DA,0x00FB,0x00DB, - 0x00FC,0x00DC,0x00FD,0x00DD,0x00FE,0x00DE,0x00FF,0x0178,0x0101,0x0100, - 0x0103,0x0102,0x0105,0x0104,0x0107,0x0106,0x0109,0x0108,0x010B,0x010A, - 0x010D,0x010C,0x010F,0x010E,0x0111,0x0110,0x0113,0x0112,0x0115,0x0114, - 0x0117,0x0116,0x0119,0x0118,0x011B,0x011A,0x011D,0x011C,0x011F,0x011E, - 0x0121,0x0120,0x0123,0x0122,0x0125,0x0124,0x0127,0x0126,0x0129,0x0128, - 0x012B,0x012A,0x012D,0x012C,0x012F,0x012E,0x0133,0x0132,0x0135,0x0134, - 0x0137,0x0136,0x013A,0x0139,0x013C,0x013B,0x013E,0x013D,0x0140,0x013F, - 0x0142,0x0141,0x0144,0x0143,0x0146,0x0145,0x0148,0x0147,0x014B,0x014A, - 0x014D,0x014C,0x014F,0x014E,0x0151,0x0150,0x0153,0x0152,0x0155,0x0154, - 0x0157,0x0156,0x0159,0x0158,0x015B,0x015A,0x015D,0x015C,0x015F,0x015E, - 0x0161,0x0160,0x0163,0x0162,0x0165,0x0164,0x0167,0x0166,0x0169,0x0168, - 0x016B,0x016A,0x016D,0x016C,0x016F,0x016E,0x0171,0x0170,0x0173,0x0172, - 0x0175,0x0174,0x0177,0x0176,0x017A,0x0179,0x017C,0x017B,0x017E,0x017D, - 0x0183,0x0182,0x0185,0x0184,0x0188,0x0187,0x018C,0x018B,0x0192,0x0191, - 0x0195,0x01F6,0x0199,0x0198,0x019E,0x0220,0x01A1,0x01A0,0x01A3,0x01A2, - 0x01A5,0x01A4,0x01A8,0x01A7,0x01AD,0x01AC,0x01B0,0x01AF,0x01B4,0x01B3, - 0x01B6,0x01B5,0x01B9,0x01B8,0x01BD,0x01BC,0x01BF,0x01F7,0x01CE,0x01CD, - 0x01D0,0x01CF,0x01D2,0x01D1,0x01D4,0x01D3,0x01D6,0x01D5,0x01D8,0x01D7, - 0x01DA,0x01D9,0x01DC,0x01DB,0x01DD,0x018E,0x01DF,0x01DE,0x01E1,0x01E0, - 0x01E3,0x01E2,0x01E5,0x01E4,0x01E7,0x01E6,0x01E9,0x01E8,0x01EB,0x01EA, - 0x01ED,0x01EC,0x01EF,0x01EE,0x01F5,0x01F4,0x01F9,0x01F8,0x01FB,0x01FA, - 0x01FD,0x01FC,0x01FF,0x01FE,0x0201,0x0200,0x0203,0x0202,0x0205,0x0204, - 0x0207,0x0206,0x0209,0x0208,0x020B,0x020A,0x020D,0x020C,0x020F,0x020E, - 0x0211,0x0210,0x0213,0x0212,0x0215,0x0214,0x0217,0x0216,0x0219,0x0218, - 0x021B,0x021A,0x021D,0x021C,0x021F,0x021E,0x0223,0x0222,0x0225,0x0224, - 0x0227,0x0226,0x0229,0x0228,0x022B,0x022A,0x022D,0x022C,0x022F,0x022E, - 0x0231,0x0230,0x0233,0x0232,0x0253,0x0181,0x0254,0x0186,0x0256,0x0189, - 0x0257,0x018A,0x0259,0x018F,0x025B,0x0190,0x0260,0x0193,0x0263,0x0194, - 0x0268,0x0197,0x0269,0x0196,0x026F,0x019C,0x0272,0x019D,0x0275,0x019F, - 0x0280,0x01A6,0x0283,0x01A9,0x0288,0x01AE,0x028A,0x01B1,0x028B,0x01B2, - 0x0292,0x01B7,0x03AC,0x0386,0x03AD,0x0388,0x03AE,0x0389,0x03AF,0x038A, - 0x03B1,0x0391,0x03B3,0x0393,0x03B4,0x0394,0x03B6,0x0396,0x03B7,0x0397, - 0x03BB,0x039B,0x03BD,0x039D,0x03BE,0x039E,0x03BF,0x039F,0x03C4,0x03A4, - 0x03C5,0x03A5,0x03C7,0x03A7,0x03C8,0x03A8,0x03CA,0x03AA,0x03CB,0x03AB, - 0x03CC,0x038C,0x03CD,0x038E,0x03CE,0x038F,0x03D9,0x03D8,0x03DB,0x03DA, - 0x03DD,0x03DC,0x03DF,0x03DE,0x03E1,0x03E0,0x03E3,0x03E2,0x03E5,0x03E4, - 0x03E7,0x03E6,0x03E9,0x03E8,0x03EB,0x03EA,0x03ED,0x03EC,0x03EF,0x03EE, - 0x0430,0x0410,0x0431,0x0411,0x0432,0x0412,0x0433,0x0413,0x0434,0x0414, - 0x0435,0x0415,0x0436,0x0416,0x0437,0x0417,0x0438,0x0418,0x0439,0x0419, - 0x043A,0x041A,0x043B,0x041B,0x043C,0x041C,0x043D,0x041D,0x043E,0x041E, - 0x043F,0x041F,0x0440,0x0420,0x0441,0x0421,0x0442,0x0422,0x0443,0x0423, - 0x0444,0x0424,0x0445,0x0425,0x0446,0x0426,0x0447,0x0427,0x0448,0x0428, - 0x0449,0x0429,0x044A,0x042A,0x044B,0x042B,0x044C,0x042C,0x044D,0x042D, - 0x044E,0x042E,0x044F,0x042F,0x0450,0x0400,0x0451,0x0401,0x0452,0x0402, - 0x0453,0x0403,0x0454,0x0404,0x0455,0x0405,0x0456,0x0406,0x0457,0x0407, - 0x0458,0x0408,0x0459,0x0409,0x045A,0x040A,0x045B,0x040B,0x045C,0x040C, - 0x045D,0x040D,0x045E,0x040E,0x045F,0x040F,0x0461,0x0460,0x0463,0x0462, - 0x0465,0x0464,0x0467,0x0466,0x0469,0x0468,0x046B,0x046A,0x046D,0x046C, - 0x046F,0x046E,0x0471,0x0470,0x0473,0x0472,0x0475,0x0474,0x0477,0x0476, - 0x0479,0x0478,0x047B,0x047A,0x047D,0x047C,0x047F,0x047E,0x0481,0x0480, - 0x048B,0x048A,0x048D,0x048C,0x048F,0x048E,0x0491,0x0490,0x0493,0x0492, - 0x0495,0x0494,0x0497,0x0496,0x0499,0x0498,0x049B,0x049A,0x049D,0x049C, - 0x049F,0x049E,0x04A1,0x04A0,0x04A3,0x04A2,0x04A5,0x04A4,0x04A7,0x04A6, - 0x04A9,0x04A8,0x04AB,0x04AA,0x04AD,0x04AC,0x04AF,0x04AE,0x04B1,0x04B0, - 0x04B3,0x04B2,0x04B5,0x04B4,0x04B7,0x04B6,0x04B9,0x04B8,0x04BB,0x04BA, - 0x04BD,0x04BC,0x04BF,0x04BE,0x04C2,0x04C1,0x04C4,0x04C3,0x04C6,0x04C5, - 0x04C8,0x04C7,0x04CA,0x04C9,0x04CC,0x04CB,0x04CE,0x04CD,0x04D1,0x04D0, - 0x04D3,0x04D2,0x04D5,0x04D4,0x04D7,0x04D6,0x04D9,0x04D8,0x04DB,0x04DA, - 0x04DD,0x04DC,0x04DF,0x04DE,0x04E1,0x04E0,0x04E3,0x04E2,0x04E5,0x04E4, - 0x04E7,0x04E6,0x04E9,0x04E8,0x04EB,0x04EA,0x04ED,0x04EC,0x04EF,0x04EE, - 0x04F1,0x04F0,0x04F3,0x04F2,0x04F5,0x04F4,0x04F9,0x04F8,0x0501,0x0500, - 0x0503,0x0502,0x0505,0x0504,0x0507,0x0506,0x0509,0x0508,0x050B,0x050A, - 0x050D,0x050C,0x050F,0x050E,0x0561,0x0531,0x0562,0x0532,0x0563,0x0533, - 0x0564,0x0534,0x0565,0x0535,0x0566,0x0536,0x0567,0x0537,0x0568,0x0538, - 0x0569,0x0539,0x056A,0x053A,0x056B,0x053B,0x056C,0x053C,0x056D,0x053D, - 0x056E,0x053E,0x056F,0x053F,0x0570,0x0540,0x0571,0x0541,0x0572,0x0542, - 0x0573,0x0543,0x0574,0x0544,0x0575,0x0545,0x0576,0x0546,0x0577,0x0547, - 0x0578,0x0548,0x0579,0x0549,0x057A,0x054A,0x057B,0x054B,0x057C,0x054C, - 0x057D,0x054D,0x057E,0x054E,0x057F,0x054F,0x0580,0x0550,0x0581,0x0551, - 0x0582,0x0552,0x0583,0x0553,0x0584,0x0554,0x0585,0x0555,0x0586,0x0556, - 0x1E01,0x1E00,0x1E03,0x1E02,0x1E05,0x1E04,0x1E07,0x1E06,0x1E09,0x1E08, - 0x1E0B,0x1E0A,0x1E0D,0x1E0C,0x1E0F,0x1E0E,0x1E11,0x1E10,0x1E13,0x1E12, - 0x1E15,0x1E14,0x1E17,0x1E16,0x1E19,0x1E18,0x1E1B,0x1E1A,0x1E1D,0x1E1C, - 0x1E1F,0x1E1E,0x1E21,0x1E20,0x1E23,0x1E22,0x1E25,0x1E24,0x1E27,0x1E26, - 0x1E29,0x1E28,0x1E2B,0x1E2A,0x1E2D,0x1E2C,0x1E2F,0x1E2E,0x1E31,0x1E30, - 0x1E33,0x1E32,0x1E35,0x1E34,0x1E37,0x1E36,0x1E39,0x1E38,0x1E3B,0x1E3A, - 0x1E3D,0x1E3C,0x1E3F,0x1E3E,0x1E41,0x1E40,0x1E43,0x1E42,0x1E45,0x1E44, - 0x1E47,0x1E46,0x1E49,0x1E48,0x1E4B,0x1E4A,0x1E4D,0x1E4C,0x1E4F,0x1E4E, - 0x1E51,0x1E50,0x1E53,0x1E52,0x1E55,0x1E54,0x1E57,0x1E56,0x1E59,0x1E58, - 0x1E5B,0x1E5A,0x1E5D,0x1E5C,0x1E5F,0x1E5E,0x1E63,0x1E62,0x1E65,0x1E64, - 0x1E67,0x1E66,0x1E69,0x1E68,0x1E6B,0x1E6A,0x1E6D,0x1E6C,0x1E6F,0x1E6E, - 0x1E71,0x1E70,0x1E73,0x1E72,0x1E75,0x1E74,0x1E77,0x1E76,0x1E79,0x1E78, - 0x1E7B,0x1E7A,0x1E7D,0x1E7C,0x1E7F,0x1E7E,0x1E81,0x1E80,0x1E83,0x1E82, - 0x1E85,0x1E84,0x1E87,0x1E86,0x1E89,0x1E88,0x1E8B,0x1E8A,0x1E8D,0x1E8C, - 0x1E8F,0x1E8E,0x1E91,0x1E90,0x1E93,0x1E92,0x1E95,0x1E94,0x1EA1,0x1EA0, - 0x1EA3,0x1EA2,0x1EA5,0x1EA4,0x1EA7,0x1EA6,0x1EA9,0x1EA8,0x1EAB,0x1EAA, - 0x1EAD,0x1EAC,0x1EAF,0x1EAE,0x1EB1,0x1EB0,0x1EB3,0x1EB2,0x1EB5,0x1EB4, - 0x1EB7,0x1EB6,0x1EB9,0x1EB8,0x1EBB,0x1EBA,0x1EBD,0x1EBC,0x1EBF,0x1EBE, - 0x1EC1,0x1EC0,0x1EC3,0x1EC2,0x1EC5,0x1EC4,0x1EC7,0x1EC6,0x1EC9,0x1EC8, - 0x1ECB,0x1ECA,0x1ECD,0x1ECC,0x1ECF,0x1ECE,0x1ED1,0x1ED0,0x1ED3,0x1ED2, - 0x1ED5,0x1ED4,0x1ED7,0x1ED6,0x1ED9,0x1ED8,0x1EDB,0x1EDA,0x1EDD,0x1EDC, - 0x1EDF,0x1EDE,0x1EE1,0x1EE0,0x1EE3,0x1EE2,0x1EE5,0x1EE4,0x1EE7,0x1EE6, - 0x1EE9,0x1EE8,0x1EEB,0x1EEA,0x1EED,0x1EEC,0x1EEF,0x1EEE,0x1EF1,0x1EF0, - 0x1EF3,0x1EF2,0x1EF5,0x1EF4,0x1EF7,0x1EF6,0x1EF9,0x1EF8,0x1F00,0x1F08, - 0x1F01,0x1F09,0x1F02,0x1F0A,0x1F03,0x1F0B,0x1F04,0x1F0C,0x1F05,0x1F0D, - 0x1F06,0x1F0E,0x1F07,0x1F0F,0x1F10,0x1F18,0x1F11,0x1F19,0x1F12,0x1F1A, - 0x1F13,0x1F1B,0x1F14,0x1F1C,0x1F15,0x1F1D,0x1F20,0x1F28,0x1F21,0x1F29, - 0x1F22,0x1F2A,0x1F23,0x1F2B,0x1F24,0x1F2C,0x1F25,0x1F2D,0x1F26,0x1F2E, - 0x1F27,0x1F2F,0x1F30,0x1F38,0x1F31,0x1F39,0x1F32,0x1F3A,0x1F33,0x1F3B, - 0x1F34,0x1F3C,0x1F35,0x1F3D,0x1F36,0x1F3E,0x1F37,0x1F3F,0x1F40,0x1F48, - 0x1F41,0x1F49,0x1F42,0x1F4A,0x1F43,0x1F4B,0x1F44,0x1F4C,0x1F45,0x1F4D, - 0x1F51,0x1F59,0x1F53,0x1F5B,0x1F55,0x1F5D,0x1F57,0x1F5F,0x1F60,0x1F68, - 0x1F61,0x1F69,0x1F62,0x1F6A,0x1F63,0x1F6B,0x1F64,0x1F6C,0x1F65,0x1F6D, - 0x1F66,0x1F6E,0x1F67,0x1F6F,0x1F70,0x1FBA,0x1F71,0x1FBB,0x1F72,0x1FC8, - 0x1F73,0x1FC9,0x1F74,0x1FCA,0x1F75,0x1FCB,0x1F76,0x1FDA,0x1F77,0x1FDB, - 0x1F78,0x1FF8,0x1F79,0x1FF9,0x1F7A,0x1FEA,0x1F7B,0x1FEB,0x1F7C,0x1FFA, - 0x1F7D,0x1FFB,0x1FB0,0x1FB8,0x1FB1,0x1FB9,0x1FD0,0x1FD8,0x1FD1,0x1FD9, - 0x1FE0,0x1FE8,0x1FE1,0x1FE9,0x1FE5,0x1FEC,0x2170,0x2160,0x2171,0x2161, - 0x2172,0x2162,0x2173,0x2163,0x2174,0x2164,0x2175,0x2165,0x2176,0x2166, - 0x2177,0x2167,0x2178,0x2168,0x2179,0x2169,0x217A,0x216A,0x217B,0x216B, - 0x217C,0x216C,0x217D,0x216D,0x217E,0x216E,0x217F,0x216F,0x24D0,0x24B6, - 0x24D1,0x24B7,0x24D2,0x24B8,0x24D3,0x24B9,0x24D4,0x24BA,0x24D5,0x24BB, - 0x24D6,0x24BC,0x24D7,0x24BD,0x24D8,0x24BE,0x24D9,0x24BF,0x24DA,0x24C0, - 0x24DB,0x24C1,0x24DC,0x24C2,0x24DD,0x24C3,0x24DE,0x24C4,0x24DF,0x24C5, - 0x24E0,0x24C6,0x24E1,0x24C7,0x24E2,0x24C8,0x24E3,0x24C9,0x24E4,0x24CA, - 0x24E5,0x24CB,0x24E6,0x24CC,0x24E7,0x24CD,0x24E8,0x24CE,0x24E9,0x24CF, - 0xFF41,0xFF21,0xFF42,0xFF22,0xFF43,0xFF23,0xFF44,0xFF24,0xFF45,0xFF25, - 0xFF46,0xFF26,0xFF47,0xFF27,0xFF48,0xFF28,0xFF49,0xFF29,0xFF4A,0xFF2A, - 0xFF4B,0xFF2B,0xFF4C,0xFF2C,0xFF4D,0xFF2D,0xFF4E,0xFF2E,0xFF4F,0xFF2F, - 0xFF50,0xFF30,0xFF51,0xFF31,0xFF52,0xFF32,0xFF53,0xFF33,0xFF54,0xFF34, - 0xFF55,0xFF35,0xFF56,0xFF36,0xFF57,0xFF37,0xFF58,0xFF38,0xFF59,0xFF39, - 0xFF5A,0xFF3A, -}; - -// MACHINE-GENERATED: Do not edit (see com.ibm.icu.dev.tools.translit.UnicodeSetCloseOver) -static const CaseEquivClass CASE_NONPAIRS[] = { - {{0x1E9A,0, 0x0061,0x02BE,0, 0}}, - {{0xFB00,0, 0x0066,0x0066,0, 0}}, - {{0xFB03,0, 0x0066,0x0066,0x0069,0, 0}}, - {{0xFB04,0, 0x0066,0x0066,0x006C,0, 0}}, - {{0xFB01,0, 0x0066,0x0069,0, 0}}, - {{0xFB02,0, 0x0066,0x006C,0, 0}}, - {{0x1E96,0, 0x0068,0x0331,0, 0}}, - {{0x0130,0, 0x0069,0x0307,0, 0}}, - {{0x01F0,0, 0x006A,0x030C,0, 0}}, - {{0x004B,0x006B,0x212A,0, 0}}, - {{0x0053,0x0073,0x017F,0, 0}}, - {{0x00DF,0, 0x0073,0x0073,0, 0}}, - {{0xFB05,0xFB06,0, 0x0073,0x0074,0, 0}}, - {{0x1E97,0, 0x0074,0x0308,0, 0}}, - {{0x1E98,0, 0x0077,0x030A,0, 0}}, - {{0x1E99,0, 0x0079,0x030A,0, 0}}, - {{0x00C5,0x00E5,0x212B,0, 0}}, - {{0x01C4,0x01C5,0x01C6,0, 0}}, - {{0x01C7,0x01C8,0x01C9,0, 0}}, - {{0x01CA,0x01CB,0x01CC,0, 0}}, - {{0x01F1,0x01F2,0x01F3,0, 0}}, - {{0x0149,0, 0x02BC,0x006E,0, 0}}, - {{0x1FB4,0, 0x03AC,0x03B9,0, 0}}, - {{0x1FC4,0, 0x03AE,0x03B9,0, 0}}, - {{0x1FB6,0, 0x03B1,0x0342,0, 0}}, - {{0x1FB7,0, 0x03B1,0x0342,0x03B9,0, 0}}, - {{0x1FB3,0x1FBC,0, 0x03B1,0x03B9,0, 0}}, - {{0x0392,0x03B2,0x03D0,0, 0}}, - {{0x0395,0x03B5,0x03F5,0, 0}}, - {{0x1FC6,0, 0x03B7,0x0342,0, 0}}, - {{0x1FC7,0, 0x03B7,0x0342,0x03B9,0, 0}}, - {{0x1FC3,0x1FCC,0, 0x03B7,0x03B9,0, 0}}, - {{0x0398,0x03B8,0x03D1,0x03F4,0, 0}}, - {{0x0345,0x0399,0x03B9,0x1FBE,0, 0}}, - {{0x1FD2,0, 0x03B9,0x0308,0x0300,0, 0}}, - {{0x0390,0x1FD3,0, 0x03B9,0x0308,0x0301,0, 0}}, - {{0x1FD7,0, 0x03B9,0x0308,0x0342,0, 0}}, - {{0x1FD6,0, 0x03B9,0x0342,0, 0}}, - {{0x039A,0x03BA,0x03F0,0, 0}}, - {{0x00B5,0x039C,0x03BC,0, 0}}, - {{0x03A0,0x03C0,0x03D6,0, 0}}, - {{0x03A1,0x03C1,0x03F1,0, 0}}, - {{0x1FE4,0, 0x03C1,0x0313,0, 0}}, - {{0x03A3,0x03C2,0x03C3,0x03F2,0, 0}}, - {{0x1FE2,0, 0x03C5,0x0308,0x0300,0, 0}}, - {{0x03B0,0x1FE3,0, 0x03C5,0x0308,0x0301,0, 0}}, - {{0x1FE7,0, 0x03C5,0x0308,0x0342,0, 0}}, - {{0x1F50,0, 0x03C5,0x0313,0, 0}}, - {{0x1F52,0, 0x03C5,0x0313,0x0300,0, 0}}, - {{0x1F54,0, 0x03C5,0x0313,0x0301,0, 0}}, - {{0x1F56,0, 0x03C5,0x0313,0x0342,0, 0}}, - {{0x1FE6,0, 0x03C5,0x0342,0, 0}}, - {{0x03A6,0x03C6,0x03D5,0, 0}}, - {{0x03A9,0x03C9,0x2126,0, 0}}, - {{0x1FF6,0, 0x03C9,0x0342,0, 0}}, - {{0x1FF7,0, 0x03C9,0x0342,0x03B9,0, 0}}, - {{0x1FF3,0x1FFC,0, 0x03C9,0x03B9,0, 0}}, - {{0x1FF4,0, 0x03CE,0x03B9,0, 0}}, - {{0x0587,0, 0x0565,0x0582,0, 0}}, - {{0xFB14,0, 0x0574,0x0565,0, 0}}, - {{0xFB15,0, 0x0574,0x056B,0, 0}}, - {{0xFB17,0, 0x0574,0x056D,0, 0}}, - {{0xFB13,0, 0x0574,0x0576,0, 0}}, - {{0xFB16,0, 0x057E,0x0576,0, 0}}, - {{0x1E60,0x1E61,0x1E9B,0, 0}}, - {{0x1F80,0x1F88,0, 0x1F00,0x03B9,0, 0}}, - {{0x1F81,0x1F89,0, 0x1F01,0x03B9,0, 0}}, - {{0x1F82,0x1F8A,0, 0x1F02,0x03B9,0, 0}}, - {{0x1F83,0x1F8B,0, 0x1F03,0x03B9,0, 0}}, - {{0x1F84,0x1F8C,0, 0x1F04,0x03B9,0, 0}}, - {{0x1F85,0x1F8D,0, 0x1F05,0x03B9,0, 0}}, - {{0x1F86,0x1F8E,0, 0x1F06,0x03B9,0, 0}}, - {{0x1F87,0x1F8F,0, 0x1F07,0x03B9,0, 0}}, - {{0x1F90,0x1F98,0, 0x1F20,0x03B9,0, 0}}, - {{0x1F91,0x1F99,0, 0x1F21,0x03B9,0, 0}}, - {{0x1F92,0x1F9A,0, 0x1F22,0x03B9,0, 0}}, - {{0x1F93,0x1F9B,0, 0x1F23,0x03B9,0, 0}}, - {{0x1F94,0x1F9C,0, 0x1F24,0x03B9,0, 0}}, - {{0x1F95,0x1F9D,0, 0x1F25,0x03B9,0, 0}}, - {{0x1F96,0x1F9E,0, 0x1F26,0x03B9,0, 0}}, - {{0x1F97,0x1F9F,0, 0x1F27,0x03B9,0, 0}}, - {{0x1FA0,0x1FA8,0, 0x1F60,0x03B9,0, 0}}, - {{0x1FA1,0x1FA9,0, 0x1F61,0x03B9,0, 0}}, - {{0x1FA2,0x1FAA,0, 0x1F62,0x03B9,0, 0}}, - {{0x1FA3,0x1FAB,0, 0x1F63,0x03B9,0, 0}}, - {{0x1FA4,0x1FAC,0, 0x1F64,0x03B9,0, 0}}, - {{0x1FA5,0x1FAD,0, 0x1F65,0x03B9,0, 0}}, - {{0x1FA6,0x1FAE,0, 0x1F66,0x03B9,0, 0}}, - {{0x1FA7,0x1FAF,0, 0x1F67,0x03B9,0, 0}}, - {{0x1FB2,0, 0x1F70,0x03B9,0, 0}}, - {{0x1FC2,0, 0x1F74,0x03B9,0, 0}}, - {{0x1FF2,0, 0x1F7C,0x03B9,0, 0}}, - {{0, 0xD801,0xDC00,0, 0xD801,0xDC28,0, 0}}, - {{0, 0xD801,0xDC01,0, 0xD801,0xDC29,0, 0}}, - {{0, 0xD801,0xDC02,0, 0xD801,0xDC2A,0, 0}}, - {{0, 0xD801,0xDC03,0, 0xD801,0xDC2B,0, 0}}, - {{0, 0xD801,0xDC04,0, 0xD801,0xDC2C,0, 0}}, - {{0, 0xD801,0xDC05,0, 0xD801,0xDC2D,0, 0}}, - {{0, 0xD801,0xDC06,0, 0xD801,0xDC2E,0, 0}}, - {{0, 0xD801,0xDC07,0, 0xD801,0xDC2F,0, 0}}, - {{0, 0xD801,0xDC08,0, 0xD801,0xDC30,0, 0}}, - {{0, 0xD801,0xDC09,0, 0xD801,0xDC31,0, 0}}, - {{0, 0xD801,0xDC0A,0, 0xD801,0xDC32,0, 0}}, - {{0, 0xD801,0xDC0B,0, 0xD801,0xDC33,0, 0}}, - {{0, 0xD801,0xDC0C,0, 0xD801,0xDC34,0, 0}}, - {{0, 0xD801,0xDC0D,0, 0xD801,0xDC35,0, 0}}, - {{0, 0xD801,0xDC0E,0, 0xD801,0xDC36,0, 0}}, - {{0, 0xD801,0xDC0F,0, 0xD801,0xDC37,0, 0}}, - {{0, 0xD801,0xDC10,0, 0xD801,0xDC38,0, 0}}, - {{0, 0xD801,0xDC11,0, 0xD801,0xDC39,0, 0}}, - {{0, 0xD801,0xDC12,0, 0xD801,0xDC3A,0, 0}}, - {{0, 0xD801,0xDC13,0, 0xD801,0xDC3B,0, 0}}, - {{0, 0xD801,0xDC14,0, 0xD801,0xDC3C,0, 0}}, - {{0, 0xD801,0xDC15,0, 0xD801,0xDC3D,0, 0}}, - {{0, 0xD801,0xDC16,0, 0xD801,0xDC3E,0, 0}}, - {{0, 0xD801,0xDC17,0, 0xD801,0xDC3F,0, 0}}, - {{0, 0xD801,0xDC18,0, 0xD801,0xDC40,0, 0}}, - {{0, 0xD801,0xDC19,0, 0xD801,0xDC41,0, 0}}, - {{0, 0xD801,0xDC1A,0, 0xD801,0xDC42,0, 0}}, - {{0, 0xD801,0xDC1B,0, 0xD801,0xDC43,0, 0}}, - {{0, 0xD801,0xDC1C,0, 0xD801,0xDC44,0, 0}}, - {{0, 0xD801,0xDC1D,0, 0xD801,0xDC45,0, 0}}, - {{0, 0xD801,0xDC1E,0, 0xD801,0xDC46,0, 0}}, - {{0, 0xD801,0xDC1F,0, 0xD801,0xDC47,0, 0}}, - {{0, 0xD801,0xDC20,0, 0xD801,0xDC48,0, 0}}, - {{0, 0xD801,0xDC21,0, 0xD801,0xDC49,0, 0}}, - {{0, 0xD801,0xDC22,0, 0xD801,0xDC4A,0, 0}}, - {{0, 0xD801,0xDC23,0, 0xD801,0xDC4B,0, 0}}, - {{0, 0xD801,0xDC24,0, 0xD801,0xDC4C,0, 0}}, - {{0, 0xD801,0xDC25,0, 0xD801,0xDC4D,0, 0}} -}; - -#define CASE_PAIRS_LENGTH (sizeof(CASE_PAIRS)/sizeof(CASE_PAIRS[0])) -#define CASE_NONPAIRS_LENGTH (sizeof(CASE_NONPAIRS)/sizeof(CASE_NONPAIRS[0])) - -/** - * Add to this set all members of the case fold equivalency class - * that contains 'folded'. - * @param folded a string within a case fold equivalency class. - * It must have the property that UCharacter.foldCase(folded, - * DEFAULT_CASE_MAP).equals(folded). - */ -void UnicodeSet::caseCloseOne(const UnicodeString& folded) { - if (folded.length() == 1) { - caseCloseOne(folded.charAt(0)); - return; - } - - const CaseEquivClass* c = getCaseMapOf(folded); - if (c != NULL) { - caseCloseOne(*c); - return; - } - - // Add 'folded' itself; it belongs to no equivalency class. - add(folded); -} - -/** - * Add to this set all members of the case fold equivalency class - * that contains 'folded'. - * @param folded a code UNIT within a case fold equivalency class. - * It must have the property that uchar_foldCase(folded, - * DEFAULT_CASE_MAP) == folded. - */ -void UnicodeSet::caseCloseOne(UChar folded) { - // We must do a DOUBLE LOOKUP, first in the CompactByteArray that - // indexes into CASE_NONPAIRS[] and then into the CASE_PAIRS[] - // sorted array. A character will occur in one or the other, or - // neither, but not both. - - // Look in the CompactByteArray. - const CaseEquivClass* c = getCaseMapOf(folded); - if (c != NULL) { - caseCloseOne(*c); - return; - } - - // Binary search in pairs array, looking at only even entries. - // The indices low, high, and x will be halved with respect to - // CASE_PAIRS[]; that is, they must be doubled before indexing. - - // CASE_PAIRS has 1312 elements, of 656 pairs, so the search - // takes no more than 10 passes. - int32_t low = 0; - int32_t high = (CASE_PAIRS_LENGTH >> 1) - 1; - int32_t x; - do { - x = (low + high) >> 1; - UChar ch = CASE_PAIRS[(uint32_t)(x << 1)]; - if (folded < ch) { - high = x - 1; - } else if (folded > ch) { - low = x + 1; - } else { - break; - } - } while (low < high); - - x = (low + high) & ~1; // ((low + high) >> 1) << 1 - if (folded == CASE_PAIRS[x]) { - add(CASE_PAIRS[x]); - add(CASE_PAIRS[x+1]); - } else { - // If the search fails, then add folded itself; it is a - // case-unique code unit. - add(folded); - } -} - -/** - * Add to this set all members of the given CaseEquivClass object. - */ -void UnicodeSet::caseCloseOne(const CaseEquivClass& c) { - const UChar* p = c.getSingles(); - while (*p) { - add(*p++); // add all single code units - } - for (c.getStrings(p); *p; c.nextString(p)) { - add(p); // add all strings - } -} - -/** - * Given a folded string of length >= 2 code units, return the - * CaseEquivClass containing this string, or NULL if none. - */ -const CaseEquivClass* UnicodeSet::getCaseMapOf(const UnicodeString& folded) { - umtx_lock(NULL); - UBool f = (CASE_EQUIV_HASH == NULL); - umtx_unlock(NULL); - - if (f) { - // Create the Hashtable, which maps UnicodeStrings to index - // values into CASE_NONPAIRS. - UErrorCode ec = U_ZERO_ERROR; - Hashtable* hash = new Hashtable(); - if (hash != NULL) { - int32_t i; - for (i=0; i<(int32_t)CASE_NONPAIRS_LENGTH; ++i) { - const CaseEquivClass* c = &CASE_NONPAIRS[i]; - const UChar* p; - for (c->getStrings(p); *p; c->nextString(p)) { - hash->put(UnicodeString(p), (void*) c, ec); - } - } - if (U_SUCCESS(ec)) { - umtx_lock(NULL); - if (CASE_EQUIV_HASH == NULL) { - CASE_EQUIV_HASH = hash; - hash = NULL; - ucln_common_registerCleanup(UCLN_COMMON_USET, uset_cleanup); - } - umtx_unlock(NULL); - } - delete hash; - } - } - - return (CASE_EQUIV_HASH != NULL) ? - (const CaseEquivClass*) CASE_EQUIV_HASH->get(folded) : NULL; -} - -/** - * Given a folded code unit, return the CaseEquivClass containing it, - * or NULL if none. - */ -const CaseEquivClass* UnicodeSet::getCaseMapOf(UChar folded) { - umtx_lock(NULL); - UBool f = (CASE_EQUIV_CBA == NULL); - umtx_unlock(NULL); - - if (f) { - // Create the CompactByteArray, which maps single code units - // to index values into CASE_NONPAIRS. - CompactByteArray* cba = ucmp8_open(-1); - if (ucmp8_isBogus(cba)) { - ucmp8_close(cba); - cba = NULL; - } else { - int32_t i; - for (i=0; i<(int32_t)CASE_NONPAIRS_LENGTH; ++i) { - const UChar* p = CASE_NONPAIRS[i].getSingles(); - UChar ch; - while ((ch = *p++) != 0) { - ucmp8_set(cba, ch, (int8_t) i); - } - } - ucmp8_compact(cba, 256); - } - - umtx_lock(NULL); - if (CASE_EQUIV_CBA == NULL) { - CASE_EQUIV_CBA = cba; - cba = NULL; - ucln_common_registerCleanup(UCLN_COMMON_USET, uset_cleanup); - } - umtx_unlock(NULL); - if (cba != NULL) { - ucmp8_close(cba); - } - } - - if (CASE_EQUIV_CBA != NULL) { - int32_t index = ucmp8_getu(CASE_EQUIV_CBA, folded); - if (index != 255) { - return &CASE_NONPAIRS[index]; - } - } - return NULL; -} - U_NAMESPACE_END