organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-1245 fixed a bug in adding prefixed contractions that have non contraction composed form (go figure)...

Browse source 
X-SVN-Rev: 6468
This commit is contained in:
Vladimir Weinstein 2001-10-26 23:23:25 +00:00
parent eb3e1bdcc9
commit 72eb3bc0c0
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
icu4c/source/i18n/ucol_elm.cpp
View file

@ -863,17 +863,20 @@ static uint32_t uprv_uca_finalizeAddition(tempUCATable *t, UCAElements *element,
CE = ucmpe32_get(t->mapping, element->cPoints[0]);
if( CE != UCOL_NOT_FOUND) {
if(/*isCntTableElement(CE)*/ isContraction(CE)) { /* adding a non contraction element (thai, expansion, single) to already existing contraction */
if(isCntTableElement(CE) /*isContraction(CE)*/) { /* adding a non contraction element (thai, expansion, single) to already existing contraction */
if(!isPrefix(element->mapCE)) { // we cannot reenter prefix elements - as we are going to create a dead loop
// Only expansions and regular CEs can go here... Contractions will never happen in this place
uprv_cnttab_setContraction(t->contractions, CE, 0, 0, element->mapCE, status);
/* This loop has to change the CE at the end of contraction REDO!*/
uprv_cnttab_changeLastCE(t->contractions, CE, element->mapCE, status);
} else {
ucmpe32_set(t->mapping, element->cPoints[0], element->mapCE);
#ifdef UCOL_DEBUG
fprintf(stderr, "Warning - trying to overwrite existing data %08X for cp %04X with %08X\n", CE, element->cPoints[0], element->CEs[0]);
//*status = U_ILLEGAL_ARGUMENT_ERROR;
#endif
}
} else {
ucmpe32_set(t->mapping, element->cPoints[0], element->mapCE);
#ifdef UCOL_DEBUG
fprintf(stderr, "Warning - trying to overwrite existing data %08X for cp %04X with %08X\n", CE, element->cPoints[0], element->CEs[0]);
//*status = U_ILLEGAL_ARGUMENT_ERROR;
#endif
}
} else {
ucmpe32_set(t->mapping, element->cPoints[0], element->mapCE);
}