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

ICU-9612 Make single quote logic processing correct.

Browse Source 
X-SVN-Rev: 32463
This commit is contained in:
Travis Keep 2012-09-28 18:46:48 +00:00
parent 12df2ca382
commit 946d320413
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalDataCache.java
View File

@ -82,6 +82,12 @@ class CompactDecimalDataCache {
}
}
private static enum QuoteState {
OUTSIDE, // Outside single quote
INSIDE_EMPTY, // Just inside single quote
INSIDE_FULL // Inside single quote along with characters
}
/**
* Fetch data for a particular locale. Clients must not modify any part
@ -291,7 +297,33 @@ class CompactDecimalDataCache {
}
private static String fixQuotes(String prefixOrSuffix) {
return prefixOrSuffix.replace("'.'", ".");
StringBuilder result = new StringBuilder();
int len = prefixOrSuffix.length();
QuoteState state = QuoteState.OUTSIDE;
for (int idx = 0; idx < len; idx++) {
char ch = prefixOrSuffix.charAt(idx);
if (ch == '\'') {
if (state == QuoteState.INSIDE_EMPTY) {
result.append('\'');
}
} else {
result.append(ch);
}
// Update state
switch (state) {
case OUTSIDE:
state = ch == '\'' ? QuoteState.INSIDE_EMPTY : QuoteState.OUTSIDE;
break;
case INSIDE_EMPTY:
case INSIDE_FULL:
state = ch == '\'' ? QuoteState.OUTSIDE : QuoteState.INSIDE_FULL;
break;
default:
throw new IllegalStateException();
}
}
return result.toString();
}
/**