X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/4388f060552cc537e71e957d32f35e9d75a61233..249c4c5ea9376c24572daf9c2effa7484a282f14:/icuSources/i18n/dcfmtsym.cpp

diff --git a/icuSources/i18n/dcfmtsym.cpp b/icuSources/i18n/dcfmtsym.cpp
index 260f8b17..e6785ab7 100644
--- a/icuSources/i18n/dcfmtsym.cpp
+++ b/icuSources/i18n/dcfmtsym.cpp
@@ -1,7 +1,9 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
-* Copyright (C) 1997-2011, International Business Machines Corporation and    *
-* others. All Rights Reserved.                                                *
+* Copyright (C) 1997-2016, International Business Machines Corporation and
+* others. All Rights Reserved.
 *******************************************************************************
 *
 * File DCFMTSYM.CPP
@@ -29,11 +31,14 @@
 #include "unicode/unistr.h"
 #include "unicode/numsys.h"
 #include "unicode/unum.h"
+#include "unicode/utf16.h"
 #include "ucurrimp.h"
 #include "cstring.h"
 #include "locbased.h"
 #include "uresimp.h"
 #include "ureslocs.h"
+#include "charstr.h"
+#include "uassert.h"
 
 // *****************************************************************************
 // class DecimalFormatSymbols
@@ -50,17 +55,50 @@ static const char gAfterCurrencyTag[] = "afterCurrency";
 static const char gCurrencyMatchTag[] = "currencyMatch";
 static const char gCurrencySudMatchTag[] = "surroundingMatch";
 static const char gCurrencyInsertBtnTag[] = "insertBetween";
-
+static const char gLatn[] =  "latn";
+static const char gSymbols[] = "symbols";
+static const char gNumberElementsLatnSymbols[] = "NumberElements/latn/symbols";
 
 static const UChar INTL_CURRENCY_SYMBOL_STR[] = {0xa4, 0xa4, 0};
 
+// List of field names to be loaded from the data files.
+// These are parallel with the enum ENumberFormatSymbol in unicode/dcfmtsym.h.
+static const char *gNumberElementKeys[DecimalFormatSymbols::kFormatSymbolCount] = {
+    "decimal",
+    "group",
+    NULL, /* #11897: the <list> symbol is NOT the pattern separator symbol */
+    "percentSign",
+    NULL, /* Native zero digit is deprecated from CLDR - get it from the numbering system */
+    NULL, /* Pattern digit character is deprecated from CLDR - use # by default always */
+    "minusSign",
+    "plusSign",
+    NULL, /* currency symbol - Wait until we know the currency before loading from CLDR */
+    NULL, /* intl currency symbol - Wait until we know the currency before loading from CLDR */
+    "currencyDecimal",
+    "exponential",
+    "perMille",
+    NULL, /* Escape padding character - not in CLDR */
+    "infinity",
+    "nan",
+    NULL, /* Significant digit symbol - not in CLDR */
+    "currencyGroup",
+    NULL, /* one digit - get it from the numbering system */
+    NULL, /* two digit - get it from the numbering system */
+    NULL, /* three digit - get it from the numbering system */
+    NULL, /* four digit - get it from the numbering system */
+    NULL, /* five digit - get it from the numbering system */
+    NULL, /* six digit - get it from the numbering system */
+    NULL, /* seven digit - get it from the numbering system */
+    NULL, /* eight digit - get it from the numbering system */
+    NULL, /* nine digit - get it from the numbering system */
+    "superscriptingExponent", /* Multiplication (x) symbol for exponents */
+};
+
 // -------------------------------------
 // Initializes this with the decimal format symbols in the default locale.
 
 DecimalFormatSymbols::DecimalFormatSymbols(UErrorCode& status)
