ICU-57131.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / plurfmt.cpp

diff --git a/icuSources/i18n/plurfmt.cpp b/icuSources/i18n/plurfmt.cpp
index bb5689d2456ff88d495ead4f8aba2feae0837d24..9ff2bffc9d99cae2984adcde81bb7473ae5e332e 100644 (file)
--- a/icuSources/i18n/plurfmt.cpp
+++ b/icuSources/i18n/plurfmt.cpp
@@ -19,6 +19,8 @@
 #include "plurrule_impl.h"
 #include "uassert.h"
 #include "uhash.h"
 #include "plurrule_impl.h"
 #include "uassert.h"
 #include "uhash.h"

+#include "precision.h"
+#include "visibledigits.h"

 
 #if !UCONFIG_NO_FORMATTING
 
 
 #if !UCONFIG_NO_FORMATTING
 


@@ -259,18 +261,37 @@ PluralFormat::format(const Formattable& numberObject, double number,
     double numberMinusOffset = number - offset;
     UnicodeString numberString;
     FieldPosition ignorePos;
     double numberMinusOffset = number - offset;
     UnicodeString numberString;
     FieldPosition ignorePos;

-    FixedDecimal dec(numberMinusOffset);
+    FixedPrecision fp;
+    VisibleDigitsWithExponent dec;
+    fp.initVisibleDigitsWithExponent(numberMinusOffset, dec, status);
+    if (U_FAILURE(status)) {
+        return appendTo;
+    }

     if (offset == 0) {
     if (offset == 0) {

-        numberFormat->format(numberObject, numberString, ignorePos, status);  // could be BigDecimal etc.

         DecimalFormat *decFmt = dynamic_cast<DecimalFormat *>(numberFormat);
         if(decFmt != NULL) {
         DecimalFormat *decFmt = dynamic_cast<DecimalFormat *>(numberFormat);
         if(decFmt != NULL) {

-            dec = decFmt->getFixedDecimal(numberObject, status);
+            decFmt->initVisibleDigitsWithExponent(
+                    numberObject, dec, status);
+            if (U_FAILURE(status)) {
+                return appendTo;
+            }
+            decFmt->format(dec, numberString, ignorePos, status);
+        } else {
+            numberFormat->format(
+                    numberObject, numberString, ignorePos, status);  // could be BigDecimal etc.

         }
     } else {
         }
     } else {

-        numberFormat->format(numberMinusOffset, numberString, ignorePos, status);

         DecimalFormat *decFmt = dynamic_cast<DecimalFormat *>(numberFormat);
         if(decFmt != NULL) {
         DecimalFormat *decFmt = dynamic_cast<DecimalFormat *>(numberFormat);
         if(decFmt != NULL) {

-            dec = decFmt->getFixedDecimal(numberMinusOffset, status);
+            decFmt->initVisibleDigitsWithExponent(
+                    numberMinusOffset, dec, status);
+            if (U_FAILURE(status)) {
+                return appendTo;
+            }
+            decFmt->format(dec, numberString, ignorePos, status);
+        } else {
+            numberFormat->format(
+                    numberMinusOffset, numberString, ignorePos, status);

         }
     }
     int32_t partIndex = findSubMessage(msgPattern, 0, pluralRulesWrapper, &dec, number, status);
         }
     }
     int32_t partIndex = findSubMessage(msgPattern, 0, pluralRulesWrapper, &dec, number, status);


@@ -562,8 +583,7 @@ PluralFormat::PluralSelectorAdapter::~PluralSelectorAdapter() {
 UnicodeString PluralFormat::PluralSelectorAdapter::select(void *context, double number,
                                                           UErrorCode& /*ec*/) const {
     (void)number;  // unused except in the assertion
 UnicodeString PluralFormat::PluralSelectorAdapter::select(void *context, double number,
                                                           UErrorCode& /*ec*/) const {
     (void)number;  // unused except in the assertion

-    FixedDecimal *dec=static_cast<FixedDecimal *>(context);
-    U_ASSERT(dec->source==number);
+    VisibleDigitsWithExponent *dec=static_cast<VisibleDigitsWithExponent *>(context);

     return pluralRules->select(*dec);
 }
 
     return pluralRules->select(*dec);
 }