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-10043 ignore the genrb --omitCollationRules flag while importing rules

Browse source 
X-SVN-Rev: 34874
This commit is contained in:
Markus Scherer 2014-01-11 00:28:53 +00:00
parent 90b6b64024
commit 8067293d35
3 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
icu4c/source/tools/genrb/genrb.c
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 1998-2012, International Business Machines
* Copyright (C) 1998-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -280,7 +280,7 @@ main(int argc,
}
}
initParser(options[NO_COLLATION_RULES].doesOccur);
initParser();
/*added by Jing*/
if(options[LANGUAGE].doesOccur) {
@ -557,7 +557,8 @@ processFile(
printf("autodetected encoding %s\n", cp);
}
/* Parse the data into an SRBRoot */
data = parse(ucbuf, inputDir, outputDir, !omitBinaryCollation, status);
data = parse(ucbuf, inputDir, outputDir,
!omitBinaryCollation, options[NO_COLLATION_RULES].doesOccur, status);
if (data == NULL || U_FAILURE(*status)) {
fprintf(stderr, "couldn't parse the file %s. Error:%s\n", filename,u_errorName(*status));

18
icu4c/source/tools/genrb/parse.cpp
View file

@ -95,10 +95,9 @@ typedef struct {
const char *outputdir;
uint32_t outputdirLength;
UBool makeBinaryCollation;
UBool omitCollationRules;
} ParseState;
static UBool gOmitCollationRules = FALSE;
typedef struct SResource *
ParseResourceFunction(ParseState* state, char *tag, uint32_t startline, const struct UString* comment, UErrorCode *status);
@ -333,7 +332,7 @@ parseUCARules(ParseState* state, char *tag, uint32_t startline, const struct USt
}
uprv_strcat(filename, cs);
if(gOmitCollationRules) {
if(state->omitCollationRules) {
return res_none();
}
@ -781,7 +780,7 @@ static const UChar* importFromDataFile(void* context, const char* locale, const
}
/* Parse the data into an SRBRoot */
data = parse(ucbuf, genrbdata->inputDir, genrbdata->outputDir, FALSE, status);
data = parse(ucbuf, genrbdata->inputDir, genrbdata->outputDir, FALSE, FALSE, status);
root = data->fRoot;
collations = resLookup(root, "collations");
@ -1017,7 +1016,7 @@ addCollation(ParseState* state, struct SResource *result, uint32_t startline, U
#endif
/* in order to achieve smaller data files, we can direct genrb */
/* to omit collation rules */
if(gOmitCollationRules) {
if(state->omitCollationRules) {
bundle_closeString(state->bundle, member);
} else {
table_add(result, member, line, status);
@ -1849,7 +1848,7 @@ static struct {
{"reserved", NULL, NULL}
};
void initParser(UBool omitCollationRules)
void initParser()
{
U_STRING_INIT(k_type_string, "string", 6);
U_STRING_INIT(k_type_binary, "binary", 6);
@ -1868,8 +1867,6 @@ void initParser(UBool omitCollationRules)
U_STRING_INIT(k_type_plugin_collation, "process(collation)", 18);
U_STRING_INIT(k_type_plugin_transliterator, "process(transliterator)", 23);
U_STRING_INIT(k_type_plugin_dependency, "process(dependency)", 19);
gOmitCollationRules = omitCollationRules;
}
static inline UBool isTable(enum EResourceType type) {
@ -2049,8 +2046,8 @@ parseResource(ParseState* state, char *tag, const struct UString *comment, UErro
/* parse the top-level resource */
struct SRBRoot *
parse(UCHARBUF *buf, const char *inputDir, const char *outputDir, UBool makeBinaryCollation,
UErrorCode *status)
parse(UCHARBUF *buf, const char *inputDir, const char *outputDir,
UBool makeBinaryCollation, UBool omitCollationRules, UErrorCode *status)
{
struct UString *tokenValue;
struct UString comment;
@ -2074,6 +2071,7 @@ parse(UCHARBUF *buf, const char *inputDir, const char *outputDir, UBool makeBina
state.outputdir = outputDir;
state.outputdirLength = (state.outputdir != NULL) ? (uint32_t)uprv_strlen(state.outputdir) : 0;
state.makeBinaryCollation = makeBinaryCollation;
state.omitCollationRules = omitCollationRules;
ustr_init(&comment);
expect(&state, TOK_STRING, &tokenValue, &comment, NULL, status);

6
icu4c/source/tools/genrb/parse.h
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 1998-2011, International Business Machines
* Copyright (C) 1998-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -24,11 +24,11 @@
U_CDECL_BEGIN
/* One time parser initalisation */
void initParser(UBool omitCollationRules);
void initParser();
/* Parse a ResourceBundle text file */
struct SRBRoot* parse(UCHARBUF *buf, const char* inputDir, const char* outputDir,
UBool omitBinaryCollation, UErrorCode *status);
UBool makeBinaryCollation, UBool omitCollationRules, UErrorCode *status);
U_CDECL_END