From: Fredrik Roubert Date: Mon, 6 Feb 2023 18:35:22 +0000 (+0100) Subject: ICU-21833 Replace UChar with char16_t in C++ code. X-Git-Tag: cldr/2023-02-21~18 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fd2742dfa5d78f3a5d14c603c85ed3dcf88a197;p=icu ICU-21833 Replace UChar with char16_t in C++ code. --- diff --git a/icu4c/source/common/dictionarydata.h b/icu4c/source/common/dictionarydata.h index 3c63515aa66..8751e502d5e 100644 --- a/icu4c/source/common/dictionarydata.h +++ b/icu4c/source/common/dictionarydata.h @@ -103,14 +103,14 @@ class U_COMMON_API UCharsDictionaryMatcher : public DictionaryMatcher { public: // constructs a new UCharsDictionaryMatcher. // The UDataMemory * will be closed on this object's destruction. - UCharsDictionaryMatcher(const UChar *c, UDataMemory *f) : characters(c), file(f) { } + UCharsDictionaryMatcher(const char16_t *c, UDataMemory *f) : characters(c), file(f) { } virtual ~UCharsDictionaryMatcher(); virtual int32_t matches(UText *text, int32_t maxLength, int32_t limit, int32_t *lengths, int32_t *cpLengths, int32_t *values, int32_t *prefix) const override; virtual int32_t getType() const override; private: - const UChar *characters; + const char16_t *characters; UDataMemory *file; }; diff --git a/icu4c/source/common/lstmbe.h b/icu4c/source/common/lstmbe.h index ffdf805eca2..77c97d85fa8 100644 --- a/icu4c/source/common/lstmbe.h +++ b/icu4c/source/common/lstmbe.h @@ -45,7 +45,7 @@ public: */ virtual ~LSTMBreakEngine(); - virtual const UChar* name() const; + virtual const char16_t* name() const; protected: /** @@ -79,7 +79,7 @@ U_CAPI const LSTMData* U_EXPORT2 CreateLSTMDataForScript( UScriptCode script, UErrorCode& status); U_CAPI void U_EXPORT2 DeleteLSTMData(const LSTMData* data); -U_CAPI const UChar* U_EXPORT2 LSTMDataName(const LSTMData* data); +U_CAPI const char16_t* U_EXPORT2 LSTMDataName(const LSTMData* data); U_NAMESPACE_END diff --git a/icu4c/source/common/normalizer2impl.h b/icu4c/source/common/normalizer2impl.h index 449e7783848..2cca33d349e 100644 --- a/icu4c/source/common/normalizer2impl.h +++ b/icu4c/source/common/normalizer2impl.h @@ -99,16 +99,16 @@ public: * Decomposes c, which must be a Hangul syllable, into buffer * and returns the length of the decomposition (2 or 3). */ - static inline int32_t decompose(UChar32 c, UChar buffer[3]) { + static inline int32_t decompose(UChar32 c, char16_t buffer[3]) { c-=HANGUL_BASE; UChar32 c2=c%JAMO_T_COUNT; c/=JAMO_T_COUNT; - buffer[0]=(UChar)(JAMO_L_BASE+c/JAMO_V_COUNT); - buffer[1]=(UChar)(JAMO_V_BASE+c%JAMO_V_COUNT); + buffer[0]=(char16_t)(JAMO_L_BASE+c/JAMO_V_COUNT); + buffer[1]=(char16_t)(JAMO_V_BASE+c%JAMO_V_COUNT); if(c2==0) { return 2; } else { - buffer[2]=(UChar)(JAMO_T_BASE+c2); + buffer[2]=(char16_t)(JAMO_T_BASE+c2); return 3; } } @@ -117,17 +117,17 @@ public: * Decomposes c, which must be a Hangul syllable, into buffer. * This is the raw, not recursive, decomposition. Its length is always 2. */ - static inline void getRawDecomposition(UChar32 c, UChar buffer[2]) { + static inline void getRawDecomposition(UChar32 c, char16_t buffer[2]) { UChar32 orig=c; c-=HANGUL_BASE; UChar32 c2=c%JAMO_T_COUNT; if(c2==0) { c/=JAMO_T_COUNT; - buffer[0]=(UChar)(JAMO_L_BASE+c/JAMO_V_COUNT); - buffer[1]=(UChar)(JAMO_V_BASE+c%JAMO_V_COUNT); + buffer[0]=(char16_t)(JAMO_L_BASE+c/JAMO_V_COUNT); + buffer[1]=(char16_t)(JAMO_V_BASE+c%JAMO_V_COUNT); } else { - buffer[0]=(UChar)(orig-c2); // LV syllable - buffer[1]=(UChar)(JAMO_T_BASE+c2); + buffer[0]=(char16_t)(orig-c2); // LV syllable + buffer[1]=(char16_t)(JAMO_T_BASE+c2); } } private: @@ -154,22 +154,22 @@ public: UBool isEmpty() const { return start==limit; } int32_t length() const { return (int32_t)(limit-start); } - UChar *getStart() { return start; } - UChar *getLimit() { return limit; } + char16_t *getStart() { return start; } + char16_t *getLimit() { return limit; } uint8_t getLastCC() const { return lastCC; } - UBool equals(const UChar *start, const UChar *limit) const; + UBool equals(const char16_t *start, const char16_t *limit) const; UBool equals(const uint8_t *otherStart, const uint8_t *otherLimit) const; UBool append(UChar32 c, uint8_t cc, UErrorCode &errorCode) { return (c<=0xffff) ? - appendBMP((UChar)c, cc, errorCode) : + appendBMP((char16_t)c, cc, errorCode) : appendSupplementary(c, cc, errorCode); } - UBool append(const UChar *s, int32_t length, UBool isNFD, + UBool append(const char16_t *s, int32_t length, UBool isNFD, uint8_t leadCC, uint8_t trailCC, UErrorCode &errorCode); - UBool appendBMP(UChar c, uint8_t cc, UErrorCode &errorCode) { + UBool appendBMP(char16_t c, uint8_t cc, UErrorCode &errorCode) { if(remainingCapacity==0 && !resize(1, errorCode)) { return false; } @@ -186,10 +186,10 @@ public: return true; } UBool appendZeroCC(UChar32 c, UErrorCode &errorCode); - UBool appendZeroCC(const UChar *s, const UChar *sLimit, UErrorCode &errorCode); + UBool appendZeroCC(const char16_t *s, const char16_t *sLimit, UErrorCode &errorCode); void remove(); void removeSuffix(int32_t suffixLength); - void setReorderingLimit(UChar *newLimit) { + void setReorderingLimit(char16_t *newLimit) { remainingCapacity+=(int32_t)(limit-newLimit); reorderStart=limit=newLimit; lastCC=0; @@ -213,9 +213,9 @@ private: UBool appendSupplementary(UChar32 c, uint8_t cc, UErrorCode &errorCode); void insert(UChar32 c, uint8_t cc); - static void writeCodePoint(UChar *p, UChar32 c) { + static void writeCodePoint(char16_t *p, UChar32 c) { if(c<=0xffff) { - *p=(UChar)c; + *p=(char16_t)c; } else { p[0]=U16_LEAD(c); p[1]=U16_TRAIL(c); @@ -225,7 +225,7 @@ private: const Normalizer2Impl &impl; UnicodeString &str; - UChar *start, *reorderStart, *limit; + char16_t *start, *reorderStart, *limit; int32_t remainingCapacity; uint8_t lastCC; @@ -234,7 +234,7 @@ private: void skipPrevious(); // Requires start>8); // tccc from yesNo } } - uint8_t getPreviousTrailCC(const UChar *start, const UChar *p) const; + uint8_t getPreviousTrailCC(const char16_t *start, const char16_t *p) const; uint8_t getPreviousTrailCC(const uint8_t *start, const uint8_t *p) const; // Requires algorithmic-NoNo. @@ -651,14 +651,14 @@ private: getCompositionsListForComposite(norm16); } - const UChar *copyLowPrefixFromNulTerminated(const UChar *src, + const char16_t *copyLowPrefixFromNulTerminated(const char16_t *src, UChar32 minNeedDataCP, ReorderingBuffer *buffer, UErrorCode &errorCode) const; enum StopAt { STOP_AT_LIMIT, STOP_AT_DECOMP_BOUNDARY, STOP_AT_COMP_BOUNDARY }; - const UChar *decomposeShort(const UChar *src, const UChar *limit, + const char16_t *decomposeShort(const char16_t *src, const char16_t *limit, UBool stopAtCompBoundary, UBool onlyContiguous, ReorderingBuffer &buffer, UErrorCode &errorCode) const; UBool decompose(UChar32 c, uint16_t norm16, @@ -679,9 +679,9 @@ private: UBool norm16HasCompBoundaryBefore(uint16_t norm16) const { return norm16 < minNoNoCompNoMaybeCC || isAlgorithmicNoNo(norm16); } - UBool hasCompBoundaryBefore(const UChar *src, const UChar *limit) const; + UBool hasCompBoundaryBefore(const char16_t *src, const char16_t *limit) const; UBool hasCompBoundaryBefore(const uint8_t *src, const uint8_t *limit) const; - UBool hasCompBoundaryAfter(const UChar *start, const UChar *p, + UBool hasCompBoundaryAfter(const char16_t *start, const char16_t *p, UBool onlyContiguous) const; UBool hasCompBoundaryAfter(const uint8_t *start, const uint8_t *p, UBool onlyContiguous) const; @@ -695,11 +695,11 @@ private: (norm16 & DELTA_TCCC_MASK) <= DELTA_TCCC_1 : *getMapping(norm16) <= 0x1ff); } - const UChar *findPreviousCompBoundary(const UChar *start, const UChar *p, UBool onlyContiguous) const; - const UChar *findNextCompBoundary(const UChar *p, const UChar *limit, UBool onlyContiguous) const; + const char16_t *findPreviousCompBoundary(const char16_t *start, const char16_t *p, UBool onlyContiguous) const; + const char16_t *findNextCompBoundary(const char16_t *p, const char16_t *limit, UBool onlyContiguous) const; - const UChar *findPreviousFCDBoundary(const UChar *start, const UChar *p) const; - const UChar *findNextFCDBoundary(const UChar *p, const UChar *limit) const; + const char16_t *findPreviousFCDBoundary(const char16_t *start, const char16_t *p) const; + const char16_t *findNextFCDBoundary(const char16_t *p, const char16_t *limit) const; void makeCanonIterDataFromNorm16(UChar32 start, UChar32 end, const uint16_t norm16, CanonIterData &newData, UErrorCode &errorCode) const; @@ -710,9 +710,9 @@ private: // UVersionInfo dataVersion; // BMP code point thresholds for quick check loops looking at single UTF-16 code units. - UChar minDecompNoCP; - UChar minCompNoMaybeCP; - UChar minLcccCP; + char16_t minDecompNoCP; + char16_t minCompNoMaybeCP; + char16_t minLcccCP; // Norm16 value thresholds for quick check combinations and types of extra data. uint16_t minYesNo;