From: Markus Scherer Date: Wed, 20 Aug 2014 23:55:04 +0000 (+0000) Subject: ICU-11047 disambiguate various CEBuffer-s X-Git-Tag: milestone-59-0-1~1708 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fbc4c7966474f2f75a98cd29c0e7c5104d2de25;p=icu ICU-11047 disambiguate various CEBuffer-s X-SVN-Rev: 36217 --- diff --git a/icu4c/source/i18n/stsearch.cpp b/icu4c/source/i18n/stsearch.cpp index 7b5028a71a1..9c45e11dad1 100644 --- a/icu4c/source/i18n/stsearch.cpp +++ b/icu4c/source/i18n/stsearch.cpp @@ -307,7 +307,7 @@ int32_t StringSearch::handleNext(int32_t position, UErrorCode &status) { // values passed here are already in the pre-shift position if (U_SUCCESS(status)) { - if (m_strsrch_->pattern.CELength == 0) { + if (m_strsrch_->pattern.cesLength == 0) { m_search_->matchedIndex = m_search_->matchedIndex == USEARCH_DONE ? getOffset() : m_search_->matchedIndex + 1; @@ -405,7 +405,7 @@ int32_t StringSearch::handlePrev(int32_t position, UErrorCode &status) { // values passed here are already in the pre-shift position if (U_SUCCESS(status)) { - if (m_strsrch_->pattern.CELength == 0) { + if (m_strsrch_->pattern.cesLength == 0) { m_search_->matchedIndex = (m_search_->matchedIndex == USEARCH_DONE ? getOffset() : m_search_->matchedIndex); diff --git a/icu4c/source/i18n/usearch.cpp b/icu4c/source/i18n/usearch.cpp index 9983e5a5fa8..6baaad555e3 100644 --- a/icu4c/source/i18n/usearch.cpp +++ b/icu4c/source/i18n/usearch.cpp @@ -290,7 +290,7 @@ inline uint16_t initializePatternCETable(UStringSearch *strsrch, { UPattern *pattern = &(strsrch->pattern); uint32_t cetablesize = INITIAL_ARRAY_SIZE_; - int32_t *cetable = pattern->CEBuffer; + int32_t *cetable = pattern->cesBuffer; uint32_t patternlength = pattern->textLength; UCollationElements *coleiter = strsrch->utilIter; @@ -309,8 +309,8 @@ inline uint16_t initializePatternCETable(UStringSearch *strsrch, return 0; } - if (pattern->CE != cetable && pattern->CE) { - uprv_free(pattern->CE); + if (pattern->ces != cetable && pattern->ces) { + uprv_free(pattern->ces); } uint16_t offset = 0; @@ -329,7 +329,7 @@ inline uint16_t initializePatternCETable(UStringSearch *strsrch, return 0; } offset ++; - if (cetable != temp && cetable != pattern->CEBuffer) { + if (cetable != temp && cetable != pattern->cesBuffer) { uprv_free(cetable); } cetable = temp; @@ -338,8 +338,8 @@ inline uint16_t initializePatternCETable(UStringSearch *strsrch, } cetable[offset] = 0; - pattern->CE = cetable; - pattern->CELength = offset; + pattern->ces = cetable; + pattern->cesLength = offset; return result; } @@ -362,7 +362,7 @@ inline uint16_t initializePatternPCETable(UStringSearch *strsrch, { UPattern *pattern = &(strsrch->pattern); uint32_t pcetablesize = INITIAL_ARRAY_SIZE_; - int64_t *pcetable = pattern->PCEBuffer; + int64_t *pcetable = pattern->pcesBuffer; uint32_t patternlength = pattern->textLength; UCollationElements *coleiter = strsrch->utilIter; @@ -380,8 +380,8 @@ inline uint16_t initializePatternPCETable(UStringSearch *strsrch, return 0; } - if (pattern->PCE != pcetable && pattern->PCE != NULL) { - uprv_free(pattern->PCE); + if (pattern->pces != pcetable && pattern->pces != NULL) { + uprv_free(pattern->pces); } uint16_t offset = 0; @@ -406,7 +406,7 @@ inline uint16_t initializePatternPCETable(UStringSearch *strsrch, offset += 1; - if (pcetable != temp && pcetable != pattern->PCEBuffer) { + if (pcetable != temp && pcetable != pattern->pcesBuffer) { uprv_free(pcetable); } @@ -415,8 +415,8 @@ inline uint16_t initializePatternPCETable(UStringSearch *strsrch, } pcetable[offset] = 0; - pattern->PCE = pcetable; - pattern->PCELength = offset; + pattern->pces = pcetable; + pattern->pcesLength = offset; return result; } @@ -452,12 +452,12 @@ inline int16_t initializePattern(UStringSearch *strsrch, UErrorCode *status) } // ** HACK ** - if (strsrch->pattern.PCE != NULL) { - if (strsrch->pattern.PCE != strsrch->pattern.PCEBuffer) { - uprv_free(strsrch->pattern.PCE); + if (strsrch->pattern.pces != NULL) { + if (strsrch->pattern.pces != strsrch->pattern.pcesBuffer) { + uprv_free(strsrch->pattern.pces); } - strsrch->pattern.PCE = NULL; + strsrch->pattern.pces = NULL; } // since intializePattern is an internal method status is a success. @@ -544,14 +544,14 @@ static inline void initialize(UStringSearch *strsrch, UErrorCode *status) { int16_t expandlength = initializePattern(strsrch, status); - if (U_SUCCESS(*status) && strsrch->pattern.CELength > 0) { + if (U_SUCCESS(*status) && strsrch->pattern.cesLength > 0) { UPattern *pattern = &strsrch->pattern; - int32_t cesize = pattern->CELength; + int32_t cesize = pattern->cesLength; int16_t minlength = cesize > expandlength ? (int16_t)cesize - expandlength : 1; pattern->defaultShiftSize = minlength; - setShiftTable(pattern->shift, pattern->backShift, pattern->CE, + setShiftTable(pattern->shift, pattern->backShift, pattern->ces, cesize, expandlength, minlength, minlength); return; } @@ -627,14 +627,14 @@ UBool isBreakUnit(const UStringSearch *strsrch, int32_t start, start; UErrorCode status = U_ZERO_ERROR; ucol_setText(coleiter, text, end - start, &status); - for (int32_t count = 0; count < strsrch->pattern.CELength; + for (int32_t count = 0; count < strsrch->pattern.cesLength; count ++) { int32_t ce = getCE(strsrch, ucol_next(coleiter, &status)); if (ce == UCOL_IGNORABLE) { count --; continue; } - if (U_FAILURE(status) || ce != strsrch->pattern.CE[count]) { + if (U_FAILURE(status) || ce != strsrch->pattern.ces[count]) { return FALSE; } } @@ -735,7 +735,7 @@ inline int32_t shiftForward(UStringSearch *strsrch, int32_t shift = pattern->shift[hash(ce)]; // this is to adjust for characters in the middle of the // substring for matching that failed. - int32_t adjust = pattern->CELength - patternceindex; + int32_t adjust = pattern->cesLength - patternceindex; if (adjust > 1 && shift >= adjust) { shift -= adjust - 1; } @@ -869,7 +869,7 @@ UBool checkExtraMatchAccents(const UStringSearch *strsrch, int32_t start, UCollationElements *coleiter = strsrch->utilIter; ucol_setText(coleiter, norm, size, status); - uint32_t firstce = strsrch->pattern.CE[0]; + uint32_t firstce = strsrch->pattern.ces[0]; UBool ignorable = TRUE; uint32_t ce = UCOL_IGNORABLE; while (U_SUCCESS(*status) && ce != firstce && ce != (uint32_t)UCOL_NULLORDER) { @@ -922,7 +922,7 @@ UBool hasAccentsBeforeMatch(const UStringSearch *strsrch, int32_t start, UErrorCode status = U_ZERO_ERROR; // we have been iterating forwards previously uint32_t ignorable = TRUE; - int32_t firstce = strsrch->pattern.CE[0]; + int32_t firstce = strsrch->pattern.ces[0]; setColEIterOffset(coleiter, start); int32_t ce = getCE(strsrch, ucol_next(coleiter, &status)); @@ -1004,7 +1004,7 @@ UBool hasAccentsAfterMatch(const UStringSearch *strsrch, int32_t start, int32_t textlength = strsrch->search->textLength; U16_BACK_1(text, 0, temp); if (getFCD(text, &temp, textlength) & LAST_BYTE_MASK_) { - int32_t firstce = strsrch->pattern.CE[0]; + int32_t firstce = strsrch->pattern.ces[0]; UCollationElements *coleiter = strsrch->textIter; UErrorCode status = U_ZERO_ERROR; int32_t ce; @@ -1015,7 +1015,7 @@ UBool hasAccentsAfterMatch(const UStringSearch *strsrch, int32_t start, } } int32_t count = 1; - while (count < strsrch->pattern.CELength) { + while (count < strsrch->pattern.cesLength) { if (getCE(strsrch, ucol_next(coleiter, &status)) == UCOL_IGNORABLE) { // Thai can give an ignorable here. @@ -1199,8 +1199,8 @@ UBool checkNextExactContractionMatch(UStringSearch *strsrch, expansion --; } - int32_t *patternce = strsrch->pattern.CE; - int32_t patterncelength = strsrch->pattern.CELength; + int32_t *patternce = strsrch->pattern.ces; + int32_t patterncelength = strsrch->pattern.cesLength; int32_t count = 0; while (count < patterncelength) { int32_t ce = getCE(strsrch, ucol_next(coleiter, status)); @@ -1402,8 +1402,8 @@ static inline UBool checkCollationMatch(const UStringSearch *strsrch, UCollationElements *coleiter) { - int patternceindex = strsrch->pattern.CELength; - int32_t *patternce = strsrch->pattern.CE; + int patternceindex = strsrch->pattern.cesLength; + int32_t *patternce = strsrch->pattern.ces; UErrorCode status = U_ZERO_ERROR; while (patternceindex > 0) { int32_t ce = getCE(strsrch, ucol_next(coleiter, &status)); @@ -1602,8 +1602,8 @@ int32_t doNextCanonicalSuffixMatch(UStringSearch *strsrch, ucol_setText(coleiter, safetext, safetextlength, status); // status checked in loop below - int32_t *ce = strsrch->pattern.CE; - int32_t celength = strsrch->pattern.CELength; + int32_t *ce = strsrch->pattern.ces; + int32_t celength = strsrch->pattern.cesLength; int ceindex = celength - 1; UBool isSafe = TRUE; // indication flag for position in safe zone @@ -1842,8 +1842,8 @@ UBool checkNextCanonicalContractionMatch(UStringSearch *strsrch, expansion --; } - int32_t *patternce = strsrch->pattern.CE; - int32_t patterncelength = strsrch->pattern.CELength; + int32_t *patternce = strsrch->pattern.ces; + int32_t patterncelength = strsrch->pattern.cesLength; int32_t count = 0; int32_t textlength = strsrch->search->textLength; while (count < patterncelength) { @@ -2040,8 +2040,8 @@ UBool checkPreviousExactContractionMatch(UStringSearch *strsrch, expansion --; } - int32_t *patternce = strsrch->pattern.CE; - int32_t patterncelength = strsrch->pattern.CELength; + int32_t *patternce = strsrch->pattern.ces; + int32_t patterncelength = strsrch->pattern.cesLength; int32_t count = patterncelength; while (count > 0) { int32_t ce = getCE(strsrch, ucol_previous(coleiter, status)); @@ -2265,8 +2265,8 @@ int32_t doPreviousCanonicalPrefixMatch(UStringSearch *strsrch, ucol_setText(coleiter, safetext, safetextlength, status); // status checked in loop below - int32_t *ce = strsrch->pattern.CE; - int32_t celength = strsrch->pattern.CELength; + int32_t *ce = strsrch->pattern.ces; + int32_t celength = strsrch->pattern.cesLength; int ceindex = 0; UBool isSafe = TRUE; // safe zone indication flag for position int32_t prefixlength = u_strlen(strsrch->canonicalPrefixAccents); @@ -2480,8 +2480,8 @@ UBool checkPreviousCanonicalContractionMatch(UStringSearch *strsrch, expansion --; } - int32_t *patternce = strsrch->pattern.CE; - int32_t patterncelength = strsrch->pattern.CELength; + int32_t *patternce = strsrch->pattern.ces; + int32_t patterncelength = strsrch->pattern.cesLength; int32_t count = patterncelength; while (count > 0) { int32_t ce = getCE(strsrch, ucol_previous(coleiter, status)); @@ -2706,8 +2706,8 @@ U_CAPI UStringSearch * U_EXPORT2 usearch_openFromCollator( result->pattern.text = pattern; result->pattern.textLength = patternlength; - result->pattern.CE = NULL; - result->pattern.PCE = NULL; + result->pattern.ces = NULL; + result->pattern.pces = NULL; result->search->breakIter = breakiter; #if !UCONFIG_NO_BREAK_ITERATION @@ -2750,14 +2750,14 @@ U_CAPI UStringSearch * U_EXPORT2 usearch_openFromCollator( U_CAPI void U_EXPORT2 usearch_close(UStringSearch *strsrch) { if (strsrch) { - if (strsrch->pattern.CE != strsrch->pattern.CEBuffer && - strsrch->pattern.CE) { - uprv_free(strsrch->pattern.CE); + if (strsrch->pattern.ces != strsrch->pattern.cesBuffer && + strsrch->pattern.ces) { + uprv_free(strsrch->pattern.ces); } - if (strsrch->pattern.PCE != NULL && - strsrch->pattern.PCE != strsrch->pattern.PCEBuffer) { - uprv_free(strsrch->pattern.PCE); + if (strsrch->pattern.pces != NULL && + strsrch->pattern.pces != strsrch->pattern.pcesBuffer) { + uprv_free(strsrch->pattern.pces); } delete strsrch->textProcessedIter; @@ -3052,7 +3052,7 @@ U_CAPI void U_EXPORT2 usearch_setCollator( UStringSearch *strsrch, // **** are these calls needed? // **** we call uprv_init_pce in initializePatternPCETable - // **** and the CEBuffer constructor... + // **** and the CEIBuffer constructor... #if 0 uprv_init_pce(strsrch->textIter); uprv_init_pce(strsrch->utilIter); @@ -3230,7 +3230,7 @@ U_CAPI int32_t U_EXPORT2 usearch_next(UStringSearch *strsrch, } if (U_SUCCESS(*status)) { - if (strsrch->pattern.CELength == 0) { + if (strsrch->pattern.cesLength == 0) { if (search->matchedIndex == USEARCH_DONE) { search->matchedIndex = offset; } @@ -3341,7 +3341,7 @@ U_CAPI int32_t U_EXPORT2 usearch_previous(UStringSearch *strsrch, } if (U_SUCCESS(*status)) { - if (strsrch->pattern.CELength == 0) { + if (strsrch->pattern.cesLength == 0) { search->matchedIndex = (matchedindex == USEARCH_DONE ? offset : matchedindex); if (search->matchedIndex == 0) { @@ -3451,7 +3451,7 @@ U_NAMESPACE_BEGIN namespace { // -// CEBuffer A circular buffer of CEs from the text being searched. +// CEIBuffer A circular buffer of CEs-with-index from the text being searched. // #define DEFAULT_CEBUFFER_SIZE 96 #define CEBUFFER_EXTRA 32 @@ -3460,7 +3460,7 @@ namespace { #define MAX_TARGET_IGNORABLES_PER_PAT_JAMO_L 8 #define MAX_TARGET_IGNORABLES_PER_PAT_OTHER 3 #define MIGHT_BE_JAMO_L(c) ((c >= 0x1100 && c <= 0x115E) || (c >= 0x3131 && c <= 0x314E) || (c >= 0x3165 && c <= 0x3186)) -struct CEBuffer { +struct CEIBuffer { CEI defBuf[DEFAULT_CEBUFFER_SIZE]; CEI *buf; int32_t bufSize; @@ -3471,17 +3471,17 @@ struct CEBuffer { - CEBuffer(UStringSearch *ss, UErrorCode *status); - ~CEBuffer(); + CEIBuffer(UStringSearch *ss, UErrorCode *status); + ~CEIBuffer(); const CEI *get(int32_t index); const CEI *getPrevious(int32_t index); }; -CEBuffer::CEBuffer(UStringSearch *ss, UErrorCode *status) { +CEIBuffer::CEIBuffer(UStringSearch *ss, UErrorCode *status) { buf = defBuf; strSearch = ss; - bufSize = ss->pattern.PCELength + CEBUFFER_EXTRA; + bufSize = ss->pattern.pcesLength + CEBUFFER_EXTRA; if (ss->search->elementComparisonType != 0) { const UChar * patText = ss->pattern.text; if (patText) { @@ -3514,7 +3514,7 @@ CEBuffer::CEBuffer(UStringSearch *ss, UErrorCode *status) { // TODO: add a reset or init function so that allocated // buffers can be retained & reused. -CEBuffer::~CEBuffer() { +CEIBuffer::~CEIBuffer() { if (buf != defBuf) { uprv_free(buf); } @@ -3527,7 +3527,7 @@ CEBuffer::~CEBuffer() { // where n is the largest index to have been fetched by some previous call to this function. // The CE value will be UCOL__PROCESSED_NULLORDER at end of input. // -const CEI *CEBuffer::get(int32_t index) { +const CEI *CEIBuffer::get(int32_t index) { int i = index % bufSize; if (index>=firstIx && index=firstIx && indexpattern.CELength; ii++) { - printf(" %8x", strsrch->pattern.CE[ii]); + for (int ii=0; iipattern.cesLength; ii++) { + printf(" %8x", strsrch->pattern.ces[ii]); } printf("\n"); } @@ -3832,20 +3832,20 @@ U_CAPI UBool U_EXPORT2 usearch_search(UStringSearch *strsrch, // Input parameter sanity check. // TODO: should input indicies clip to the text length // in the same way that UText does. - if(strsrch->pattern.CELength == 0 || + if(strsrch->pattern.cesLength == 0 || startIdx < 0 || startIdx > strsrch->search->textLength || - strsrch->pattern.CE == NULL) { + strsrch->pattern.ces == NULL) { *status = U_ILLEGAL_ARGUMENT_ERROR; return FALSE; } - if (strsrch->pattern.PCE == NULL) { + if (strsrch->pattern.pces == NULL) { initializePatternPCETable(strsrch, status); } ucol_setOffset(strsrch->textIter, startIdx, status); - CEBuffer ceb(strsrch, status); + CEIBuffer ceb(strsrch, status); int32_t targetIx = 0; @@ -3891,8 +3891,8 @@ U_CAPI UBool U_EXPORT2 usearch_search(UStringSearch *strsrch, break; } - for (patIx=0; patIxpattern.PCELength; patIx++) { - patCE = strsrch->pattern.PCE[patIx]; + for (patIx=0; patIxpattern.pcesLength; patIx++) { + patCE = strsrch->pattern.pces[patIx]; targetCEI = ceb.get(targetIx+patIx+targetIxOffset); // Compare CE from target string with CE from the pattern. // Note that the target CE will be UCOL_PROCESSED_NULLORDER if we reach the end of input, @@ -3912,7 +3912,7 @@ U_CAPI UBool U_EXPORT2 usearch_search(UStringSearch *strsrch, } } } - targetIxOffset += strsrch->pattern.PCELength; // this is now the offset in target CE space to end of the match so far + targetIxOffset += strsrch->pattern.pcesLength; // this is now the offset in target CE space to end of the match so far if (!found && ((targetCEI == NULL) || (targetCEI->ce != UCOL_PROCESSED_NULLORDER))) { // No match at this targetIx. Try again at the next. @@ -4089,8 +4089,8 @@ U_CAPI UBool U_EXPORT2 usearch_searchBackwards(UStringSearch *strsrch, #ifdef USEARCH_DEBUG if (getenv("USEARCH_DEBUG") != NULL) { printf("Pattern CEs\n"); - for (int ii=0; iipattern.CELength; ii++) { - printf(" %8x", strsrch->pattern.CE[ii]); + for (int ii=0; iipattern.cesLength; ii++) { + printf(" %8x", strsrch->pattern.ces[ii]); } printf("\n"); } @@ -4099,19 +4099,19 @@ U_CAPI UBool U_EXPORT2 usearch_searchBackwards(UStringSearch *strsrch, // Input parameter sanity check. // TODO: should input indicies clip to the text length // in the same way that UText does. - if(strsrch->pattern.CELength == 0 || + if(strsrch->pattern.cesLength == 0 || startIdx < 0 || startIdx > strsrch->search->textLength || - strsrch->pattern.CE == NULL) { + strsrch->pattern.ces == NULL) { *status = U_ILLEGAL_ARGUMENT_ERROR; return FALSE; } - if (strsrch->pattern.PCE == NULL) { + if (strsrch->pattern.pces == NULL) { initializePatternPCETable(strsrch, status); } - CEBuffer ceb(strsrch, status); + CEIBuffer ceb(strsrch, status); int32_t targetIx = 0; /* @@ -4172,10 +4172,10 @@ U_CAPI UBool U_EXPORT2 usearch_searchBackwards(UStringSearch *strsrch, // Inner loop checks for a match beginning at each // position from the outer loop. int32_t targetIxOffset = 0; - for (patIx = strsrch->pattern.PCELength - 1; patIx >= 0; patIx -= 1) { - int64_t patCE = strsrch->pattern.PCE[patIx]; + for (patIx = strsrch->pattern.pcesLength - 1; patIx >= 0; patIx -= 1) { + int64_t patCE = strsrch->pattern.pces[patIx]; - targetCEI = ceb.getPrevious(targetIx + strsrch->pattern.PCELength - 1 - patIx + targetIxOffset); + targetCEI = ceb.getPrevious(targetIx + strsrch->pattern.pcesLength - 1 - patIx + targetIxOffset); // Compare CE from target string with CE from the pattern. // Note that the target CE will be UCOL_NULLORDER if we reach the end of input, // which will fail the compare, below. @@ -4211,7 +4211,7 @@ U_CAPI UBool U_EXPORT2 usearch_searchBackwards(UStringSearch *strsrch, // There still is a chance of match failure if the CE range not correspond to // an acceptable character range. // - const CEI *firstCEI = ceb.getPrevious(targetIx + strsrch->pattern.PCELength - 1 + targetIxOffset); + const CEI *firstCEI = ceb.getPrevious(targetIx + strsrch->pattern.pcesLength - 1 + targetIxOffset); mStart = firstCEI->lowIndex; // Check for the start of the match being within a combining sequence. @@ -4337,8 +4337,8 @@ UBool usearch_handleNextExact(UStringSearch *strsrch, UErrorCode *status) #if BOYER_MOORE UCollationElements *coleiter = strsrch->textIter; int32_t textlength = strsrch->search->textLength; - int32_t *patternce = strsrch->pattern.CE; - int32_t patterncelength = strsrch->pattern.CELength; + int32_t *patternce = strsrch->pattern.ces; + int32_t patterncelength = strsrch->pattern.cesLength; int32_t textoffset = ucol_getOffset(coleiter); // status used in setting coleiter offset, since offset is checked in @@ -4451,8 +4451,8 @@ UBool usearch_handleNextCanonical(UStringSearch *strsrch, UErrorCode *status) #if BOYER_MOORE UCollationElements *coleiter = strsrch->textIter; int32_t textlength = strsrch->search->textLength; - int32_t *patternce = strsrch->pattern.CE; - int32_t patterncelength = strsrch->pattern.CELength; + int32_t *patternce = strsrch->pattern.ces; + int32_t patterncelength = strsrch->pattern.cesLength; int32_t textoffset = ucol_getOffset(coleiter); UBool hasPatternAccents = strsrch->pattern.hasSuffixAccents || strsrch->pattern.hasPrefixAccents; @@ -4565,8 +4565,8 @@ UBool usearch_handlePreviousExact(UStringSearch *strsrch, UErrorCode *status) #if BOYER_MOORE UCollationElements *coleiter = strsrch->textIter; - int32_t *patternce = strsrch->pattern.CE; - int32_t patterncelength = strsrch->pattern.CELength; + int32_t *patternce = strsrch->pattern.ces; + int32_t patterncelength = strsrch->pattern.cesLength; int32_t textoffset = ucol_getOffset(coleiter); // shifting it check for setting offset @@ -4670,7 +4670,7 @@ UBool usearch_handlePreviousExact(UStringSearch *strsrch, UErrorCode *status) setMatchNotFound(strsrch); return FALSE; } - for (int32_t nPCEs = 0; nPCEs < strsrch->pattern.PCELength - 1; nPCEs++) { + for (int32_t nPCEs = 0; nPCEs < strsrch->pattern.pcesLength - 1; nPCEs++) { int64_t pce = strsrch->textProcessedIter->nextProcessed(NULL, NULL, status); if (pce == UCOL_PROCESSED_NULLORDER) { // at the end of the text @@ -4711,8 +4711,8 @@ UBool usearch_handlePreviousCanonical(UStringSearch *strsrch, #if BOYER_MOORE UCollationElements *coleiter = strsrch->textIter; - int32_t *patternce = strsrch->pattern.CE; - int32_t patterncelength = strsrch->pattern.CELength; + int32_t *patternce = strsrch->pattern.ces; + int32_t patterncelength = strsrch->pattern.cesLength; int32_t textoffset = ucol_getOffset(coleiter); UBool hasPatternAccents = strsrch->pattern.hasSuffixAccents || strsrch->pattern.hasPrefixAccents; @@ -4823,7 +4823,7 @@ UBool usearch_handlePreviousCanonical(UStringSearch *strsrch, setMatchNotFound(strsrch); return FALSE; } - for (int32_t nPCEs = 0; nPCEs < strsrch->pattern.PCELength - 1; nPCEs++) { + for (int32_t nPCEs = 0; nPCEs < strsrch->pattern.pcesLength - 1; nPCEs++) { int64_t pce = strsrch->textProcessedIter->nextProcessed(NULL, NULL, status); if (pce == UCOL_PROCESSED_NULLORDER) { // at the end of the text diff --git a/icu4c/source/i18n/usrchimp.h b/icu4c/source/i18n/usrchimp.h index 9b7dd7388aa..b44943e8921 100644 --- a/icu4c/source/i18n/usrchimp.h +++ b/icu4c/source/i18n/usrchimp.h @@ -150,12 +150,12 @@ struct UPattern { const UChar *text; int32_t textLength; // exact length // length required for backwards ce comparison - int32_t CELength; - int32_t *CE; - int32_t CEBuffer[INITIAL_ARRAY_SIZE_]; - int32_t PCELength; - int64_t *PCE; - int64_t PCEBuffer[INITIAL_ARRAY_SIZE_]; + int32_t cesLength; + int32_t *ces; + int32_t cesBuffer[INITIAL_ARRAY_SIZE_]; + int32_t pcesLength; + int64_t *pces; + int64_t pcesBuffer[INITIAL_ARRAY_SIZE_]; UBool hasPrefixAccents; UBool hasSuffixAccents; int16_t defaultShiftSize;