ICU-7961 merge of r28282 r28299 r28683 r28684 r28685 from #7654 #7911 for milestone...

X-SVN-Rev: 28696

diff --git a/source/i18n/decimfmt.cpp b/source/i18n/decimfmt.cpp
index 201cd36925c05ca1277e86b7796c8f6a18f9cca5..42b757cd4412f14e4302ec59b68b740e59ec4a9c 100644 (file)
--- a/source/i18n/decimfmt.cpp
+++ b/source/i18n/decimfmt.cpp
@@ -1924,7 +1924,7 @@ UBool DecimalFormat::subparse(const UnicodeString& text,
             else {
                 const UnicodeString *tmp;
                 tmp = &getConstSymbol(DecimalFormatSymbols::kExponentialSymbol);
-                if (!text.caseCompare(position, tmp->length(), *tmp, U_FOLD_CASE_DEFAULT))    // error code is set below if !sawDigit
+                if (!text.compare(position, tmp->length(), *tmp))    // error code is set below if !sawDigit 
                 {
                     // Parse sign, if present
                     int32_t pos = position + tmp->length();

diff --git a/source/i18n/fmtable.cpp b/source/i18n/fmtable.cpp
index 8abfa0c25ac2fb27afad09ef768f62864c1865c5..6b17be090c552a7c286c9733b17e853b21ca2fc9 100644 (file)
--- a/source/i18n/fmtable.cpp
+++ b/source/i18n/fmtable.cpp
@@ -442,10 +442,10 @@ Formattable::getInt64(UErrorCode& status) const
     case Formattable::kInt64: 
         return fValue.fInt64;
     case Formattable::kDouble:
-        if (fValue.fDouble > U_INT64_MAX) {
+        if (fValue.fDouble >= U_INT64_MAX) {
             status = U_INVALID_FORMAT_ERROR;
             return U_INT64_MAX;
-        } else if (fValue.fDouble < U_INT64_MIN) {
+        } else if (fValue.fDouble <= U_INT64_MIN) {
             status = U_INVALID_FORMAT_ERROR;
             return U_INT64_MIN;
         } else {

diff --git a/source/io/uscanf_p.c b/source/io/uscanf_p.c
index 804f9a55de4c66ccb0bcf194608114a5e665af98..ec6d97e07ffe0419c9dc1a366a2feab35ec5d377 100644 (file)
--- a/source/io/uscanf_p.c
+++ b/source/io/uscanf_p.c
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 1998-2006, International Business Machines
+*   Copyright (C) 1998-2010, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -473,6 +473,8 @@ u_scanf_double_handler(UFILE        *input,
     return parsePos + skipped;
 }
 
+#define UPRINTF_SYMBOL_BUFFER_SIZE 8
+
 static int32_t
 u_scanf_scientific_handler(UFILE        *input,
                            u_scanf_spec_info *info,
@@ -487,6 +489,9 @@ u_scanf_scientific_handler(UFILE        *input,
     int32_t         parsePos    = 0;
     int32_t         skipped;
     UErrorCode      status      = U_ZERO_ERROR;
+    UChar srcExpBuf[UPRINTF_SYMBOL_BUFFER_SIZE];
+    int32_t srcLen, expLen;
+    UChar expBuf[UPRINTF_SYMBOL_BUFFER_SIZE];
 
 
     /* skip all ws in the input */
@@ -509,6 +514,37 @@ u_scanf_scientific_handler(UFILE        *input,
     if(format == 0)
         return 0;
 
+    /* set the appropriate flags on the formatter */
+
+    srcLen = unum_getSymbol(format,
+        UNUM_EXPONENTIAL_SYMBOL,
+        srcExpBuf,
+        sizeof(srcExpBuf),
+        &status);
+
+    /* Upper/lower case the e */
+    if (info->fSpec == (UChar)0x65 /* e */) {
+        expLen = u_strToLower(expBuf, (int32_t)sizeof(expBuf),
+            srcExpBuf, srcLen,
+            input->str.fBundle.fLocale,
+            &status);
+    }
+    else {
+        expLen = u_strToUpper(expBuf, (int32_t)sizeof(expBuf),
+            srcExpBuf, srcLen,
+            input->str.fBundle.fLocale,
+            &status);
+    }
+
+    unum_setSymbol(format,
+        UNUM_EXPONENTIAL_SYMBOL,
+        expBuf,
+        expLen,
+        &status);
+
+
+
+
     /* Skip the positive prefix. ICU normally can't handle this due to strict parsing. */
     skipped += u_scanf_skip_leading_positive_sign(input, format, &status);
 

diff --git a/source/test/cintltst/cnumtst.c b/source/test/cintltst/cnumtst.c
index 571d7890f9f9a7100dcdfd4dcdc734d82b78d4e5..c9eed7594a6ad8050793874b5af3baba27da0fd4 100644 (file)
--- a/source/test/cintltst/cnumtst.c
+++ b/source/test/cintltst/cnumtst.c
@@ -36,6 +36,7 @@
 void addNumForTest(TestNode** root);
 static void TestTextAttributeCrash(void);
 static void TestNBSPInPattern(void);
+static void TestInt64Parse(void);
 
 #define TESTCASE(x) addTest(root, &x, "tsformat/cnumtst/" #x)
 
@@ -51,6 +52,7 @@ void addNumForTest(TestNode** root)
     TESTCASE(TestTextAttributeCrash);
     TESTCASE(TestRBNFFormat);
     TESTCASE(TestNBSPInPattern);
+    TESTCASE(TestInt64Parse);
 }
 
 /** copy src to dst with unicode-escapes for values < 0x20 and > 0x7e, null terminate if possible */
@@ -87,6 +89,51 @@ static int32_t ustrToAstr(const UChar* src, int32_t srcLength, char* dst, int32_
     return (int32_t)(p - dst);
 }
 
+/* test Parse int 64 */
+
+static void TestInt64Parse()
+{
+
+    UErrorCode st = U_ZERO_ERROR;
+    UErrorCode* status = &st;
+    
+    char* st1 = "009223372036854775808";
+    const int size = 21;
+    const int textLength = size;
+    UChar text[21];
+    
+       
+    UNumberFormat* nf;
+
+    int64_t a;
+
+    u_charsToUChars(st1, text, size);
+    nf = unum_open(UNUM_DEFAULT, NULL, -1, NULL, NULL, status);
+
+    if(U_FAILURE(*status))
+    {
+        log_err("Error in unum_open() %s \n", myErrorName(*status));
+        return;
+    }
+
+    log_verbose("About to test unum_parseInt64() with out of range number\n");
+
+    a = unum_parseInt64(nf, text, size, 0, status);
+       
+
+    if(!U_FAILURE(*status))
+    {
+        log_err("Error in unum_parseInt64(): %s \n", myErrorName(*status));
+    }
+    else
+    {
+        log_verbose("unum_parseInt64() successful\n");
+    }
+
+    unum_close(nf);
+    return;
+}
+
 /* test Number Format API */
 static void TestNumberFormat()
 {

diff --git a/source/test/intltest/numfmtst.cpp b/source/test/intltest/numfmtst.cpp
index 9f70c8c5e48674f7002636c2ecc756dd39805a87..0d85974b5b2bae4a8a8e6d50b2d6502bacee3471 100644 (file)
--- a/source/test/intltest/numfmtst.cpp
+++ b/source/test/intltest/numfmtst.cpp
@@ -108,6 +108,7 @@ void NumberFormatTest::runIndexedTest( int32_t index, UBool exec, const char* &n
         CASE(45,TestFormatAttributes);
         CASE(46,TestFieldPositionIterator);
         CASE(47,TestDecimal);
+        CASE(49,TestExponentParse); 
         default: name = ""; break;
     }
 }
@@ -6113,4 +6114,38 @@ void NumberFormatTest::TestDecimal() {
 
 }
 
+void NumberFormatTest::TestExponentParse() { 
+ 
+    UErrorCode status = U_ZERO_ERROR; 
+    Formattable result; 
+    ParsePosition parsePos(0); 
+ 
+    // set the exponent symbol 
+    status = U_ZERO_ERROR; 
+    DecimalFormatSymbols *symbols = new DecimalFormatSymbols(Locale::getDefault(), status); 
+    if(U_FAILURE(status)) { 
+        errln((UnicodeString)"ERROR: Could not create DecimalFormatSymbols (Default)"); 
+        return; 
+    } 
+    symbols->setSymbol(DecimalFormatSymbols::kExponentialSymbol,"e"); 
+ 
+    // create format instance 
+    status = U_ZERO_ERROR; 
+    DecimalFormat fmt("#####", symbols, status); 
+       if(U_FAILURE(status)) { 
+        errln((UnicodeString)"ERROR: Could not create DecimalFormat (pattern, symbols*)"); 
+    } 
+ 
+    // parse the text 
+    fmt.parse("123E4", result, parsePos); 
+    if(result.getType() != Formattable::kDouble &&  
+       result.getDouble() != (double)123 && 
+       parsePos.getIndex() != 3 
+       ) 
+    { 
+        errln("ERROR: parse failed - expected 123.0, 3  - returned %d, %i", 
+               result.getDouble(), parsePos); 
+    } 
+} 
+
 #endif /* #if !UCONFIG_NO_FORMATTING */

diff --git a/source/test/intltest/numfmtst.h b/source/test/intltest/numfmtst.h
index 8be28aa898964533216ea0535eee381d20a233d7..24a301c1c100a860aacc6fce7a7f9441c673d54a 100644 (file)
--- a/source/test/intltest/numfmtst.h
+++ b/source/test/intltest/numfmtst.h
@@ -147,6 +147,8 @@ class NumberFormatTest: public CalendarTimeZoneTest {
 
     void TestDecimal();
 
+    void TestExponentParse();
+
  private:
 
     static UBool equalValue(const Formattable& a, const Formattable& b);