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

ICU-13717 Adds fast path for RBNF, which is not affect by min/max integer digits.

Browse Source 
X-SVN-Rev: 41439
This commit is contained in:
Shane Carr 2018-05-23 04:03:19 +00:00
parent 4931366afe
commit d0d8535066
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@
#include "unicode/vtzone.h"
#include "unicode/udisplaycontext.h"
#include "unicode/brkiter.h"
#include "unicode/rbnf.h"
#include "uresimp.h"
#include "olsontz.h"
#include "patternprops.h"
@ -2069,7 +2070,6 @@ SimpleDateFormat::zeroPaddingNumber(
}
}
}
if (fastFormatter != nullptr) {
// Can use fast path
number::impl::UFormattedNumberData result;
@ -2080,9 +2080,19 @@ SimpleDateFormat::zeroPaddingNumber(
return;
}
appendTo.append(result.string.toTempUnicodeString());
return;
}
} else if (currentNumberFormat != nullptr) {
// Fall back to slow path
// Check for RBNF (no clone necessary)
auto* rbnf = dynamic_cast<const RuleBasedNumberFormat*>(currentNumberFormat);
if (rbnf != nullptr) {
FieldPosition pos(FieldPosition::DONT_CARE);
rbnf->format(value, appendTo, pos); // 3rd arg is there to speed up processing
return;
}
// Fall back to slow path (clone and mutate the NumberFormat)
if (currentNumberFormat != nullptr) {
FieldPosition pos(FieldPosition::DONT_CARE);
LocalPointer<NumberFormat> nf(dynamic_cast<NumberFormat*>(currentNumberFormat->clone()));
nf->setMinimumIntegerDigits(minDigits);

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

@ -76,6 +76,7 @@ void IntlTestRBNF::runIndexedTest(int32_t index, UBool exec, const char* &name,
TESTCASE(24, TestLargeNumbers);
TESTCASE(25, TestCompactDecimalFormatStyle);
TESTCASE(26, TestParseFailure);
TESTCASE(27, TestMinMaxIntegerDigitsIgnored);
#else
TESTCASE(0, TestRBNFDisabled);
#endif
@ -2300,6 +2301,21 @@ void IntlTestRBNF::TestParseFailure() {
}
}
void IntlTestRBNF::TestMinMaxIntegerDigitsIgnored() {
IcuTestErrorCode status(*this, "TestMinMaxIntegerDigitsIgnored");
// NOTE: SimpleDateFormat has an optimization that depends on the fact that min/max integer digits
// do not affect RBNF (see SimpleDateFormat#zeroPaddingNumber).
RuleBasedNumberFormat rbnf(URBNF_SPELLOUT, "en", status);
rbnf.setMinimumIntegerDigits(2);
rbnf.setMaximumIntegerDigits(3);
UnicodeString result;
rbnf.format(3, result.remove(), status);
assertEquals("Min integer digits are ignored", u"three", result);
rbnf.format(1012, result.remove(), status);
assertEquals("Max integer digits are ignored", u"one thousand twelve", result);
}
void
IntlTestRBNF::doTest(RuleBasedNumberFormat* formatter, const char* const testData[][2], UBool testParsing)
{

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

@ -148,6 +148,7 @@ class IntlTestRBNF : public IntlTest {
void TestLargeNumbers();
void TestCompactDecimalFormatStyle();
void TestParseFailure();
void TestMinMaxIntegerDigitsIgnored();
protected:
virtual void doTest(RuleBasedNumberFormat* formatter, const char* const testData[][2], UBool testParsing);