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

ICU-2438 fix locale test failures

Browse Source 
X-SVN-Rev: 13653
This commit is contained in:
Vladimir Weinstein 2003-11-10 18:08:54 +00:00
parent e8fb75ae18
commit 98743e56c4
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
icu4c/source/data/locales/root.txt
View File

@ -60,9 +60,16 @@ root {
Version { "0.0" }
Sequence { "" }
}
// placeholder for phonebook
phonebook:alias { "root/collations/standard" }
traditional:alias { "root/collations/standard" }
default { "standard" }
}
// For backwards compatibility
CollationElements:alias { "root/collations/standard" }
// Here are empty collation rules just for the consistency. UCA is used instead... 01/16/2001 by weiv
//CollationElements {
//Version { "0.0" }

28
icu4c/source/tools/genrb/parse.c
View File

@ -750,7 +750,7 @@ parseCollationElements(char *tag, uint32_t startline, UBool newCollation, UError
struct UString *tokenValue;
struct UString comment;
enum ETokenType token;
char subtag[1024];
char subtag[1024], typeKeyword[1024];
uint32_t line;
result = table_open(bundle, tag, NULL, status);
@ -812,11 +812,33 @@ parseCollationElements(char *tag, uint32_t startline, UBool newCollation, UError
table_add(result, member, line, status);
}
else
{
token = getToken(&tokenValue, &comment, &line, status);
{
token = peekToken(0, &tokenValue, &line, &comment, status);
/* this probably needs to be refactored or recursively use the parser */
/* first we assume that our collation table won't have the explicit type */
/* then, we cannot handle aliases */
if(token == TOK_OPEN_BRACE) {
token = getToken(&tokenValue, &comment, &line, status);
collationRes = table_open(bundle, subtag, NULL, status);
table_add(result, addCollation(collationRes, startline, status), startline, status);
} else if(token == TOK_COLON) { /* right now, we'll just try to see if we have aliases */
/* we could have a table too */
token = peekToken(1, &tokenValue, &line, &comment, status);
u_UCharsToChars(tokenValue->fChars, typeKeyword, u_strlen(tokenValue->fChars) + 1);
if(uprv_strcmp(typeKeyword, "alias") == 0) {
member = parseResource(subtag, NULL, status);
if (U_FAILURE(*status))
{
table_close(result, status);
return NULL;
}
table_add(result, member, line, status);
} else {
*status = U_INVALID_FORMAT_ERROR;
return NULL;
}
} else {
*status = U_INVALID_FORMAT_ERROR;
return NULL;