Fixed handling of different decimal separators on DigitList::set().

source/i18n/digitlst.cpp

 /*
 **********************************************************************
 *   Copyright (C) 1997-2010, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *
 * File DIGITLST.CPP
 *
 * Modification History:
 *
@@ skipping 42 matching lines @@
 
 static char gDecimal = 0;
 
 /* Only for 32 bit numbers. Ignore the negative sign. */
 static const char LONG_MIN_REP[] = "2147483648";
 static const char I64_MIN_REP[] = "9223372036854775808";
 
 
 U_NAMESPACE_BEGIN
 
+static void
+loadDecimalChar() {
+    if (gDecimal == 0) {
+        char rep[MAX_DIGITS];
+        // For machines that decide to change the decimal on you,
+        // and try to be too smart with localization.
+        // This normally should be just a '.'.
+        sprintf(rep, "%+1.1f", 1.0);
+        gDecimal = rep[2];
+    }
+}
+
 // -------------------------------------
 // default constructor
 
 DigitList::DigitList()
 {
     uprv_decContextDefault(&fContext, DEC_INIT_BASE);
     fContext.traps  = 0;
     uprv_decContextSetRounding(&fContext, DEC_ROUND_HALF_EVEN);
     fContext.digits = fStorage.getCapacity();
 
@@ skipping 318 matching lines @@
 {
     // TODO:  fix thread safety.  Can probably be finessed some by analyzing
     //        what public const functions can see which DigitLists.
     //        Like precompute fDouble for DigitLists coming in from a parse
     //        or from a Formattable::set(), but not for any others.
     if (fHaveDouble) {
         return fDouble;
     }
     DigitList *nonConstThis = const_cast<DigitList *>(this);
 
-    if (gDecimal == 0) {
-        char rep[MAX_DIGITS];
-        // For machines that decide to change the decimal on you,
-        // and try to be too smart with localization.
-        // This normally should be just a '.'.
-        sprintf(rep, "%+1.1f", 1.0);
-        gDecimal = rep[2];
-    }
-
     if (isZero()) {
         nonConstThis->fDouble = 0.0;
         if (decNumberIsNegative(fDecNumber)) {
             nonConstThis->fDouble /= -1;
         }
     } else if (isInfinite()) {
         if (std::numeric_limits<double>::has_infinity) {
             nonConstThis->fDouble = std::numeric_limits<double>::infinity();
         } else {
             nonConstThis->fDouble = std::numeric_limits<double>::max();
@@ skipping 14 matching lines @@
             DigitList numToConvert(*this);
             numToConvert.reduce();    // Removes any trailing zeros, so that digit count is good.
             numToConvert.round(MAX_DBL_DIGITS+3);
             uprv_decNumberToString(numToConvert.fDecNumber, s);
             // TODO:  how many extra digits should be included for an accurate conversion?
         } else {
             uprv_decNumberToString(this->fDecNumber, s);
         }
         U_ASSERT(uprv_strlen(&s[0]) < MAX_DBL_DIGITS+18);
         
+        loadDecimalChar();
         if (gDecimal != '.') {
             char *decimalPt = strchr(s, '.');
             if (decimalPt != NULL) {
                 *decimalPt = gDecimal;
             }
         }
         char *end = NULL;
         nonConstThis->fDouble = uprv_strtod(s, &end);
     }
     nonConstThis->fHaveDouble = TRUE;
@@ skipping 266 matching lines @@
 void
 DigitList::set(double source)
 {
     // for now, simple implementation; later, do proper IEEE stuff
     char rep[MAX_DIGITS + 8]; // Extra space for '+', '.', e+NNN, and '\0' (actually +8 is enough)
 
     // Generate a representation of the form /[+-][0-9]+e[+-][0-9]+/
     sprintf(rep, "%+1.*e", MAX_DBL_DIGITS - 1, source);
     U_ASSERT(uprv_strlen(rep) < sizeof(rep));
 
+    // uprv_decNumberFromString() will parse the string expecting '.' as a
+    // decimal separator, however sprintf() can use ',' in certain locales.
+    // Overwrite a different decimal separator with '.' here before proceeding.
+    loadDecimalChar();
+    if (gDecimal != '.') {
+        char *decimalPt = strchr(rep, gDecimal);
+        if (decimalPt != NULL) {
+            *decimalPt = '.';
+        }
+    }
+
     // Create a decNumber from the string.
     uprv_decNumberFromString(fDecNumber, rep, &fContext);
     uprv_decNumberTrim(fDecNumber);
     fDouble = source;
     fHaveDouble = TRUE;
 }
 
 // -------------------------------------
 
 /*
@@ skipping 112 matching lines @@
 DigitList::isZero() const
 {
     return decNumberIsZero(fDecNumber);
 }
 
 
 U_NAMESPACE_END
 #endif // #if !UCONFIG_NO_FORMATTING
 
 //eof