ICU 56 update step 1

source/i18n/uspoof_conf.cpp

 /*
 ******************************************************************************
 *
-*   Copyright (C) 2008-2013, International Business Machines
+*   Copyright (C) 2008-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *   file name:  uspoof_conf.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2009Jan05  (refactoring earlier files)
 *   created by: Andy Heninger
@@ skipping 278 matching lines @@
         // Put the map (value) string into the string pool
         // This a little like a Java intern() - any duplicates will be eliminated.
         SPUString *smapString = stringPool->addString(mapString, status);
 
         // Add the UChar32 -> string mapping to the appropriate table.
         UHashtable *table = uregex_start(fParseLine, 3, &status) >= 0 ? fSLTable :
                             uregex_start(fParseLine, 4, &status) >= 0 ? fSATable :
                             uregex_start(fParseLine, 5, &status) >= 0 ? fMLTable :
                             uregex_start(fParseLine, 6, &status) >= 0 ? fMATable :
                             NULL;
-        U_ASSERT(table != NULL);
-        uhash_iput(table, keyChar, smapString, &status);
+        if (U_SUCCESS(status) && table == NULL) {
+            status = U_PARSE_ERROR;
+        }
+        if (U_FAILURE(status)) {
+            return;
+        }
+
+        // For Unicode 8, the SL, SA and ML tables have been discontinued.
+        //                All input data from confusables.txt is tagged MA.
+        //                ICU spoof check functions should ignore the specified table and always
+        //                use this MA Data.
+        //                For now, implement by populating the MA data into all four tables, and
+        //                keep the multiple table implementation in place, in case it comes back
+        //                at some time in the future.
+        //                There is no run time size penalty to keeping the four table implementation -
+        //                the data is shared when it's the same betweeen tables.
+        if (table != fMATable) {
+            status = U_PARSE_ERROR;
+            return;
+        };
+        //  uhash_iput(table, keyChar, smapString, &status);
+        uhash_iput(fSLTable, keyChar, smapString, &status);
+        uhash_iput(fSATable, keyChar, smapString, &status);
+        uhash_iput(fMLTable, keyChar, smapString, &status);
+        uhash_iput(fMATable, keyChar, smapString, &status);
         fKeySet->add(keyChar);
         if (U_FAILURE(status)) {
             return;
         }
     }
 
     // Input data is now all parsed and collected.
     // Now create the run-time binary form of the data.
     //
     // This is done in two steps.  First the data is assembled into vectors and strings,
@@ skipping 281 matching lines @@
         return UnicodeString(*fStringTable, value, length);
       default:
         U_ASSERT(FALSE);
     }
     return UnicodeString();
 }
 
 #endif
 #endif // !UCONFIG_NO_REGULAR_EXPRESSIONS