/*
*******************************************************************************
-* Copyright (C) 1997-2003, International Business Machines Corporation and *
+* Copyright (C) 1997-2008, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*
* 03/18/97 clhuang Implemented with C++ APIs.
* 03/27/97 helena Updated to pass the simple test after code review.
* 08/26/97 aliu Added currency/intl currency symbol support.
-* 07/20/98 stephen Slightly modified initialization of monetarySeparator
+* 07/20/98 stephen Slightly modified initialization of monetarySeparator
********************************************************************************
*/
#if !UCONFIG_NO_FORMATTING
#include "unicode/dcfmtsym.h"
-#include "unicode/resbund.h"
+#include "unicode/ures.h"
#include "unicode/decimfmt.h"
#include "unicode/ucurr.h"
#include "unicode/choicfmt.h"
-
+#include "ucurrimp.h"
+#include "cstring.h"
+#include "locbased.h"
+#include "uresimp.h"
// *****************************************************************************
// class DecimalFormatSymbols
// *****************************************************************************
U_NAMESPACE_BEGIN
-const char DecimalFormatSymbols::fgClassID=0;
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(DecimalFormatSymbols)
-const char DecimalFormatSymbols::fgNumberElements[] = "NumberElements";
+static const char gNumberElements[] = "NumberElements";
static const UChar INTL_CURRENCY_SYMBOL_STR[] = {0xa4, 0xa4, 0};
// Initializes this with the decimal format symbols in the default locale.
DecimalFormatSymbols::DecimalFormatSymbols(UErrorCode& status)
- : UObject()
+ : UObject(),
+ locale()
{
- initialize(Locale::getDefault(), status, TRUE);
+ initialize(locale, status, TRUE);
}
// -------------------------------------
// Initializes this with the decimal format symbols in the desired locale.
DecimalFormatSymbols::DecimalFormatSymbols(const Locale& loc, UErrorCode& status)
- : UObject()
+ : UObject(),
+ locale(loc)
{
- initialize(loc, status);
+ initialize(locale, status);
}
// -------------------------------------
DecimalFormatSymbols::DecimalFormatSymbols(const DecimalFormatSymbols &source)
: UObject(source)
{
- int i;
- for(i = 0; i < (int)kFormatSymbolCount; ++i) {
- // fastCopyFrom is safe, see docs on fSymbols
- fSymbols[(ENumberFormatSymbol)i].fastCopyFrom(source.fSymbols[(ENumberFormatSymbol)i]);
- }
+ *this = source;
}
// -------------------------------------
DecimalFormatSymbols&
DecimalFormatSymbols::operator=(const DecimalFormatSymbols& rhs)
{
- if (this != &rhs)
- {
- int i;
- for(i = 0; i < (int)kFormatSymbolCount; ++i) {
+ if (this != &rhs) {
+ for(int32_t i = 0; i < (int32_t)kFormatSymbolCount; ++i) {
// fastCopyFrom is safe, see docs on fSymbols
fSymbols[(ENumberFormatSymbol)i].fastCopyFrom(rhs.fSymbols[(ENumberFormatSymbol)i]);
}
+ locale = rhs.locale;
+ uprv_strcpy(validLocale, rhs.validLocale);
+ uprv_strcpy(actualLocale, rhs.actualLocale);
}
return *this;
}
if (this == &that) {
return TRUE;
}
-
- int i;
- for(i = 0; i < (int)kFormatSymbolCount; ++i) {
+ for(int32_t i = 0; i < (int32_t)kFormatSymbolCount; ++i) {
if(fSymbols[(ENumberFormatSymbol)i] != that.fSymbols[(ENumberFormatSymbol)i]) {
return FALSE;
}
}
- return TRUE;
+ return locale == that.locale &&
+ uprv_strcmp(validLocale, that.validLocale) == 0 &&
+ uprv_strcmp(actualLocale, that.actualLocale) == 0;
}
// -------------------------------------
DecimalFormatSymbols::initialize(const Locale& loc, UErrorCode& status,
UBool useLastResortData)
{
- if (U_FAILURE(status)) return;
-
- this->locale = loc;
-
- ResourceBundle resource((char *)0, loc, status);
+ *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_getByKey(resource, gNumberElements, NULL, &status);
if (U_FAILURE(status))
{
// Initializes with last resort data if necessary.
status = U_USING_FALLBACK_WARNING;
initialize();
}
- return;
}
+ else {
+ // Gets the number element array.
+ int32_t numberElementsLength = ures_getSize(numberElementsRes);
- // Gets the number element array.
- int32_t i = 0;
- ResourceBundle numberElementsRes = resource.get(fgNumberElements, status);
- int32_t numberElementsLength = numberElementsRes.getSize();
-
- // If the array size is too small, something is wrong with the resource
- // bundle, returns the failure error code.
- if (numberElementsLength < 11) {
- status = U_INVALID_FORMAT_ERROR;
- return;
- }
-
- UnicodeString numberElements[kFormatSymbolCount];
- for(i = 0; i<numberElementsLength; i++) {
- numberElements[i].fastCopyFrom(numberElementsRes.getStringEx(i, status));
- }
+ if (numberElementsLength > (int32_t)kFormatSymbolCount) {
+ /* Warning: Invalid format. Array too large. */
+ numberElementsLength = (int32_t)kFormatSymbolCount;
+ }
+ // If the array size is too small, something is wrong with the resource
+ // bundle, returns the failure error code.
+ if (numberElementsLength != 12 || U_FAILURE(status)) {
+ status = U_INVALID_FORMAT_ERROR;
+ }
+ else {
+ const UChar *numberElements[kFormatSymbolCount];
+ int32_t numberElementsStrLen[kFormatSymbolCount];
+ int32_t i = 0;
+ for(i = 0; i<numberElementsLength; i++) {
+ numberElements[i] = ures_getStringByIndex(numberElementsRes, i, &numberElementsStrLen[i], &status);
+ }
- if (U_FAILURE(status)) {
- return;
- }
+ if (U_SUCCESS(status)) {
+ initialize(numberElements, numberElementsStrLen, numberElementsLength);
+
+ // 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);
+
+ // Reuse numberElements[0] as a temporary buffer
+ uprv_getStaticCurrencyName(curriso, locStr, tempStr, internalStatus);
+ if (U_SUCCESS(internalStatus)) {
+ fSymbols[kIntlCurrencySymbol] = curriso;
+ fSymbols[kCurrencySymbol] = tempStr;
+ }
+ /* else use the default values. */
+ }
- initialize(numberElements, numberElementsLength);
-
-
- // Obtain currency data from the currency API. This is strictly
- // for backward compatibility; we don't use DecimalFormatSymbols
- // for currency data anymore.
- UErrorCode ec = U_ZERO_ERROR; // don't propagate failures out
- const char* l = loc.getName();
- const UChar* curriso = ucurr_forLocale(l, &ec);
- UBool isChoiceFormat;
- int32_t len;
- const UChar* currname = ucurr_getName(curriso, l, UCURR_SYMBOL_NAME,
- &isChoiceFormat, &len, &ec);
- if (U_SUCCESS(ec)) {
- fSymbols[kIntlCurrencySymbol] = curriso;
-
- // If this is a ChoiceFormat currency, then format an
- // arbitrary value; pick something != 1; more common.
- fSymbols[kCurrencySymbol].truncate(0);
- if (isChoiceFormat) {
- ChoiceFormat f(currname, ec);
- if (U_SUCCESS(ec)) {
- f.format(2.0, fSymbols[kCurrencySymbol]);
- } else {
- fSymbols[kCurrencySymbol] = fSymbols[kIntlCurrencySymbol];
+ 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 *currency = ures_getByKeyWithFallback(resource, "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_getStringByIndex(currency, (int32_t)1, NULL, &localStatus);
+ UnicodeString groupingSep = ures_getStringByIndex(currency, (int32_t)2, NULL, &localStatus);
+ if(U_SUCCESS(localStatus)){
+ fSymbols[kMonetaryGroupingSeparatorSymbol] = groupingSep;
+ fSymbols[kMonetarySeparatorSymbol] = decimalSep;
+ //pattern.setTo(TRUE, currPattern, currPatternLen);
+ status = localStatus;
+ }
}
- } else {
- fSymbols[kCurrencySymbol] = UnicodeString(currname);
+ ures_close(currency);
+ /* 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
}
- /* else use the default values. */
+ ures_close(resource);
+ ures_close(numberElementsRes);
}
// Initializes the DecimalFormatSymbol instance with the data obtained
// from ResourceBundle in the desired locale.
void
-DecimalFormatSymbols::initialize(const UnicodeString* numberElements, int32_t numberElementsLength)
+DecimalFormatSymbols::initialize(const UChar** numberElements, int32_t *numberElementsStrLen, int32_t numberElementsLength)
{
- fSymbols[kDecimalSeparatorSymbol].fastCopyFrom(numberElements[0]);
- fSymbols[kGroupingSeparatorSymbol].fastCopyFrom(numberElements[1]);
- fSymbols[kPatternSeparatorSymbol].fastCopyFrom(numberElements[2]);
- fSymbols[kPercentSymbol].fastCopyFrom(numberElements[3]);
- fSymbols[kZeroDigitSymbol].fastCopyFrom(numberElements[4]);
- fSymbols[kDigitSymbol].fastCopyFrom(numberElements[5]);
- fSymbols[kMinusSignSymbol].fastCopyFrom(numberElements[6]);
- fSymbols[kPlusSignSymbol] = (UChar)0x002b; // '+' Hard coded for now; get from resource later
- fSymbols[kExponentialSymbol].fastCopyFrom(numberElements[7]);
- fSymbols[kPerMillSymbol].fastCopyFrom(numberElements[8]);
- fSymbols[kPadEscapeSymbol] = (UChar)0x002a; // '*' Hard coded for now; get from resource later
- fSymbols[kInfinitySymbol].fastCopyFrom(numberElements[9]);
- fSymbols[kNaNSymbol].fastCopyFrom(numberElements[10]);
-
- // If there is a currency decimal, use it.
- fSymbols[kMonetarySeparatorSymbol].fastCopyFrom(numberElements[numberElementsLength >= 12 ? 11 : 0]);
+ static const int8_t TYPE_MAPPING[][2] = {
+ {kDecimalSeparatorSymbol, 0},
+ {kGroupingSeparatorSymbol, 1},
+ {kPatternSeparatorSymbol, 2},
+ {kPercentSymbol, 3},
+ {kZeroDigitSymbol, 4},
+ {kDigitSymbol, 5},
+ {kMinusSignSymbol, 6},
+ {kExponentialSymbol, 7},
+ {kPerMillSymbol, 8},
+ {kInfinitySymbol, 9},
+ {kNaNSymbol, 10},
+ {kPlusSignSymbol, 11},
+ {kMonetarySeparatorSymbol, 0}
+ };
+ int32_t idx;
+
+ for (idx = 0; idx < (int32_t)(sizeof(TYPE_MAPPING)/sizeof(TYPE_MAPPING[0])); idx++) {
+ if (TYPE_MAPPING[idx][1] < numberElementsLength) {
+ fSymbols[TYPE_MAPPING[idx][0]].setTo(TRUE, numberElements[TYPE_MAPPING[idx][1]], numberElementsStrLen[TYPE_MAPPING[idx][1]]);
+ }
+ }
// Default values until it's set later on.
fSymbols[kCurrencySymbol] = (UChar)0xa4; // 'OX' currency symbol
fSymbols[kIntlCurrencySymbol] = INTL_CURRENCY_SYMBOL_STR;
+ // TODO: read from locale data, if this makes it into CLDR
+ fSymbols[kSignificantDigitSymbol] = (UChar)0x0040; // '@' significant digit
+ fSymbols[kPadEscapeSymbol] = (UChar)0x002a; // TODO: '*' Hard coded for now; get from resource later
+ fSymbols[kMonetaryGroupingSeparatorSymbol] = fSymbols[kGroupingSeparatorSymbol];
}
// initialize with default values
fSymbols[kPercentSymbol] = (UChar)0x25; // '%' percent sign
fSymbols[kZeroDigitSymbol] = (UChar)0x30; // '0' native 0 digit
fSymbols[kDigitSymbol] = (UChar)0x23; // '#' pattern digit
- fSymbols[kMinusSignSymbol] = (UChar)0x2d; // '-' minus sign
fSymbols[kPlusSignSymbol] = (UChar)0x002b; // '+' plus sign
+ fSymbols[kMinusSignSymbol] = (UChar)0x2d; // '-' minus sign
fSymbols[kCurrencySymbol] = (UChar)0xa4; // 'OX' currency symbol
fSymbols[kIntlCurrencySymbol] = INTL_CURRENCY_SYMBOL_STR;
fSymbols[kMonetarySeparatorSymbol] = (UChar)0x2e; // '.' monetary decimal separator
fSymbols[kPadEscapeSymbol] = (UChar)0x2a; // '*' pad escape symbol
fSymbols[kInfinitySymbol] = (UChar)0x221e; // 'oo' infinite
fSymbols[kNaNSymbol] = (UChar)0xfffd; // SUB NaN
+ fSymbols[kSignificantDigitSymbol] = (UChar)0x0040; // '@' significant digit
+}
+
+Locale
+DecimalFormatSymbols::getLocale(ULocDataLocaleType type, UErrorCode& status) const {
+ U_LOCALE_BASED(locBased, *this);
+ return locBased.getLocale(type, status);
}
U_NAMESPACE_END
projects / apple / icu.git / blobdiff