From e1311ed7d84e021c41bc31483d4bc48a3d0beab9 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Thu, 16 Jun 2005 21:05:01 +0000 Subject: [PATCH] ICU-3615 Redesign API based on comments. X-SVN-Rev: 17914 --- icu4c/source/i18n/ucurr.cpp | 529 +++++++++++++++--------------- icu4c/source/i18n/unicode/ucurr.h | 24 +- 2 files changed, 284 insertions(+), 269 deletions(-) diff --git a/icu4c/source/i18n/ucurr.cpp b/icu4c/source/i18n/ucurr.cpp index dc3a653cea..b880cc3397 100644 --- a/icu4c/source/i18n/ucurr.cpp +++ b/icu4c/source/i18n/ucurr.cpp @@ -737,274 +737,275 @@ static const struct CurrencyList { const char *currency; uint32_t currType; } gCurrencyList[] = { - {"ADP", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"AED", UCURR_CURRENCY}, - {"AFA", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"AFN", UCURR_CURRENCY}, - {"ALL", UCURR_CURRENCY}, - {"AMD", UCURR_CURRENCY}, - {"ANG", UCURR_CURRENCY}, - {"AOA", UCURR_CURRENCY}, - {"AOK", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"AON", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"AOR", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"ARA", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"ARP", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"ARS", UCURR_CURRENCY}, - {"ATS", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"AUD", UCURR_CURRENCY}, - {"AWG", UCURR_CURRENCY}, - {"AZM", UCURR_CURRENCY}, - {"BAD", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"BAM", UCURR_CURRENCY}, - {"BBD", UCURR_CURRENCY}, - {"BDT", UCURR_CURRENCY}, - {"BEC", UCURR_DEPRECATED}, - {"BEF", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"BEL", UCURR_DEPRECATED}, - {"BGL", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"BGN", UCURR_CURRENCY}, - {"BHD", UCURR_CURRENCY}, - {"BIF", UCURR_CURRENCY}, - {"BMD", UCURR_CURRENCY}, - {"BND", UCURR_CURRENCY}, - {"BOB", UCURR_CURRENCY}, - {"BOP", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"BOV", 0}, - {"BRB", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"BRC", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"BRE", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"BRL", UCURR_CURRENCY}, - {"BRN", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"BRR", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"BSD", UCURR_CURRENCY}, - {"BTN", UCURR_CURRENCY}, - {"BUK", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"BWP", UCURR_CURRENCY}, - {"BYB", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"BYR", UCURR_CURRENCY}, - {"BZD", UCURR_CURRENCY}, - {"CAD", UCURR_CURRENCY}, - {"CDF", UCURR_CURRENCY}, - {"CHE", 0}, - {"CHF", UCURR_CURRENCY}, - {"CHW", 0}, - {"CLF", 0}, - {"CLP", UCURR_CURRENCY}, - {"CNY", UCURR_CURRENCY}, - {"COP", UCURR_CURRENCY}, - {"COU", 0}, - {"CRC", UCURR_CURRENCY}, - {"CSD", UCURR_CURRENCY}, - {"CSK", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"CUP", UCURR_CURRENCY}, - {"CVE", UCURR_CURRENCY}, - {"CYP", UCURR_CURRENCY}, - {"CZK", UCURR_CURRENCY}, - {"DDM", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"DEM", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"DJF", UCURR_CURRENCY}, - {"DKK", UCURR_CURRENCY}, - {"DOP", UCURR_CURRENCY}, - {"DZD", UCURR_CURRENCY}, - {"ECS", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"ECV", UCURR_DEPRECATED}, - {"EEK", UCURR_CURRENCY}, - {"EGP", UCURR_CURRENCY}, - {"EQE", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"ERN", UCURR_CURRENCY}, - {"ESA", UCURR_DEPRECATED}, - {"ESB", UCURR_DEPRECATED}, - {"ESP", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"ETB", UCURR_CURRENCY}, - {"EUR", UCURR_CURRENCY}, - {"FIM", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"FJD", UCURR_CURRENCY}, - {"FKP", UCURR_CURRENCY}, - {"FRF", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"GBP", UCURR_CURRENCY}, - {"GEK", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"GEL", UCURR_CURRENCY}, - {"GHC", UCURR_CURRENCY}, - {"GIP", UCURR_CURRENCY}, - {"GMD", UCURR_CURRENCY}, - {"GNF", UCURR_CURRENCY}, - {"GNS", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"GQE", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"GRD", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"GTQ", UCURR_CURRENCY}, - {"GWE", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"GWP", UCURR_CURRENCY}, - {"GYD", UCURR_CURRENCY}, - {"HKD", UCURR_CURRENCY}, - {"HNL", UCURR_CURRENCY}, - {"HRD", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"HRK", UCURR_CURRENCY}, - {"HTG", UCURR_CURRENCY}, - {"HUF", UCURR_CURRENCY}, - {"IDR", UCURR_CURRENCY}, - {"IEP", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"ILP", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"ILS", UCURR_CURRENCY}, - {"INR", UCURR_CURRENCY}, - {"IQD", UCURR_CURRENCY}, - {"IRR", UCURR_CURRENCY}, - {"ISK", UCURR_CURRENCY}, - {"ITL", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"JMD", UCURR_CURRENCY}, - {"JOD", UCURR_CURRENCY}, - {"JPY", UCURR_CURRENCY}, - {"KES", UCURR_CURRENCY}, - {"KGS", UCURR_CURRENCY}, - {"KHR", UCURR_CURRENCY}, - {"KMF", UCURR_CURRENCY}, - {"KPW", UCURR_CURRENCY}, - {"KRW", UCURR_CURRENCY}, - {"KWD", UCURR_CURRENCY}, - {"KYD", UCURR_CURRENCY}, - {"KZT", UCURR_CURRENCY}, - {"LAK", UCURR_CURRENCY}, - {"LBP", UCURR_CURRENCY}, - {"LKR", UCURR_CURRENCY}, - {"LRD", UCURR_CURRENCY}, - {"LSL", UCURR_CURRENCY}, - {"LSM", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"LTL", UCURR_CURRENCY}, - {"LTT", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"LUC", UCURR_DEPRECATED}, - {"LUF", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"LUL", UCURR_DEPRECATED}, - {"LVL", UCURR_CURRENCY}, - {"LVR", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"LYD", UCURR_CURRENCY}, - {"MAD", UCURR_CURRENCY}, - {"MAF", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"MDL", UCURR_CURRENCY}, - {"MGA", UCURR_CURRENCY}, - {"MGF", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"MKD", UCURR_CURRENCY}, - {"MLF", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"MMK", UCURR_CURRENCY}, - {"MNT", UCURR_CURRENCY}, - {"MOP", UCURR_CURRENCY}, - {"MRO", UCURR_CURRENCY}, - {"MTL", UCURR_CURRENCY}, - {"MTP", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"MUR", UCURR_CURRENCY}, - {"MVR", UCURR_CURRENCY}, - {"MWK", UCURR_CURRENCY}, - {"MXN", UCURR_CURRENCY}, - {"MXP", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"MXV", 0}, - {"MYR", UCURR_CURRENCY}, - {"MZE", UCURR_CURRENCY}, - {"MZM", UCURR_CURRENCY}, - {"NAD", UCURR_CURRENCY}, - {"NGN", UCURR_CURRENCY}, - {"NIC", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"NIO", UCURR_CURRENCY}, - {"NLG", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"NOK", UCURR_CURRENCY}, - {"NPR", UCURR_CURRENCY}, - {"NZD", UCURR_CURRENCY}, - {"OMR", UCURR_CURRENCY}, - {"PAB", UCURR_CURRENCY}, - {"PEI", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"PEN", UCURR_CURRENCY}, - {"PES", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"PGK", UCURR_CURRENCY}, - {"PHP", UCURR_CURRENCY}, - {"PKR", UCURR_CURRENCY}, - {"PLN", UCURR_CURRENCY}, - {"PLZ", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"PTE", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"PYG", UCURR_CURRENCY}, - {"QAR", UCURR_CURRENCY}, - {"RHD", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"ROL", UCURR_CURRENCY}, - {"RUB", UCURR_CURRENCY}, - {"RUR", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"RWF", UCURR_CURRENCY}, - {"SAR", UCURR_CURRENCY}, - {"SBD", UCURR_CURRENCY}, - {"SCR", UCURR_CURRENCY}, - {"SDD", UCURR_CURRENCY}, - {"SDP", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"SEK", UCURR_CURRENCY}, - {"SGD", UCURR_CURRENCY}, - {"SHP", UCURR_CURRENCY}, - {"SIT", UCURR_CURRENCY}, - {"SKK", UCURR_CURRENCY}, - {"SLL", UCURR_CURRENCY}, - {"SOS", UCURR_CURRENCY}, - {"SRD", UCURR_CURRENCY}, - {"SRG", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"STD", UCURR_CURRENCY}, - {"SUR", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"SVC", UCURR_CURRENCY}, - {"SYP", UCURR_CURRENCY}, - {"SZL", UCURR_CURRENCY}, - {"THB", UCURR_CURRENCY}, - {"TJR", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"TJS", UCURR_CURRENCY}, - {"TMM", UCURR_CURRENCY}, - {"TND", UCURR_CURRENCY}, - {"TOP", UCURR_CURRENCY}, - {"TPE", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"TRL", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"TRY", UCURR_CURRENCY}, - {"TTD", UCURR_CURRENCY}, - {"TWD", UCURR_CURRENCY}, - {"TZS", UCURR_CURRENCY}, - {"UAH", UCURR_CURRENCY}, - {"UAK", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"UGS", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"UGX", UCURR_CURRENCY}, - {"USD", UCURR_CURRENCY}, - {"USN", 0}, - {"USS", 0}, - {"UYP", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"UYU", UCURR_CURRENCY}, - {"UZS", UCURR_CURRENCY}, - {"VEB", UCURR_CURRENCY}, - {"VND", UCURR_CURRENCY}, - {"VUV", UCURR_CURRENCY}, - {"WST", UCURR_CURRENCY}, - {"XAF", UCURR_CURRENCY}, - {"XAG", 0}, - {"XAU", 0}, - {"XBA", 0}, - {"XBB", 0}, - {"XBC", 0}, - {"XBD", 0}, - {"XCD", UCURR_CURRENCY}, - {"XDR", 0}, - {"XEU", UCURR_DEPRECATED}, - {"XFO", 0}, - {"XFU", 0}, - {"XOF", UCURR_CURRENCY}, - {"XPD", 0}, - {"XPF", UCURR_CURRENCY}, - {"XPT", 0}, - {"XRE", 0}, - {"XTS", 0}, - {"XXX", 0}, - {"YDD", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"YER", UCURR_CURRENCY}, - {"YUD", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"YUM", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"YUN", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"ZAL", 0}, - {"ZAR", UCURR_CURRENCY}, - {"ZMK", UCURR_CURRENCY}, - {"ZRN", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"ZRZ", UCURR_CURRENCY|UCURR_DEPRECATED}, - {"ZWD", UCURR_CURRENCY}, + {"ADP", UCURR_COMMON|UCURR_DEPRECATED}, + {"AED", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"AFA", UCURR_COMMON|UCURR_DEPRECATED}, + {"AFN", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"ALL", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"AMD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"ANG", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"AOA", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"AOK", UCURR_COMMON|UCURR_DEPRECATED}, + {"AON", UCURR_COMMON|UCURR_DEPRECATED}, + {"AOR", UCURR_COMMON|UCURR_DEPRECATED}, + {"ARA", UCURR_COMMON|UCURR_DEPRECATED}, + {"ARP", UCURR_COMMON|UCURR_DEPRECATED}, + {"ARS", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"ATS", UCURR_COMMON|UCURR_DEPRECATED}, + {"AUD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"AWG", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"AZM", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BAD", UCURR_COMMON|UCURR_DEPRECATED}, + {"BAM", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BBD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BDT", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BEC", UCURR_UNCOMMON|UCURR_DEPRECATED}, + {"BEF", UCURR_COMMON|UCURR_DEPRECATED}, + {"BEL", UCURR_UNCOMMON|UCURR_DEPRECATED}, + {"BGL", UCURR_COMMON|UCURR_DEPRECATED}, + {"BGN", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BHD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BIF", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BMD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BND", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BOB", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BOP", UCURR_COMMON|UCURR_DEPRECATED}, + {"BOV", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"BRB", UCURR_COMMON|UCURR_DEPRECATED}, + {"BRC", UCURR_COMMON|UCURR_DEPRECATED}, + {"BRE", UCURR_COMMON|UCURR_DEPRECATED}, + {"BRL", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BRN", UCURR_COMMON|UCURR_DEPRECATED}, + {"BRR", UCURR_COMMON|UCURR_DEPRECATED}, + {"BSD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BTN", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BUK", UCURR_COMMON|UCURR_DEPRECATED}, + {"BWP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BYB", UCURR_COMMON|UCURR_DEPRECATED}, + {"BYR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"BZD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"CAD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"CDF", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"CHE", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"CHF", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"CHW", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"CLF", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"CLP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"CNX", UCURR_COMMON|UCURR_DEPRECATED}, + {"CNY", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"COP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"COU", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"CRC", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"CSD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"CSK", UCURR_COMMON|UCURR_DEPRECATED}, + {"CUP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"CVE", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"CYP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"CZK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"DDM", UCURR_COMMON|UCURR_DEPRECATED}, + {"DEM", UCURR_COMMON|UCURR_DEPRECATED}, + {"DJF", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"DKK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"DOP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"DZD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"ECS", UCURR_COMMON|UCURR_DEPRECATED}, + {"ECV", UCURR_UNCOMMON|UCURR_DEPRECATED}, + {"EEK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"EGP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"EQE", UCURR_COMMON|UCURR_DEPRECATED}, + {"ERN", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"ESA", UCURR_UNCOMMON|UCURR_DEPRECATED}, + {"ESB", UCURR_UNCOMMON|UCURR_DEPRECATED}, + {"ESP", UCURR_COMMON|UCURR_DEPRECATED}, + {"ETB", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"EUR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"FIM", UCURR_COMMON|UCURR_DEPRECATED}, + {"FJD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"FKP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"FRF", UCURR_COMMON|UCURR_DEPRECATED}, + {"GBP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"GEK", UCURR_COMMON|UCURR_DEPRECATED}, + {"GEL", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"GHC", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"GIP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"GMD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"GNF", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"GNS", UCURR_COMMON|UCURR_DEPRECATED}, + {"GQE", UCURR_COMMON|UCURR_DEPRECATED}, + {"GRD", UCURR_COMMON|UCURR_DEPRECATED}, + {"GTQ", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"GWE", UCURR_COMMON|UCURR_DEPRECATED}, + {"GWP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"GYD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"HKD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"HNL", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"HRD", UCURR_COMMON|UCURR_DEPRECATED}, + {"HRK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"HTG", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"HUF", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"IDR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"IEP", UCURR_COMMON|UCURR_DEPRECATED}, + {"ILP", UCURR_COMMON|UCURR_DEPRECATED}, + {"ILS", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"INR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"IQD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"IRR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"ISK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"ITL", UCURR_COMMON|UCURR_DEPRECATED}, + {"JMD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"JOD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"JPY", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"KES", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"KGS", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"KHR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"KMF", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"KPW", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"KRW", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"KWD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"KYD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"KZT", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"LAK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"LBP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"LKR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"LRD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"LSL", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"LSM", UCURR_COMMON|UCURR_DEPRECATED}, + {"LTL", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"LTT", UCURR_COMMON|UCURR_DEPRECATED}, + {"LUC", UCURR_UNCOMMON|UCURR_DEPRECATED}, + {"LUF", UCURR_COMMON|UCURR_DEPRECATED}, + {"LUL", UCURR_UNCOMMON|UCURR_DEPRECATED}, + {"LVL", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"LVR", UCURR_COMMON|UCURR_DEPRECATED}, + {"LYD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MAD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MAF", UCURR_COMMON|UCURR_DEPRECATED}, + {"MDL", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MGA", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MGF", UCURR_COMMON|UCURR_DEPRECATED}, + {"MKD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MLF", UCURR_COMMON|UCURR_DEPRECATED}, + {"MMK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MNT", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MOP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MRO", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MTL", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MTP", UCURR_COMMON|UCURR_DEPRECATED}, + {"MUR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MVR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MWK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MXN", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MXP", UCURR_COMMON|UCURR_DEPRECATED}, + {"MXV", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"MYR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MZE", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"MZM", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"NAD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"NGN", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"NIC", UCURR_COMMON|UCURR_DEPRECATED}, + {"NIO", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"NLG", UCURR_COMMON|UCURR_DEPRECATED}, + {"NOK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"NPR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"NZD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"OMR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"PAB", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"PEI", UCURR_COMMON|UCURR_DEPRECATED}, + {"PEN", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"PES", UCURR_COMMON|UCURR_DEPRECATED}, + {"PGK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"PHP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"PKR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"PLN", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"PLZ", UCURR_COMMON|UCURR_DEPRECATED}, + {"PTE", UCURR_COMMON|UCURR_DEPRECATED}, + {"PYG", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"QAR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"RHD", UCURR_COMMON|UCURR_DEPRECATED}, + {"ROL", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"RUB", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"RUR", UCURR_COMMON|UCURR_DEPRECATED}, + {"RWF", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SAR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SBD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SCR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SDD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SDP", UCURR_COMMON|UCURR_DEPRECATED}, + {"SEK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SGD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SHP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SIT", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SKK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SLL", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SOS", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SRD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SRG", UCURR_COMMON|UCURR_DEPRECATED}, + {"STD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SUR", UCURR_COMMON|UCURR_DEPRECATED}, + {"SVC", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SYP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"SZL", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"THB", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"TJR", UCURR_COMMON|UCURR_DEPRECATED}, + {"TJS", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"TMM", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"TND", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"TOP", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"TPE", UCURR_COMMON|UCURR_DEPRECATED}, + {"TRL", UCURR_COMMON|UCURR_DEPRECATED}, + {"TRY", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"TTD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"TWD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"TZS", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"UAH", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"UAK", UCURR_COMMON|UCURR_DEPRECATED}, + {"UGS", UCURR_COMMON|UCURR_DEPRECATED}, + {"UGX", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"USD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"USN", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"USS", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"UYP", UCURR_COMMON|UCURR_DEPRECATED}, + {"UYU", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"UZS", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"VEB", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"VND", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"VUV", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"WST", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"XAF", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"XAG", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XAU", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XBA", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XBB", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XBC", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XBD", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XCD", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"XDR", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XEU", UCURR_UNCOMMON|UCURR_DEPRECATED}, + {"XFO", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XFU", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XOF", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"XPD", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XPF", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"XPT", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XRE", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XTS", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"XXX", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"YDD", UCURR_COMMON|UCURR_DEPRECATED}, + {"YER", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"YUD", UCURR_COMMON|UCURR_DEPRECATED}, + {"YUM", UCURR_COMMON|UCURR_DEPRECATED}, + {"YUN", UCURR_COMMON|UCURR_DEPRECATED}, + {"ZAL", UCURR_UNCOMMON|UCURR_NON_DEPRECATED}, + {"ZAR", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"ZMK", UCURR_COMMON|UCURR_NON_DEPRECATED}, + {"ZRN", UCURR_COMMON|UCURR_DEPRECATED}, + {"ZRZ", UCURR_COMMON|UCURR_DEPRECATED}, + {"ZWD", UCURR_COMMON|UCURR_NON_DEPRECATED}, { NULL, 0 } // Leave here to denote the end of the list. }; #define UCURR_MATCHES_BITMASK(variable, typeToMatch) \ - ((typeToMatch) == UCURR_ALL || (variable) == (typeToMatch)) + ((typeToMatch) == UCURR_ALL || ((variable) & (typeToMatch)) == (typeToMatch)) static int32_t U_CALLCONV ucurr_countCurrencyList(UEnumeration *enumerator, UErrorCode *pErrorCode) { diff --git a/icu4c/source/i18n/unicode/ucurr.h b/icu4c/source/i18n/unicode/ucurr.h index 348a90df7c..4b27d9f358 100644 --- a/icu4c/source/i18n/unicode/ucurr.h +++ b/icu4c/source/i18n/unicode/ucurr.h @@ -170,29 +170,43 @@ typedef enum UCurrCurrencyType { * Select all ISO-4217 currency codes. * @draft ICU 3.2 */ - UCURR_ALL = 0, + UCURR_ALL = INT32_MAX, /** - * Select only ISO-4217 currency codes. + * Select only ISO-4217 commonly used currency codes. * These currencies can be found in common use, and they usually have * bank notes or coins associated with the currency code. * This does not include fund codes, precious metals and other * various ISO-4217 codes limited to special financial products. * @draft ICU 3.2 */ - UCURR_CURRENCY = 1, + UCURR_COMMON = 1, + /** + * Select ISO-4217 uncommon currency codes. + * These codes respresent fund codes, precious metals and other + * various ISO-4217 codes limited to special financial products. + * A fund code is a monetary resource associated with a currency. + * @draft ICU 3.2 + */ + UCURR_UNCOMMON = 2, /** * Select only deprecated ISO-4217 codes. * These codes are no longer in general public use. * @draft ICU 3.2 */ - UCURR_DEPRECATED = 2 + UCURR_DEPRECATED = 4, + /** + * Select only non-deprecated ISO-4217 codes. + * These codes are in general public use. + * @draft ICU 3.2 + */ + UCURR_NON_DEPRECATED = 8 } UCurrCurrencyType; /** * Provides a UEnumeration object for listing ISO-4217 codes. * @param currType You can use one of several UCurrCurrencyType values for this * variable. You can also | (or) them together to get a specific list of - * currencies. Most people will want to use the UCURR_CURRENCY value to + * currencies. Most people will want to use the (UCURR_CURRENCY|UCURR_NON_DEPRECATED) value to * get a list of current currencies. * @param pErrorCode Error code * @draft ICU 3.2