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

ICU-4954 Ensure Unicode Pattern_White_Space set is used where appropriate.

Browse Source 
X-SVN-Rev: 26571
This commit is contained in:
Michael Ow 2009-08-28 18:37:27 +00:00
parent 86ca295bb4
commit 392d7d16b6
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/i18n/smpdtfmt.cpp
View File

@ -2379,7 +2379,7 @@ int32_t SimpleDateFormat::subParse(const UnicodeString& text, int32_t& start, UC
return -start;
}
UChar32 c = text.char32At(start);
if (!u_isUWhiteSpace(c)) {
if (!u_isUWhiteSpace(c) || !uprv_isRuleWhiteSpace(c)) {
break;
}
start += UTF_CHAR_LENGTH(c);

12
icu4c/source/i18n/ucol_tok.cpp
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2001-2008, International Business Machines
* Copyright (C) 2001-2009, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -461,7 +461,7 @@ ucol_tok_getNextArgument(const UChar *start, const UChar *end,
ucol_uprv_tok_initData();
while(start < end && u_isWhitespace(*start)) { /* eat whitespace */
while(start < end && (u_isWhitespace(*start) || uprv_isRuleWhiteSpace(*start))) { /* eat whitespace */
start++;
}
if(start >= end) {
@ -480,7 +480,7 @@ ucol_tok_getNextArgument(const UChar *start, const UChar *end,
foundOption = TRUE;
if(end - start > rulesOptions[i].optionLen) {
optionArg = start+rulesOptions[i].optionLen+1; /* start of the options, skip space */
while(u_isWhitespace(*optionArg)) { /* eat whitespace */
while(u_isWhitespace(*optionArg) || uprv_isRuleWhiteSpace(*optionArg)) { /* eat whitespace */
optionArg++;
}
}
@ -501,7 +501,7 @@ ucol_tok_getNextArgument(const UChar *start, const UChar *end,
*attrib = rulesOptions[i].attr;
*value = rulesOptions[i].subopts[j].attrVal;
optionArg += rulesOptions[i].subopts[j].subLen;
while(u_isWhitespace(*optionArg)) { /* eat whitespace */
while(u_isWhitespace(*optionArg) || uprv_isRuleWhiteSpace(*optionArg)) { /* eat whitespace */
optionArg++;
}
if(*optionArg == 0x005d) {
@ -548,14 +548,14 @@ int32_t ucol_uprv_tok_readOption(const UChar *start, const UChar *end, const UCh
int32_t i = 0;
ucol_uprv_tok_initData();
while(u_isWhitespace(*start)) { /* eat whitespace */
while(u_isWhitespace(*start) || uprv_isRuleWhiteSpace(*start)) { /* eat whitespace */
start++;
}
while(i < UTOK_OPTION_COUNT) {
if(u_strncmpNoCase(start, rulesOptions[i].optionName, rulesOptions[i].optionLen) == 0) {
if(end - start > rulesOptions[i].optionLen) {
*optionArg = start+rulesOptions[i].optionLen; /* start of the options*/
while(u_isWhitespace(**optionArg)) { /* eat whitespace */
while(u_isWhitespace(**optionArg) || uprv_isRuleWhiteSpace(**optionArg)) { /* eat whitespace */
(*optionArg)++;
}
}

2
icu4j/main/classes/collate/src/com/ibm/icu/text/CollationRuleParser.java
View File

@ -1849,7 +1849,7 @@ final class CollationRuleParser
if (optionend - start > optionlength) {
m_optionarg_ = start + optionlength;
// start of the options, skip space
while (m_optionarg_ < optionend && UCharacter.isWhitespace(rules.charAt(m_optionarg_)))
while (m_optionarg_ < optionend && (UCharacter.isWhitespace(rules.charAt(m_optionarg_)) || UCharacterProperty.isRuleWhiteSpace(rules.charAt(m_optionarg_))))
{ // eat whitespace
m_optionarg_ ++;
}

2
icu4j/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java
View File

@ -2080,7 +2080,7 @@ public class SimpleDateFormat extends DateFormat {
return -start;
}
int c = UTF16.charAt(text, start);
if (!UCharacter.isUWhiteSpace(c)) {
if (!UCharacter.isUWhiteSpace(c) || !UCharacterProperty.isRuleWhiteSpace(c)) {
break;
}
start += UTF16.getCharCount(c);