ICU 56 update step 1

source/i18n/numsys.cpp

 /*
 *******************************************************************************
-* Copyright (C) 2010-2013, International Business Machines Corporation and
+* Copyright (C) 2010-2015, International Business Machines Corporation and
 * others. All Rights Reserved.
 *******************************************************************************
 *
 *
 * File NUMSYS.CPP
 *
 * Modification History:*
 *   Date        Name        Description
 *
 ********************************************************************************
@@ skipping 64 matching lines @@
     if (U_FAILURE(status)) {
         return NULL;
     }
 
     if ( radix_in < 2 ) {
         status = U_ILLEGAL_ARGUMENT_ERROR;
         return NULL;
     }
 
     if ( !isAlgorithmic_in ) {
-       if ( desc_in.countChar32() != radix_in || !isValidDigitString(desc_in)) {
+       if ( desc_in.countChar32() != radix_in ) {
            status = U_ILLEGAL_ARGUMENT_ERROR;
            return NULL;
        }
     }
 
     NumberingSystem *ns = new NumberingSystem();
 
     ns->setRadix(radix_in);
     ns->setDesc(desc_in);
     ns->setAlgorithmic(isAlgorithmic_in);
@@ skipping 138 matching lines @@
     } else {
         uprv_strncpy(name,n,NUMSYS_NAME_CAPACITY);
         name[NUMSYS_NAME_CAPACITY] = (char)0; // Make sure it is null terminated.
     }
 }
 UBool NumberingSystem::isAlgorithmic() const {
     return ( algorithmic );
 }
 
 StringEnumeration* NumberingSystem::getAvailableNames(UErrorCode &status) {
-
+    // TODO(ticket #11908): Init-once static cache, with u_cleanup() callback.
     static StringEnumeration* availableNames = NULL;
 
     if (U_FAILURE(status)) {
         return NULL;
     }
 
     if ( availableNames == NULL ) {
-        UVector *fNumsysNames = new UVector(uprv_deleteUObject, NULL, status);
+        // TODO: Simple array of UnicodeString objects, based on length of table resource?
+        LocalPointer<UVector> numsysNames(new UVector(uprv_deleteUObject, NULL, status), status);
         if (U_FAILURE(status)) {
-            status = U_MEMORY_ALLOCATION_ERROR;
             return NULL;
         }
         
         UErrorCode rbstatus = U_ZERO_ERROR;
         UResourceBundle *numberingSystemsInfo = ures_openDirect(NULL, "numberingSystems", &rbstatus);
         numberingSystemsInfo = ures_getByKey(numberingSystemsInfo,"numberingSystems",numberingSystemsInfo,&rbstatus);
         if(U_FAILURE(rbstatus)) {
             status = U_MISSING_RESOURCE_ERROR;
             ures_close(numberingSystemsInfo);
             return NULL;
         }
 
         while ( ures_hasNext(numberingSystemsInfo) ) {
             UResourceBundle *nsCurrent = ures_getNextResource(numberingSystemsInfo,NULL,&rbstatus);
             const char *nsName = ures_getKey(nsCurrent);
-            fNumsysNames->addElement(new UnicodeString(nsName, -1, US_INV),status);
+            numsysNames->addElement(new UnicodeString(nsName, -1, US_INV),status);
             ures_close(nsCurrent);
         }
 
         ures_close(numberingSystemsInfo);
-        availableNames = new NumsysNameEnumeration(fNumsysNames,status);
-
+        if (U_FAILURE(status)) {
+            return NULL;
+        }
+        availableNames = new NumsysNameEnumeration(numsysNames.getAlias(), status);
+        if (availableNames == NULL) {
+            status = U_MEMORY_ALLOCATION_ERROR;
+            return NULL;
+        }
+        numsysNames.orphan();  // The names got adopted.
     }
 
     return availableNames;
 }
 
-UBool NumberingSystem::isValidDigitString(const UnicodeString& str) {
-
-    StringCharacterIterator it(str);
-    UChar32 c;
-    int32_t i = 0;
-
-    for ( it.setToStart(); it.hasNext(); ) {
-       c = it.next32PostInc();
-       if ( c > 0xFFFF ) { // Digits outside the BMP are not currently supported
-          return FALSE;
-       }
-       i++;
-    }
-    return TRUE;   
-}
-
-NumsysNameEnumeration::NumsysNameEnumeration(UVector *fNameList, UErrorCode& /*status*/) {
+NumsysNameEnumeration::NumsysNameEnumeration(UVector *numsysNames, UErrorCode& /*status*/) {
     pos=0;
-    fNumsysNames = fNameList;
+    fNumsysNames = numsysNames;
 }
 
 const UnicodeString*
 NumsysNameEnumeration::snext(UErrorCode& status) {
     if (U_SUCCESS(status) && pos < fNumsysNames->size()) {
         return (const UnicodeString*)fNumsysNames->elementAt(pos++);
     }
     return NULL;
 }
 
 void
 NumsysNameEnumeration::reset(UErrorCode& /*status*/) {
     pos=0;
 }
 
 int32_t
 NumsysNameEnumeration::count(UErrorCode& /*status*/) const {
     return (fNumsysNames==NULL) ? 0 : fNumsysNames->size();
 }
 
 NumsysNameEnumeration::~NumsysNameEnumeration() {
     delete fNumsysNames;
 }
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 //eof