-    : UObject(),
-    locale()
-{
+        : UObject(), locale(), currPattern(NULL) {
     initialize(locale, status, TRUE);
 }
 
@@ -68,12 +106,31 @@ DecimalFormatSymbols::DecimalFormatSymbols(UErrorCode& status)
 // Initializes this with the decimal format symbols in the desired locale.
 
 DecimalFormatSymbols::DecimalFormatSymbols(const Locale& loc, UErrorCode& status)
-    : UObject(),
-    locale(loc)
-{
+        : UObject(), locale(loc), currPattern(NULL) {
     initialize(locale, status);
 }
 
+DecimalFormatSymbols::DecimalFormatSymbols(const Locale& loc, const NumberingSystem& ns, UErrorCode& status)
+        : UObject(), locale(loc), currPattern(NULL) {
+    initialize(locale, status, FALSE, &ns);
+}
+
+DecimalFormatSymbols::DecimalFormatSymbols()
+        : UObject(), locale(Locale::getRoot()), currPattern(NULL) {
+    *validLocale = *actualLocale = 0;
+    initialize();
+}
+
+DecimalFormatSymbols*
+DecimalFormatSymbols::createWithLastResortData(UErrorCode& status) {
+    if (U_FAILURE(status)) { return NULL; }
+    DecimalFormatSymbols* sym = new DecimalFormatSymbols();
+    if (sym == NULL) {
+        status = U_MEMORY_ALLOCATION_ERROR;
+    }
+    return sym;
+}
+
 // -------------------------------------
 
 DecimalFormatSymbols::~DecimalFormatSymbols()
@@ -107,6 +164,9 @@ DecimalFormatSymbols::operator=(const DecimalFormatSymbols& rhs)
         locale = rhs.locale;
         uprv_strcpy(validLocale, rhs.validLocale);
         uprv_strcpy(actualLocale, rhs.actualLocale);
+        fIsCustomCurrencySymbol = rhs.fIsCustomCurrencySymbol; 
+        fIsCustomIntlCurrencySymbol = rhs.fIsCustomIntlCurrencySymbol; 
+        fCodePointZero = rhs.fCodePointZero;
     }
     return *this;
 }
@@ -119,6 +179,12 @@ DecimalFormatSymbols::operator==(const DecimalFormatSymbols& that) const
     if (this == &that) {
         return TRUE;
     }
+    if (fIsCustomCurrencySymbol != that.fIsCustomCurrencySymbol) { 
+        return FALSE; 
+    } 
+    if (fIsCustomIntlCurrencySymbol != that.fIsCustomIntlCurrencySymbol) { 
+        return FALSE; 
+    } 
     for(int32_t i = 0; i < (int32_t)kFormatSymbolCount; ++i) {
         if(fSymbols[(ENumberFormatSymbol)i] != that.fSymbols[(ENumberFormatSymbol)i]) {
             return FALSE;
@@ -132,6 +198,7 @@ DecimalFormatSymbols::operator==(const DecimalFormatSymbols& that) const
             return FALSE;
         }
     }
+    // No need to check fCodePointZero since it is based on fSymbols
     return locale == that.locale &&
         uprv_strcmp(validLocale, that.validLocale) == 0 &&
         uprv_strcmp(actualLocale, that.actualLocale) == 0;
@@ -139,239 +206,312 @@ DecimalFormatSymbols::operator==(const DecimalFormatSymbols& that) const
 
 // -------------------------------------
 
