ICU 56 update step 1

source/i18n/quantityformatter.cpp

 /*
 ******************************************************************************
-* Copyright (C) 2014, International Business Machines
+* Copyright (C) 2014-2015, International Business Machines
 * Corporation and others.  All Rights Reserved.
 ******************************************************************************
 * quantityformatter.cpp
 */
 #include "quantityformatter.h"
 #include "simplepatternformatter.h"
 #include "uassert.h"
 #include "unicode/unistr.h"
 #include "unicode/decimfmt.h"
 #include "cstring.h"
-#include "plurrule_impl.h"
 #include "unicode/plurrule.h"
 #include "charstr.h"
 #include "unicode/fmtable.h"
 #include "unicode/fieldpos.h"
+#include "visibledigits.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 U_NAMESPACE_BEGIN
 
 // other must always be first.
 static const char * const gPluralForms[] = {
         "other", "zero", "one", "two", "few", "many"};
 
 static int32_t getPluralIndex(const char *pluralForm) {
@@ skipping 100 matching lines @@
             const Formattable& quantity,
             const NumberFormat &fmt,
             const PluralRules &rules,
             UnicodeString &appendTo,
             FieldPosition &pos,
             UErrorCode &status) const {
     if (U_FAILURE(status)) {
         return appendTo;
     }
     UnicodeString count;
+    VisibleDigitsWithExponent digits;
     const DecimalFormat *decFmt = dynamic_cast<const DecimalFormat *>(&fmt);
     if (decFmt != NULL) {
-        FixedDecimal fd = decFmt->getFixedDecimal(quantity, status);
+        decFmt->initVisibleDigitsWithExponent(quantity, digits, status);
         if (U_FAILURE(status)) {
             return appendTo;
         }
-        count = rules.select(fd);
+        count = rules.select(digits);
     } else {
         if (quantity.getType() == Formattable::kDouble) {
             count = rules.select(quantity.getDouble());
         } else if (quantity.getType() == Formattable::kLong) {
             count = rules.select(quantity.getLong());
         } else if (quantity.getType() == Formattable::kInt64) {
             count = rules.select((double) quantity.getInt64());
         } else {
             status = U_ILLEGAL_ARGUMENT_ERROR;
             return appendTo;
         }
     }
     CharString buffer;
     buffer.appendInvariantChars(count, status);
     if (U_FAILURE(status)) {
         return appendTo;
     }
     const SimplePatternFormatter *pattern = getByVariant(buffer.data());
     if (pattern == NULL) {
         status = U_INVALID_STATE_ERROR;
         return appendTo;
     }
     UnicodeString formattedNumber;
     FieldPosition fpos(pos.getField());
-    fmt.format(quantity, formattedNumber, fpos, status);
+    if (decFmt != NULL) {
+        decFmt->format(digits, formattedNumber, fpos, status);
+    } else {
+        fmt.format(quantity, formattedNumber, fpos, status);
+    }
     const UnicodeString *params[1] = {&formattedNumber};
     int32_t offsets[1];
-    pattern->format(params, UPRV_LENGTHOF(params), appendTo, offsets, UPRV_LENGTHOF(offsets), status);
+    pattern->formatAndAppend(
+            params,
+            UPRV_LENGTHOF(params),
+            appendTo,
+            offsets,
+            UPRV_LENGTHOF(offsets),
+            status);
     if (offsets[0] != -1) {
         if (fpos.getBeginIndex() != 0 || fpos.getEndIndex() != 0) {
             pos.setBeginIndex(fpos.getBeginIndex() + offsets[0]);
             pos.setEndIndex(fpos.getEndIndex() + offsets[0]);
         }
     }
     return appendTo;
 }
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */