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

ICU-96 fix for variable top in tailorings + more tests

Browse Source 
X-SVN-Rev: 4453
This commit is contained in:
Vladimir Weinstein 2001-04-05 22:48:23 +00:00
parent 9d227ca6f1
commit c10181baeb
3 changed files with 75 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,10 +399,6 @@ UCollator* ucol_initCollator(const UCATableHeader *image, UCollator *fillIn, UEr
result->variableTopValueisDefault = TRUE;
result->alternateHandlingisDefault = TRUE;
uint32_t variableMaxCE = ucmp32_get(result->mapping, result->variableTopValue);
result->variableMax1 = (uint8_t)((variableMaxCE & 0xFF000000) >> 24);
result->variableMax2 = (uint8_t)((variableMaxCE & 0x00FF0000) >> 16);
result->scriptOrder = NULL;
result->zero = 0;
@ -2391,6 +2387,10 @@ UCollationResult ucol_compareUsingSortKeys(const UCollator *coll,
/* there are new APIs and some compatibility APIs */
/****************************************************************************/
void ucol_updateInternalState(UCollator *coll) {
uint32_t variableMaxCE = ucmp32_get(coll->mapping, coll->variableTopValue);
coll->variableMax1 = (uint8_t)((variableMaxCE & 0xFF000000) >> 24);
coll->variableMax2 = (uint8_t)((variableMaxCE & 0x00FF0000) >> 16);
if(coll->caseFirst == UCOL_UPPER_FIRST) {
coll->caseSwitch = UCOL_CASE_SWITCH;
} else {

2
icu4c/source/i18n/ucol_tok.c
View File

@ -848,7 +848,7 @@ uint32_t ucol_uprv_tok_assembleTokenList(UColTokenParser *src, UErrorCode *statu
}
}
if(ListList[src->resultLen-1].first[UCOL_TOK_POLARITY_POSITIVE] == NULL) {
if(src->resultLen > 0 && ListList[src->resultLen-1].first[UCOL_TOK_POLARITY_POSITIVE] == NULL) {
src->resultLen--;
}
return src->resultLen;

75
icu4c/source/test/cintltst/cmsccoll.c
View File

@ -574,7 +574,12 @@ static void BillFairmanTest( ) {
static void testPrimary(UCollator* col, const UChar* p,const UChar* q){
UChar source[256] = { '\0'};
UChar target[256] = { '\0'};
UChar preP = 0x31a3;
UChar preQ = 0x310d;
/*
UChar preP = (*p>0x0400 && *p<0x0500)?0x00e1:0x491;
UChar preQ = (*p>0x0400 && *p<0x0500)?0x0041:0x413;
*/
/*log_verbose("Testing primary\n");*/
doTest(col, p, q, UCOL_LESS);
@ -587,9 +592,9 @@ static void testPrimary(UCollator* col, const UChar* p,const UChar* q){
fprintf(file,"Primary failed source: %s target: %s \n", utfSource,utfTarget);
}
*/
source[0] = 0x0491;
source[0] = preP;
u_strcpy(source+1,p);
target[0] = 0x0413;
target[0] = preQ;
u_strcpy(target+1,q);
doTest(col, source, target, UCOL_LESS);
/*
@ -1080,8 +1085,8 @@ static const char* localesToTest[] = {
"hr", "hu", "is", "iw", "ja",
"ko", "lt", "lv", "mk", "mt",
"nb", "nn", "nn_NO", "pl", "ro",
/*"ru",*/ /*"sh",*/ "sk", "sl", "sq", /* sh test is turned off until we do closure in contractions */
/*"sr",*/ "sv", "th", "tr", /*"uk", */
"ru", /*"sh",*/ "sk", "sl", "sq", /* sh test is turned off until we do closure in contractions */
"sr", "sv", "th", "tr", /*"uk", */
"vi", "zh", "zh_TW"
};
@ -1205,6 +1210,65 @@ static void IsTailoredTest( ) {
}
}
/**
* Tests the [variable top] tag in rule syntax. Since the default [alternate]
* tag has the value shifted, any codepoints before [variable top] should give
* a primary ce of 0.
*/
static void TestVariableTop(void) {
const char *str = "[alternate shifted] &B [variable top]";
int len = strlen(str);
UChar *rules;
UCollator *myCollation;
UCollator *enCollation;
UErrorCode status = U_ZERO_ERROR;
UChar source[1];
UChar ch;
uint8_t result[20];
rules = (UChar*)malloc(sizeof(UChar*) * (len + 1));
u_uastrcpy(rules, str);
enCollation = ucol_open("en_US", &status);
myCollation = ucol_openRules(rules, len, UCOL_NO_NORMALIZATION,
UCOL_PRIMARY, &status);
if (U_FAILURE(status)) {
log_err("ERROR: in creation of rule based collator :%s\n",
myErrorName(status));
}
ucol_setStrength(enCollation, UCOL_PRIMARY);
ucol_setAttribute(enCollation, UCOL_ALTERNATE_HANDLING, UCOL_SHIFTED,
&status);
ucol_setAttribute(myCollation, UCOL_ALTERNATE_HANDLING, UCOL_SHIFTED,
&status);
if (ucol_getAttribute(myCollation, UCOL_ALTERNATE_HANDLING, &status) !=
UCOL_SHIFTED || U_FAILURE(status)) {
log_err("ERROR: ALTERNATE_HANDLING value can not be set to SHIFTED\n");
}
/* space is supposed to be a variable */
source[0] = ' ';
len = ucol_getSortKey(enCollation, source, 1, result,
sizeof(result));
ch = 'A';
while (ch < 'z') {
source[0] = ch;
len = ucol_getSortKey(enCollation, source, 1, result,
sizeof(result));
len = ucol_getSortKey(myCollation, source, 1, result,
sizeof(result));
ch ++;
}
free(rules);
ucol_close(enCollation);
ucol_close(myCollation);
enCollation = NULL;
myCollation = NULL;
}
void addMiscCollTest(TestNode** root)
{
addTest(root, &TestCase, "tscoll/cmsccoll/TestCase");
@ -1216,5 +1280,6 @@ void addMiscCollTest(TestNode** root)
addTest(root, &IsTailoredTest, "tscoll/cmsccoll/IsTailoredTest");
addTest(root, &testCollations, "tscoll/cmsccoll/testCollations");
/*addTest(root, &PrintMarkDavis, "tscoll/cmsccoll/PrintMarkDavis");*/
/*addTest(root, &TestVariableTop, "tscoll/cmsccoll/TestVariableTop");*/
}