-void
-DecimalFormatSymbols::initialize(const Locale& loc, UErrorCode& status, UBool useLastResortData)
-{
-    static const char *gNumberElementKeys[kFormatSymbolCount] = {
-        "decimal",
-        "group",
-        "list",
-        "percentSign",
-        NULL, /* Native zero digit is deprecated from CLDR - get it from the numbering system */
-        NULL, /* Pattern digit character is deprecated from CLDR - use # by default always */
-        "minusSign",
-        "plusSign",
-        NULL, /* currency symbol - We don't really try to load this directly from CLDR until we know the currency */
-        NULL, /* intl currency symbol - We don't really try to load this directly from CLDR until we know the currency */
-        "currencyDecimal",
-        "exponential",
-        "perMille",
-        NULL, /* Escape padding character - not in CLDR */
-        "infinity",
-        "nan",
-        NULL, /* Significant digit symbol - not in CLDR */
-        "currencyGroup",
-        NULL, /* one digit - get it from the numbering system */
-        NULL, /* two digit - get it from the numbering system */
-        NULL, /* three digit - get it from the numbering system */
-        NULL, /* four digit - get it from the numbering system */
-        NULL, /* five digit - get it from the numbering system */
-        NULL, /* six digit - get it from the numbering system */
-        NULL, /* seven digit - get it from the numbering system */
-        NULL, /* eight digit - get it from the numbering system */
-        NULL, /* nine digit - get it from the numbering system */
-    };
-
-    static const char *gLatn =  "latn";
-    static const char *gSymbols = "symbols";
-    const char *nsName;
-    const UChar *sym = NULL;
-    int32_t len = 0;
-
-    *validLocale = *actualLocale = 0;
-    currPattern = NULL;
-    if (U_FAILURE(status))
-        return;
-
-    const char* locStr = loc.getName();
-    UResourceBundle *resource = ures_open((char *)0, locStr, &status);
-    UResourceBundle *numberElementsRes = ures_getByKeyWithFallback(resource, gNumberElements, NULL, &status);
+namespace {
+
+/**
+ * Sink for enumerating all of the decimal format symbols (more specifically, anything
+ * under the "NumberElements.symbols" tree).
+ *
+ * More specific bundles (en_GB) are enumerated before their parents (en_001, en, root):
+ * Only store a value if it is still missing, that is, it has not been overridden.
+ */
+struct DecFmtSymDataSink : public ResourceSink {
+
+    // Destination for data, modified via setters.
+    DecimalFormatSymbols& dfs;
+    // Boolean array of whether or not we have seen a particular symbol yet.
+    // Can't simpy check fSymbols because it is pre-populated with defaults.
+    UBool seenSymbol[DecimalFormatSymbols::kFormatSymbolCount];
+
+    // Constructor/Destructor
+    DecFmtSymDataSink(DecimalFormatSymbols& _dfs) : dfs(_dfs) {
+        uprv_memset(seenSymbol, FALSE, sizeof(seenSymbol));
+    }
+    virtual ~DecFmtSymDataSink();
+
+    virtual void put(const char *key, ResourceValue &value, UBool /*noFallback*/,
+            UErrorCode &errorCode) {
+        ResourceTable symbolsTable = value.getTable(errorCode);
+        if (U_FAILURE(errorCode)) { return; }
+        for (int32_t j = 0; symbolsTable.getKeyAndValue(j, key, value); ++j) {
+            for (int32_t i=0; i<DecimalFormatSymbols::kFormatSymbolCount; i++) {
+                if (gNumberElementKeys[i] != NULL && uprv_strcmp(key, gNumberElementKeys[i]) == 0) {
+                    if (!seenSymbol[i]) {
+                        seenSymbol[i] = TRUE;
+                        dfs.setSymbol(
+                            (DecimalFormatSymbols::ENumberFormatSymbol) i,
+                            value.getUnicodeString(errorCode));
+                        if (U_FAILURE(errorCode)) { return; }
+                    }
+                    break;
+                }
+            }
+        }
+    }
 
-    if (U_FAILURE(status)) {
-        if ( useLastResortData ) {
-            status = U_USING_DEFAULT_WARNING;
-            initialize();
+    // Returns true if all the symbols have been seen.
+    UBool seenAll() {
+        for (int32_t i=0; i<DecimalFormatSymbols::kFormatSymbolCount; i++) {
+            if (!seenSymbol[i]) {
+                return FALSE;
+            }
         }
-        return;
-    } else {
+        return TRUE;
+    }
 
-        // First initialize all the symbols to the fallbacks for anything we can't find
-        initialize();
-
-        //
-        // Next get the numbering system for this locale and set zero digit
-        // and the digit string based on the numbering system for the locale
-        //
-
-        NumberingSystem* ns = NumberingSystem::createInstance(loc,status);
-        if (U_SUCCESS(status) && ns->getRadix() == 10 && !ns->isAlgorithmic()) {
-            nsName = ns->getName();
-            UnicodeString digitString(ns->getDescription());
-            setSymbol(kZeroDigitSymbol,  digitString.tempSubString(0, 1), FALSE);
-            setSymbol(kOneDigitSymbol,   digitString.tempSubString(1, 1), FALSE);
-            setSymbol(kTwoDigitSymbol,   digitString.tempSubString(2, 1), FALSE);
-            setSymbol(kThreeDigitSymbol, digitString.tempSubString(3, 1), FALSE);
-            setSymbol(kFourDigitSymbol,  digitString.tempSubString(4, 1), FALSE);
-            setSymbol(kFiveDigitSymbol,  digitString.tempSubString(5, 1), FALSE);
-            setSymbol(kSixDigitSymbol,   digitString.tempSubString(6, 1), FALSE);
-            setSymbol(kSevenDigitSymbol, digitString.tempSubString(7, 1), FALSE);
-            setSymbol(kEightDigitSymbol, digitString.tempSubString(8, 1), FALSE);
-            setSymbol(kNineDigitSymbol,  digitString.tempSubString(9, 1), FALSE);
-        } else {
-            nsName = gLatn;
+    // If monetary decimal or grouping were not explicitly set, then set them to be the
+    // same as their non-monetary counterparts.
+    void resolveMissingMonetarySeparators(const UnicodeString* fSymbols) {
+        if (!seenSymbol[DecimalFormatSymbols::kMonetarySeparatorSymbol]) {
+            dfs.setSymbol(
+                DecimalFormatSymbols::kMonetarySeparatorSymbol,
+                fSymbols[DecimalFormatSymbols::kDecimalSeparatorSymbol]);
         }
-       
-        UBool isLatn = !uprv_strcmp(nsName,gLatn);
-
-        UErrorCode nlStatus = U_ZERO_ERROR;
-        UResourceBundle *nonLatnSymbols = NULL;
-        if ( !isLatn ) {
-            nonLatnSymbols = ures_getByKeyWithFallback(numberElementsRes, nsName, NULL, &nlStatus);
-            nonLatnSymbols = ures_getByKeyWithFallback(nonLatnSymbols, gSymbols, nonLatnSymbols, &nlStatus);
+        if (!seenSymbol[DecimalFormatSymbols::kMonetaryGroupingSeparatorSymbol]) {
+            dfs.setSymbol(
+                DecimalFormatSymbols::kMonetaryGroupingSeparatorSymbol,
+                fSymbols[DecimalFormatSymbols::kGroupingSeparatorSymbol]);
         }
+    }
+};
+
+struct CurrencySpacingSink : public ResourceSink {
+    DecimalFormatSymbols& dfs;
+    UBool hasBeforeCurrency;
+    UBool hasAfterCurrency;
+
+    CurrencySpacingSink(DecimalFormatSymbols& _dfs)
+        : dfs(_dfs), hasBeforeCurrency(FALSE), hasAfterCurrency(FALSE) {}
+    virtual ~CurrencySpacingSink();
+
+    virtual void put(const char *key, ResourceValue &value, UBool /*noFallback*/,
+            UErrorCode &errorCode) {
+        ResourceTable spacingTypesTable = value.getTable(errorCode);
+        for (int32_t i = 0; spacingTypesTable.getKeyAndValue(i, key, value); ++i) {
+            UBool beforeCurrency;
+            if (uprv_strcmp(key, gBeforeCurrencyTag) == 0) {
+                beforeCurrency = TRUE;
+                hasBeforeCurrency = TRUE;
+            } else if (uprv_strcmp(key, gAfterCurrencyTag) == 0) {
+                beforeCurrency = FALSE;
+                hasAfterCurrency = TRUE;
+            } else {
+                continue;
+            }
 
-        UResourceBundle *latnSymbols = ures_getByKeyWithFallback(numberElementsRes, gLatn, NULL, &status);
-        latnSymbols = ures_getByKeyWithFallback(latnSymbols, gSymbols, latnSymbols, &status);
-
-        UBool kMonetaryDecimalSet = FALSE;
-        UBool kMonetaryGroupingSet = FALSE;
-        for(int32_t i = 0; i<kFormatSymbolCount; i++) {
-            if ( gNumberElementKeys[i] != NULL ) {
-                UErrorCode localStatus = U_ZERO_ERROR;
-                if ( !isLatn ) {
-                    sym = ures_getStringByKeyWithFallback(nonLatnSymbols,gNumberElementKeys[i],&len,&localStatus);
-                    // If we can't find the symbol in the numbering system specific resources,
-                    // use the "latn" numbering system as the fallback.
-                    if ( U_FAILURE(localStatus) ) {
-                        localStatus = U_ZERO_ERROR;
-                        sym = ures_getStringByKeyWithFallback(latnSymbols,gNumberElementKeys[i],&len,&localStatus);
-                    }
+            ResourceTable patternsTable = value.getTable(errorCode);
+            for (int32_t j = 0; patternsTable.getKeyAndValue(j, key, value); ++j) {
+                UCurrencySpacing pattern;
+                if (uprv_strcmp(key, gCurrencyMatchTag) == 0) {
+                    pattern = UNUM_CURRENCY_MATCH;
+                } else if (uprv_strcmp(key, gCurrencySudMatchTag) == 0) {
+                    pattern = UNUM_CURRENCY_SURROUNDING_MATCH;
+                } else if (uprv_strcmp(key, gCurrencyInsertBtnTag) == 0) {
+                    pattern = UNUM_CURRENCY_INSERT;
                 } else {
-                        sym = ures_getStringByKeyWithFallback(latnSymbols,gNumberElementKeys[i],&len,&localStatus);
+                    continue;
                 }
 
-                if ( U_SUCCESS(localStatus) ) {
-                    setSymbol((ENumberFormatSymbol)i, UnicodeString(TRUE, sym, len));
-                    if ( i == kMonetarySeparatorSymbol ) {
-                        kMonetaryDecimalSet = TRUE;
-                    } else if ( i == kMonetaryGroupingSeparatorSymbol ) {
-                        kMonetaryGroupingSet = TRUE;
-                    }
+                const UnicodeString& current = dfs.getPatternForCurrencySpacing(
+                    pattern, beforeCurrency, errorCode);
+                if (current.isEmpty()) {
+                    dfs.setPatternForCurrencySpacing(
+                        pattern, beforeCurrency, value.getUnicodeString(errorCode));
                 }
             }
         }
+    }
 
-        ures_close(latnSymbols);
-        if ( !isLatn ) {
-            ures_close(nonLatnSymbols);
+    void resolveMissing() {
+        // For consistency with Java, this method overwrites everything with the defaults unless
+        // both beforeCurrency and afterCurrency were found in CLDR.
+        static const char* defaults[] = { "[:letter:]", "[:digit:]", " " };
+        if (!hasBeforeCurrency || !hasAfterCurrency) {
+            for (UBool beforeCurrency = 0; beforeCurrency <= TRUE; beforeCurrency++) {
+                for (int32_t pattern = 0; pattern < UNUM_CURRENCY_SPACING_COUNT; pattern++) {
+                    dfs.setPatternForCurrencySpacing((UCurrencySpacing)pattern,
+                        beforeCurrency, UnicodeString(defaults[pattern], -1, US_INV));
+                }
+            }
         }
+    }
+};
+
+// Virtual destructors must be defined out of line.
+DecFmtSymDataSink::~DecFmtSymDataSink() {}
+CurrencySpacingSink::~CurrencySpacingSink() {}
 
-        // If monetary decimal or grouping were not explicitly set, then set them to be the
-        // same as their non-monetary counterparts.
+} // namespace
 
-        if ( !kMonetaryDecimalSet ) {
-            setSymbol(kMonetarySeparatorSymbol,fSymbols[kDecimalSeparatorSymbol]);
+void
+DecimalFormatSymbols::initialize(const Locale& loc, UErrorCode& status,
+    UBool useLastResortData, const NumberingSystem* ns)
+{
+    if (U_FAILURE(status)) { return; }
+    *validLocale = *actualLocale = 0;
+
+    // First initialize all the symbols to the fallbacks for anything we can't find
+    initialize();
+
+    //
+    // Next get the numbering system for this locale and set zero digit
+    // and the digit string based on the numbering system for the locale
+    //
+    LocalPointer<NumberingSystem> nsLocal;
+    if (ns == nullptr) {
+        // Use the numbering system according to the locale.
+        // Save it into a LocalPointer so it gets cleaned up.
+        nsLocal.adoptInstead(NumberingSystem::createInstance(loc, status));
+        ns = nsLocal.getAlias();
+    }
+    const char *nsName;
+    if (U_SUCCESS(status) && ns->getRadix() == 10 && !ns->isAlgorithmic()) {
+        nsName = ns->getName();
+        UnicodeString digitString(ns->getDescription());
+        int32_t digitIndex = 0;
+        UChar32 digit = digitString.char32At(0);
+        fSymbols[kZeroDigitSymbol].setTo(digit);
+        for (int32_t i = kOneDigitSymbol; i <= kNineDigitSymbol; ++i) {
+            digitIndex += U16_LENGTH(digit);
+            digit = digitString.char32At(digitIndex);
+            fSymbols[i].setTo(digit);
         }
-        if ( !kMonetaryGroupingSet ) {
-            setSymbol(kMonetaryGroupingSeparatorSymbol,fSymbols[kGroupingSeparatorSymbol]);
+    } else {
+        nsName = gLatn;
+    }
+
+    // Open resource bundles
+    const char* locStr = loc.getName();
+    LocalUResourceBundlePointer resource(ures_open(NULL, locStr, &status));
+    LocalUResourceBundlePointer numberElementsRes(
+        ures_getByKeyWithFallback(resource.getAlias(), gNumberElements, NULL, &status));
+
+    if (U_FAILURE(status)) {
+        if ( useLastResortData ) {
+            status = U_USING_DEFAULT_WARNING;
+            initialize();
         }
+        return;
+    }
 
-        if (ns) {
-            delete ns;
+    // Set locale IDs
+    // TODO: Is there a way to do this without depending on the resource bundle instance?
+    U_LOCALE_BASED(locBased, *this);
+    locBased.setLocaleIDs(
+        ures_getLocaleByType(
+            numberElementsRes.getAlias(),
+            ULOC_VALID_LOCALE, &status),
+        ures_getLocaleByType(
+            numberElementsRes.getAlias(),
+            ULOC_ACTUAL_LOCALE, &status));
+
+    // Now load the rest of the data from the data sink.
+    // Start with loading this nsName if it is not Latin.
+    DecFmtSymDataSink sink(*this);
+    if (uprv_strcmp(nsName, gLatn) != 0) {
+        CharString path;
+        path.append(gNumberElements, status)
+            .append('/', status)
+            .append(nsName, status)
+            .append('/', status)
+            .append(gSymbols, status);
+        ures_getAllItemsWithFallback(resource.getAlias(), path.data(), sink, status);
+
+        // If no symbols exist for the given nsName and resource bundle, silently ignore
+        // and fall back to Latin.
+        if (status == U_MISSING_RESOURCE_ERROR) {
+            status = U_ZERO_ERROR;
+        } else if (U_FAILURE(status)) {
+            return;
         }
+    }
 
-        // Obtain currency data from the currency API.  This is strictly
-        // for backward compatibility; we don't use DecimalFormatSymbols
-        // for currency data anymore.
-        UErrorCode internalStatus = U_ZERO_ERROR; // don't propagate failures out
-        UChar curriso[4];
-        UnicodeString tempStr;
-        ucurr_forLocale(locStr, curriso, 4, &internalStatus);
+    // Continue with Latin if necessary.
+    if (!sink.seenAll()) {
+        ures_getAllItemsWithFallback(resource.getAlias(), gNumberElementsLatnSymbols, sink, status);
+        if (U_FAILURE(status)) { return; }
+    }
+
+    // Let the monetary number separators equal the default number separators if necessary.
+    sink.resolveMissingMonetarySeparators(fSymbols);
 
-        // Reuse numberElements[0] as a temporary buffer
+    // Resolve codePointZero
+    UChar32 tempCodePointZero;
+    for (int32_t i=0; i<=9; i++) {
+        const UnicodeString& stringDigit = getConstDigitSymbol(i);
+        if (stringDigit.countChar32() != 1) {
+            tempCodePointZero = -1;
+            break;
+        }
+        UChar32 cp = stringDigit.char32At(0);
+        if (i == 0) {
+            tempCodePointZero = cp;
+        } else if (cp != tempCodePointZero + i) {
+            tempCodePointZero = -1;
+            break;
+        }
+    }
+    fCodePointZero = tempCodePointZero;
+
+    // Obtain currency data from the currency API.  This is strictly
+    // for backward compatibility; we don't use DecimalFormatSymbols
+    // for currency data anymore.
+    UErrorCode internalStatus = U_ZERO_ERROR; // don't propagate failures out
+    UChar curriso[4];
+    UnicodeString tempStr;
+    int32_t currisoLength = ucurr_forLocale(locStr, curriso, UPRV_LENGTHOF(curriso), &internalStatus);
+    if (U_SUCCESS(internalStatus) && currisoLength == 3) {
         uprv_getStaticCurrencyName(curriso, locStr, tempStr, internalStatus);
         if (U_SUCCESS(internalStatus)) {
-            fSymbols[kIntlCurrencySymbol].setTo(curriso, -1);
+            fSymbols[kIntlCurrencySymbol].setTo(curriso, currisoLength);
             fSymbols[kCurrencySymbol] = tempStr;
         }
-        /* else use the default values. */
-
-        U_LOCALE_BASED(locBased, *this);
-        locBased.setLocaleIDs(ures_getLocaleByType(numberElementsRes,
-                              ULOC_VALID_LOCALE, &status),
-                              ures_getLocaleByType(numberElementsRes,
-                              ULOC_ACTUAL_LOCALE, &status));
-        
-        //load the currency data
-        UChar ucc[4]={0}; //Currency Codes are always 3 chars long
-        int32_t uccLen = 4;
-        const char* locName = loc.getName();
-        UErrorCode localStatus = U_ZERO_ERROR;
-        uccLen = ucurr_forLocale(locName, ucc, uccLen, &localStatus);
-
-        if(U_SUCCESS(localStatus) && uccLen > 0) {
-            char cc[4]={0};
-            u_UCharsToChars(ucc, cc, uccLen);
-            /* An explicit currency was requested */
-            UResourceBundle *currencyResource = ures_open(U_ICUDATA_CURR, locStr, &localStatus);
-            UResourceBundle *currency = ures_getByKeyWithFallback(currencyResource, "Currencies", NULL, &localStatus);
-            currency = ures_getByKeyWithFallback(currency, cc, currency, &localStatus);
-            if(U_SUCCESS(localStatus) && ures_getSize(currency)>2) { // the length is 3 if more data is present
-                currency = ures_getByIndex(currency, 2, currency, &localStatus);
-                int32_t currPatternLen = 0;
-                currPattern = ures_getStringByIndex(currency, (int32_t)0, &currPatternLen, &localStatus);
-                UnicodeString decimalSep = ures_getUnicodeStringByIndex(currency, (int32_t)1, &localStatus);
-                UnicodeString groupingSep = ures_getUnicodeStringByIndex(currency, (int32_t)2, &localStatus);
-                if(U_SUCCESS(localStatus)){
-                    fSymbols[kMonetaryGroupingSeparatorSymbol] = groupingSep;
-                    fSymbols[kMonetarySeparatorSymbol] = decimalSep;
-                    //pattern.setTo(TRUE, currPattern, currPatternLen);
-                    status = localStatus;
-                }
-            }
-            ures_close(currency);
-            ures_close(currencyResource);
-            /* else An explicit currency was requested and is unknown or locale data is malformed. */
-            /* ucurr_* API will get the correct value later on. */
-        }
-            // else ignore the error if no currency
-
-        // Currency Spacing.
-        localStatus = U_ZERO_ERROR;
-        UResourceBundle *currencyResource = ures_open(U_ICUDATA_CURR, locStr, &localStatus);
-        UResourceBundle *currencySpcRes = ures_getByKeyWithFallback(currencyResource,
-                                           gCurrencySpacingTag, NULL, &localStatus);
-
-        if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
-            const char* keywords[UNUM_CURRENCY_SPACING_COUNT] = {
-                gCurrencyMatchTag, gCurrencySudMatchTag, gCurrencyInsertBtnTag
-            };
-            localStatus = U_ZERO_ERROR;
-            UResourceBundle *dataRes = ures_getByKeyWithFallback(currencySpcRes,
-                                       gBeforeCurrencyTag, NULL, &localStatus);
-            if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
-                localStatus = U_ZERO_ERROR;
-                for (int32_t i = 0; i < UNUM_CURRENCY_SPACING_COUNT; i++) {
-                  currencySpcBeforeSym[i] = ures_getUnicodeStringByKey(dataRes, keywords[i], &localStatus);
-                }
-                ures_close(dataRes);
-            }
-            dataRes = ures_getByKeyWithFallback(currencySpcRes,
-                                      gAfterCurrencyTag, NULL, &localStatus);
-            if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
-                localStatus = U_ZERO_ERROR;
-                for (int32_t i = 0; i < UNUM_CURRENCY_SPACING_COUNT; i++) {
-                  currencySpcAfterSym[i] = ures_getUnicodeStringByKey(dataRes, keywords[i], &localStatus);
-                }
-                ures_close(dataRes);
+    }
+    /* else use the default values. */
+
+    //load the currency data
+    UChar ucc[4]={0}; //Currency Codes are always 3 chars long
+    int32_t uccLen = 4;
+    const char* locName = loc.getName();
+    UErrorCode localStatus = U_ZERO_ERROR;
+    uccLen = ucurr_forLocale(locName, ucc, uccLen, &localStatus);
+
+    // TODO: Currency pattern data loading is duplicated in number_formatimpl.cpp
+    if(U_SUCCESS(localStatus) && uccLen > 0) {
+        char cc[4]={0};
+        u_UCharsToChars(ucc, cc, uccLen);
+        /* An explicit currency was requested */
+        LocalUResourceBundlePointer currencyResource(ures_open(U_ICUDATA_CURR, locStr, &localStatus));
+        LocalUResourceBundlePointer currency(
+            ures_getByKeyWithFallback(currencyResource.getAlias(), "Currencies", NULL, &localStatus));
+        ures_getByKeyWithFallback(currency.getAlias(), cc, currency.getAlias(), &localStatus);
+        if(U_SUCCESS(localStatus) && ures_getSize(currency.getAlias())>2) { // the length is 3 if more data is present
+            ures_getByIndex(currency.getAlias(), 2, currency.getAlias(), &localStatus);
+            int32_t currPatternLen = 0;
+            currPattern =
+                ures_getStringByIndex(currency.getAlias(), (int32_t)0, &currPatternLen, &localStatus);
+            UnicodeString decimalSep =
+                ures_getUnicodeStringByIndex(currency.getAlias(), (int32_t)1, &localStatus);
+            UnicodeString groupingSep =
+                ures_getUnicodeStringByIndex(currency.getAlias(), (int32_t)2, &localStatus);
+            if(U_SUCCESS(localStatus)){
+                fSymbols[kMonetaryGroupingSeparatorSymbol] = groupingSep;
+                fSymbols[kMonetarySeparatorSymbol] = decimalSep;
+                //pattern.setTo(TRUE, currPattern, currPatternLen);
+                status = localStatus;
             }
-            ures_close(currencySpcRes);
-            ures_close(currencyResource);
         }
+        /* else An explicit currency was requested and is unknown or locale data is malformed. */
+        /* ucurr_* API will get the correct value later on. */
     }
-    ures_close(resource);
-    ures_close(numberElementsRes);
-
+        // else ignore the error if no currency
+
+    // Currency Spacing.
+    LocalUResourceBundlePointer currencyResource(ures_open(U_ICUDATA_CURR, locStr, &status));
+    CurrencySpacingSink currencySink(*this);
+    ures_getAllItemsWithFallback(currencyResource.getAlias(), gCurrencySpacingTag, currencySink, status);
+    currencySink.resolveMissing();
+    if (U_FAILURE(status)) { return; }
 }
 
 void
@@ -408,6 +548,12 @@ DecimalFormatSymbols::initialize() {
     fSymbols[kNaNSymbol] = (UChar)0xfffd;               // SUB NaN
     fSymbols[kSignificantDigitSymbol] = (UChar)0x0040;  // '@' significant digit
     fSymbols[kMonetaryGroupingSeparatorSymbol].remove(); // 
+    fSymbols[kExponentMultiplicationSymbol] = (UChar)0xd7; // 'x' multiplication symbol for exponents
+    fIsCustomCurrencySymbol = FALSE; 
+    fIsCustomIntlCurrencySymbol = FALSE;
+    fCodePointZero = 0x30;
+    U_ASSERT(fCodePointZero == fSymbols[kZeroDigitSymbol].char32At(0));
+
 }
 
 Locale