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

ICU-11818 Implement PluralRules in fractional RBNF

Browse Source 
X-SVN-Rev: 37823
This commit is contained in:
George Rhoten 2015-08-26 10:42:17 +00:00
parent 896009e9da
commit e3e7183663
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -792,8 +792,16 @@ NFRule::doFormat(double number, UnicodeString& toInsertInto, int32_t pos, int32_
if (pluralRuleEnd < ruleText.length() - 1) {
toInsertInto.insert(pos, ruleText.tempSubString(pluralRuleEnd + 2));
}
toInsertInto.insert(pos,
rulePatternFormat->format((int32_t)(number/uprv_pow(radix, exponent)), status));
double pluralVal = number;
if (0 <= pluralVal && pluralVal < 1) {
// We're in a fractional rule, and we have to match the NumeratorSubstitution behavior.
// 2.3 can become 0.2999999999999998 for the fraction due to rounding errors.
pluralVal = uprv_round(pluralVal * uprv_pow(radix, exponent));
}
else {
pluralVal = pluralVal / uprv_pow(radix, exponent);
}
toInsertInto.insert(pos, rulePatternFormat->format((int32_t)(pluralVal), status));
if (pluralRuleStart > 0) {
toInsertInto.insert(pos, ruleText.tempSubString(0, pluralRuleStart));
}

25
icu4c/source/test/intltest/itrbnf.cpp
View File

@ -354,11 +354,17 @@ void IntlTestRBNF::TestMultiplePluralRules() {
UnicodeString rules("%spellout-cardinal-feminine-genitive:"
"0: zero;"
"1: ono;"
"2: two;"
"1000: << $(cardinal,one{thousand}few{thousanF}other{thousanO})$[ >>];"
"%spellout-cardinal-feminine:"
"x.x: [<< $(cardinal,one{singleton}other{plurality})$ ]>%%fractions>;"
"0: zero;"
"1: one;"
"1000: << $(cardinal,one{thousand}few{thousanF}other{thousanO})$[ >>];");
"2: two;"
"1000: << $(cardinal,one{thousand}few{thousanF}other{thousanO})$[ >>];"
"%%fractions:"
"10: <%spellout-cardinal-feminine< $(cardinal,one{oneth}other{tenth})$;"
"100: <%spellout-cardinal-feminine< $(cardinal,one{1hundredth}other{hundredth})$;");
UErrorCode status = U_ZERO_ERROR;
UParseError pError;
RuleBasedNumberFormat formatter(rules, Locale("ru"), pError, status);
@ -388,6 +394,21 @@ void IntlTestRBNF::TestMultiplePluralRules() {
errln("RuleBasedNumberFormat(spellout-cardinal-feminine) did not return the correct value. Got: %d", result.getLong());
errln(resultStr);
}
static const char* const testData[][2] = {
{ "0", "zero" },
{ "1", "one" },
{ "2", "two" },
{ "0.1", "one oneth" },
{ "0.2", "two tenth" },
{ "1.1", "one singleton one oneth" },
{ "1.2", "one singleton two tenth" },
{ "2.1", "two plurality one oneth" },
{ "2.2", "two plurality two tenth" },
{ "0.01", "one 1hundredth" },
{ "0.02", "two hundredth" },
{ NULL, NULL }
};
doTest(&formatter, testData, TRUE);
}
void IntlTestRBNF::TestFractionalRuleSet()
@ -475,7 +496,7 @@ void IntlTestRBNF::TestFractionalRuleSet()
{ "1.2856", "1 2/7" },
{ NULL, NULL }
};
doTest(&formatter, testData, FALSE); // exact values aren't parsable from fractions
doTest(&formatter, testData, FALSE); // exact values aren't parsable from fractions
}
}

1
icu4c/source/test/intltest/itrbnf.h
View File

@ -142,6 +142,7 @@ class IntlTestRBNF : public IntlTest {
void TestInfinityNaN();
void TestVariableDecimalPoint();
void TestRounding();
protected:
virtual void doTest(RuleBasedNumberFormat* formatter, const char* const testData[][2], UBool testParsing);