organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-15 17:56:54 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-96 Initing of TokenParser structure moved to parser (cleanup)

Browse source 
X-SVN-Rev: 4894
This commit is contained in:
Vladimir Weinstein 2001-06-06 20:18:38 +00:00
parent b4b20eb413
commit 3ff593d857
1 changed files with 4 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
icu4c/source/i18n/ucol.cpp
View file

@ -317,7 +317,7 @@ ucol_openRules( const UChar *rules,
UCollationStrength strength,
UErrorCode *status)
{
uint32_t listLen = 0, nSize = 0;
uint32_t listLen = 0;
UColTokenParser src;
UColAttributeValue norm;
@ -341,32 +341,9 @@ ucol_openRules( const UChar *rules,
if(U_FAILURE(*status)) return 0;
/*src.source = rules;*/
src.source = (UChar *)uprv_malloc((2*rulesLength+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar));
nSize = unorm_normalize(rules, rulesLength, UNORM_NFD, 0, src.source, 2*rulesLength+UCOL_TOK_EXTRA_RULE_SPACE_SIZE, status);
if(nSize > (uint32_t)(2*rulesLength+UCOL_TOK_EXTRA_RULE_SPACE_SIZE) || *status == U_BUFFER_OVERFLOW_ERROR) {
*status = U_ZERO_ERROR;
src.source = (UChar *)realloc(src.source, (nSize+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar));
nSize = unorm_normalize(rules, rulesLength, UNORM_NFD, 0, src.source, nSize+UCOL_TOK_EXTRA_RULE_SPACE_SIZE, status);
}
//uprv_memcpy(src.source, rules, rulesLength*sizeof(UChar));
src.current = src.source;
src.end = src.source+nSize;
//src.end = src.source+rulesLength;
src.sourceCurrent = src.source;
src.extraCurrent = src.end;
src.extraEnd = src.end+UCOL_TOK_EXTRA_RULE_SPACE_SIZE;
src.UCA = UCA;
src.invUCA = ucol_initInverseUCA(status);
src.resultLen = 0;
src.lh = 0;
src.varTop = NULL;
src.opts = (UColOptionSet *)uprv_malloc(sizeof(UColOptionSet));
uprv_memcpy(src.opts, UCA->options, sizeof(UColOptionSet));
ucol_tok_initTokenList(&src, rules, rulesLength, UCA, status);
listLen = ucol_tok_assembleTokenList(&src, status);
if(U_FAILURE(*status)) {
/* if status is U_ILLEGAL_ARGUMENT_ERROR, src->current points at the offending option */
/* if status is U_INVALID_FORMAT_ERROR, src->current points after the problematic part of the rules */
@ -399,7 +376,6 @@ ucol_openRules( const UChar *rules,
result->hasRealData = FALSE;
}
if(U_SUCCESS(*status)) {
result->dataInfo.dataVersion[0] = UCOL_BUILDER_VERSION;
result->rules = (UChar *)uprv_malloc((u_strlen(rules)+1)*sizeof(UChar));
@ -418,6 +394,7 @@ ucol_openRules( const UChar *rules,
}
result = NULL;
}
ucol_tok_closeTokenList(&src);
return result;