ICU 56 update step 1

source/i18n/collationruleparser.cpp

 /*
 *******************************************************************************
-* Copyright (C) 2013-2014, International Business Machines
+* Copyright (C) 2013-2015, International Business Machines
 * Corporation and others.  All Rights Reserved.
 *******************************************************************************
 * collationruleparser.cpp
 *
 * (replaced the former ucol_tok.cpp)
 *
 * created on: 2013apr10
 * created by: Markus W. Scherer
 */
 
@@ skipping 685 matching lines @@
         if(U_FAILURE(errorCode)) { return; }
         int32_t code = getReorderCode(word.data());
         if(code < 0) {
             setParseError("unknown script or reorder code", errorCode);
             return;
         }
         reorderCodes.addElement(code, errorCode);
         if(U_FAILURE(errorCode)) { return; }
         i = limit;
     }
-    int32_t length = reorderCodes.size();
-    if(length == 1 && reorderCodes.elementAti(0) == UCOL_REORDER_CODE_NONE) {
-        settings->resetReordering();
-        return;
-    }
-    uint8_t table[256];
-    baseData->makeReorderTable(reorderCodes.getBuffer(), length, table, errorCode);
-    if(U_FAILURE(errorCode)) { return; }
-    if(!settings->setReordering(reorderCodes.getBuffer(), length, table)) {
-        errorCode = U_MEMORY_ALLOCATION_ERROR;
-    }
+    settings->setReordering(*baseData, reorderCodes.getBuffer(), reorderCodes.size(), errorCode);
 }
 
 static const char *const gSpecialReorderCodes[] = {
     "space", "punct", "symbol", "currency", "digit"
 };
 
 int32_t
 CollationRuleParser::getReorderCode(const char *word) {
     for(int32_t i = 0; i < UPRV_LENGTHOF(gSpecialReorderCodes); ++i) {
         if(uprv_stricmp(word, gSpecialReorderCodes[i]) == 0) {
@@ skipping 147 matching lines @@
 CollationRuleParser::skipWhiteSpace(int32_t i) const {
     while(i < rules->length() && PatternProps::isWhiteSpace(rules->charAt(i))) {
         ++i;
     }
     return i;
 }
 
 U_NAMESPACE_END
 
 #endif  // !UCONFIG_NO_COLLATION