ICU 56 update step 1

source/i18n/identifier_info.cpp

 /*
 **********************************************************************
 *   Copyright (C) 2012-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 */
 
 #include "unicode/utypes.h"
 
 #include "unicode/uchar.h"
@@ skipping 149 matching lines @@
             }
             break;
         }
     }
     // Now make a final pass through ScriptSetSet to remove alternates that came before singles.
     // [Kana], [Kana Hira] => [Kana]
     // This is relatively infrequent, so doesn't have to be optimized.
     // We also compute any commonalities among the alternates.
     if (uhash_count(fScriptSetSet) > 0) {
         fCommonAmongAlternates->setAll();
-        for (int32_t it = -1;;) {
+        for (int32_t it = UHASH_FIRST;;) {
             const UHashElement *nextHashEl = uhash_nextElement(fScriptSetSet, &it);
             if (nextHashEl == NULL) {
                 break;
             }
             ScriptSet *next = static_cast<ScriptSet *>(nextHashEl->key.pointer);
             // [Kana], [Kana Hira] => [Kana]
             if (fRequiredScripts->intersects(*next)) {
                 uhash_removeElement(fScriptSetSet, nextHashEl);
             } else {
                 fCommonAmongAlternates->intersect(*next);
                 // [[Arab Syrc Thaa]; [Arab Syrc]] => [[Arab Syrc]]
-                for (int32_t otherIt = -1;;) {
+                for (int32_t otherIt = UHASH_FIRST;;) {
                     const UHashElement *otherHashEl = uhash_nextElement(fScriptSetSet, &otherIt);
                     if (otherHashEl == NULL) {
                         break;
                     }
                     ScriptSet *other = static_cast<ScriptSet *>(otherHashEl->key.pointer);
                     if (next != other && next->contains(*other)) {
                         uhash_removeElement(fScriptSetSet, nextHashEl);
                         break;
                     }
                 }
@@ skipping 69 matching lines @@
             (fCommonAmongAlternates->countMembers() == 0 ? uhash_count(fScriptSetSet) : 1);
     return count;
 }
     
 
 
 UBool IdentifierInfo::containsWithAlternates(const ScriptSet &container, const ScriptSet &containee) const {
     if (!container.contains(containee)) {
         return FALSE;
     }
-    for (int32_t iter = -1; ;) {
+    for (int32_t iter = UHASH_FIRST; ;) {
         const UHashElement *hashEl = uhash_nextElement(fScriptSetSet, &iter);
         if (hashEl == NULL) {
             break;
         }
         ScriptSet *alternatives = static_cast<ScriptSet *>(hashEl->key.pointer);
         if (!container.intersects(*alternatives)) {
             return false;
         }
     }
     return true;
 }
 
 UnicodeString &IdentifierInfo::displayAlternates(UnicodeString &dest, const UHashtable *alternates, UErrorCode &status) {
     UVector sorted(status);
     if (U_FAILURE(status)) {
         return dest;
     }
-    for (int32_t pos = -1; ;) {
+    for (int32_t pos = UHASH_FIRST; ;) {
         const UHashElement *el = uhash_nextElement(alternates, &pos);
         if (el == NULL) {
             break;
         }
         ScriptSet *ss = static_cast<ScriptSet *>(el->key.pointer);
         sorted.addElement(ss, status);
     }
     sorted.sort(uhash_compareScriptSet, status);
     UnicodeString separator = UNICODE_STRING_SIMPLE("; ");
     for (int32_t i=0; i<sorted.size(); i++) {
         if (i>0) {
             dest.append(separator);
         }
         ScriptSet *ss = static_cast<ScriptSet *>(sorted.elementAt(i));
         ss->displayScripts(dest);
     }
     return dest;
 }
 
 U_NAMESPACE_END