AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-1930 Updated shifted processing (ignorables after variables should be completely ignored) per UCA amendments

Browse Source 
X-SVN-Rev: 8796
This commit is contained in:
Vladimir Weinstein 2002-06-05 21:14:41 +00:00
parent 0dec45f644
commit 9f544687fe
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
icu4c/source/i18n/ucol.cpp
View File

@ -3125,7 +3125,13 @@ int32_t ucol_getSortKeySize(const UCollator *coll, collIterate *s, int32_t curre
if(shifted && ((notIsContinuation && order <= variableTopValue && primary1 > 0) if(shifted && ((notIsContinuation && order <= variableTopValue && primary1 > 0)
|| (!notIsContinuation && wasShifted))) { || (!notIsContinuation && wasShifted))
|| (wasShifted && primary1 == 0)) { /* amendment to the UCA says that primary ignorables */
/* and other ignorables should be removed if following a shifted code point */
if(primary1 == 0) { /* if we were shifted and we got an ignorable code point */
/* we should just completely ignore it */
continue;
}
if(compareQuad == 0) { if(compareQuad == 0) {
if(c4 > 0) { if(c4 > 0) {
currentSize += (c2/UCOL_BOT_COUNT4)+1; currentSize += (c2/UCOL_BOT_COUNT4)+1;
@ -3553,7 +3559,13 @@ ucol_calcSortKey(const UCollator *coll,
} }
if(shifted && ((notIsContinuation && order <= variableTopValue && primary1 > 0) if(shifted && ((notIsContinuation && order <= variableTopValue && primary1 > 0)
|| (!notIsContinuation && wasShifted))) { || (!notIsContinuation && wasShifted))
|| (wasShifted && primary1 == 0)) { /* amendment to the UCA says that primary ignorables */
/* and other ignorables should be removed if following a shifted code point */
if(primary1 == 0) { /* if we were shifted and we got an ignorable code point */
/* we should just completely ignore it */
continue;
}
if(count4 > 0) { if(count4 > 0) {
while (count4 > UCOL_BOT_COUNT4) { while (count4 > UCOL_BOT_COUNT4) {
*quads++ = (uint8_t)(UCOL_COMMON_BOT4 + UCOL_BOT_COUNT4); *quads++ = (uint8_t)(UCOL_COMMON_BOT4 + UCOL_BOT_COUNT4);
@ -5257,7 +5269,9 @@ ucol_strcoll( const UCollator *coll,
if(sOrder == UCOL_NO_MORE_CES) { if(sOrder == UCOL_NO_MORE_CES) {
UCOL_CEBUF_PUT(&sCEs, sOrder, &sColl); UCOL_CEBUF_PUT(&sCEs, sOrder, &sColl);
break; break;
} else if(sOrder == 0) { } else if(sOrder == 0
|| (sInShifted && (sOrder & UCOL_PRIMARYMASK) == 0)) {
/* UCA amendment - ignore ignorables that follow shifted code points */
continue; continue;
} else if(isContinuation(sOrder)) { } else if(isContinuation(sOrder)) {
if((sOrder & UCOL_PRIMARYMASK) > 0) { /* There is primary value */ if((sOrder & UCOL_PRIMARYMASK) > 0) { /* There is primary value */
@ -5303,7 +5317,9 @@ ucol_strcoll( const UCollator *coll,
if(tOrder == UCOL_NO_MORE_CES) { if(tOrder == UCOL_NO_MORE_CES) {
UCOL_CEBUF_PUT(&tCEs, tOrder, &tColl); UCOL_CEBUF_PUT(&tCEs, tOrder, &tColl);
break; break;
} else if(tOrder == 0) { } else if(tOrder == 0
|| (tInShifted && (tOrder & UCOL_PRIMARYMASK) == 0)) {
/* UCA amendment - ignore ignorables that follow shifted code points */
continue; continue;
} else if(isContinuation(tOrder)) { } else if(isContinuation(tOrder)) {
if((tOrder & UCOL_PRIMARYMASK) > 0) { /* There is primary value */ if((tOrder & UCOL_PRIMARYMASK) > 0) { /* There is primary value */