ICU 56 update step 1

source/i18n/msgfmt.cpp

 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 1997-2014, International Business Machines Corporation and
+ * Copyright (c) 1997-2015, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************
  *
  * File MSGFMT.CPP
  *
  * Modification History:
  *
  *   Date        Name        Description
  *   02/19/97    aliu        Converted from java.
  *   03/20/97    helena      Finished first cut of implementation.
@@ skipping 25 matching lines @@
 #include "patternprops.h"
 #include "messageimpl.h"
 #include "msgfmt_impl.h"
 #include "plurrule_impl.h"
 #include "uassert.h"
 #include "uelement.h"
 #include "uhash.h"
 #include "ustrfmt.h"
 #include "util.h"
 #include "uvector.h"
+#include "visibledigits.h"
 
 // *****************************************************************************
 // class MessageFormat
 // *****************************************************************************
 
 #define SINGLE_QUOTE      ((UChar)0x0027)
 #define COMMA             ((UChar)0x002C)
 #define LEFT_CURLY_BRACE  ((UChar)0x007B)
 #define RIGHT_CURLY_BRACE ((UChar)0x007D)
 
@@ skipping 347 matching lines @@
     if (customFormatArgStarts == NULL) {
         return TRUE;
     }
 
     UErrorCode ec = U_ZERO_ERROR;
     const int32_t count = uhash_count(customFormatArgStarts);
     const int32_t rhs_count = uhash_count(that.customFormatArgStarts);
     if (count != rhs_count) {
         return FALSE;
     }
-    int32_t idx = 0, rhs_idx = 0, pos = -1, rhs_pos = -1;
+    int32_t idx = 0, rhs_idx = 0, pos = UHASH_FIRST, rhs_pos = UHASH_FIRST;
     for (; idx < count && rhs_idx < rhs_count && U_SUCCESS(ec); ++idx, ++rhs_idx) {
         const UHashElement* cur = uhash_nextElement(customFormatArgStarts, &pos);
         const UHashElement* rhs_cur = uhash_nextElement(that.customFormatArgStarts, &rhs_pos);
         if (cur->key.integer != rhs_cur->key.integer) {
             return FALSE;
         }
         const Format* format = (const Format*)uhash_iget(cachedFormatters, cur->key.integer);
         const Format* rhs_format = (const Format*)uhash_iget(that.cachedFormatters, rhs_cur->key.integer);
         if (*format != *rhs_format) {
             return FALSE;
@@ skipping 898 matching lines @@
             cachedFormatters=uhash_open(uhash_hashLong, uhash_compareLong,
                                         equalFormatsForHash, &ec);
             if (U_FAILURE(ec)) {
                 return;
             }
             uhash_setValueDeleter(cachedFormatters, uprv_deleteUObject);
         }
 
         const int32_t count = uhash_count(that.cachedFormatters);
         int32_t pos, idx;
-        for (idx = 0, pos = -1; idx < count && U_SUCCESS(ec); ++idx) {
+        for (idx = 0, pos = UHASH_FIRST; idx < count && U_SUCCESS(ec); ++idx) {
             const UHashElement* cur = uhash_nextElement(that.cachedFormatters, &pos);
             Format* newFormat = ((Format*)(cur->value.pointer))->clone();
             if (newFormat) {
                 uhash_iput(cachedFormatters, cur->key.integer, newFormat, &ec);
             } else {
                 ec = U_MEMORY_ALLOCATION_ERROR;
                 return;
             }
         }
     }
     if (that.customFormatArgStarts) {
         if (customFormatArgStarts == NULL) {
             customFormatArgStarts=uhash_open(uhash_hashLong, uhash_compareLong,
                                               NULL, &ec);
         }
         const int32_t count = uhash_count(that.customFormatArgStarts);
         int32_t pos, idx;
-        for (idx = 0, pos = -1; idx < count && U_SUCCESS(ec); ++idx) {
+        for (idx = 0, pos = UHASH_FIRST; idx < count && U_SUCCESS(ec); ++idx) {
             const UHashElement* cur = uhash_nextElement(that.customFormatArgStarts, &pos);
             uhash_iputi(customFormatArgStarts, cur->key.integer, cur->value.integer, &ec);
         }
     }
 }
 
 
 Formattable*
 MessageFormat::parse(int32_t msgStart,
                      const UnicodeString& source,
@@ skipping 584 matching lines @@
             (const Format*)uhash_iget(msgFormat.cachedFormatters, context.numberArgIndex);
     }
     if(context.formatter == NULL) {
         context.formatter = msgFormat.getDefaultNumberFormat(ec);
         context.forReplaceNumber = TRUE;
     }
     U_ASSERT(context.number.getDouble(ec) == number);  // argument number minus the offset
     context.formatter->format(context.number, context.numberString, ec);
     const DecimalFormat *decFmt = dynamic_cast<const DecimalFormat *>(context.formatter);
     if(decFmt != NULL) {
-        FixedDecimal dec = decFmt->getFixedDecimal(context.number, ec);
-        return rules->select(dec);
+        VisibleDigitsWithExponent digits;
+        decFmt->initVisibleDigitsWithExponent(context.number, digits, ec);
+        if (U_FAILURE(ec)) {
+            return UnicodeString(FALSE, OTHER_STRING, 5);
+        }
+        return rules->select(digits);
     } else {
         return rules->select(number);
     }
 }
 
 void MessageFormat::PluralSelectorProvider::reset() {
     delete rules;
     rules = NULL;
 }
 
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 //eof