ICU 56 update step 1

source/i18n/rulebasedcollator.cpp

 /*
 *******************************************************************************
-* Copyright (C) 1996-2014, International Business Machines
+* Copyright (C) 1996-2015, International Business Machines
 * Corporation and others.  All Rights Reserved.
 *******************************************************************************
 * rulebasedcollator.cpp
 *
 * (replaced the former tblcoll.cpp)
 *
 * created on: 2012feb14 with new and old collation code
 * created by: Markus W. Scherer
 */
 
@@ skipping 652 matching lines @@
         return;
     }
     const CollationSettings &defaultSettings = getDefaultSettings();
     if(length == 1 && reorderCodes[0] == UCOL_REORDER_CODE_DEFAULT) {
         if(settings != &defaultSettings) {
             CollationSettings *ownedSettings = SharedObject::copyOnWrite(settings);
             if(ownedSettings == NULL) {
                 errorCode = U_MEMORY_ALLOCATION_ERROR;
                 return;
             }
-            ownedSettings->aliasReordering(defaultSettings.reorderCodes,
-                                           defaultSettings.reorderCodesLength,
-                                           defaultSettings.reorderTable);
+            ownedSettings->copyReorderingFrom(defaultSettings, errorCode);
             setFastLatinOptions(*ownedSettings);
         }
         return;
     }
     CollationSettings *ownedSettings = SharedObject::copyOnWrite(settings);
     if(ownedSettings == NULL) {
         errorCode = U_MEMORY_ALLOCATION_ERROR;
         return;
     }
-    if(length == 0) {
-        ownedSettings->resetReordering();
-    } else {
-        uint8_t reorderTable[256];
-        data->makeReorderTable(reorderCodes, length, reorderTable, errorCode);
-        if(U_FAILURE(errorCode)) { return; }
-        if(!ownedSettings->setReordering(reorderCodes, length, reorderTable)) {
-            errorCode = U_MEMORY_ALLOCATION_ERROR;
-            return;
-        }
-    }
+    ownedSettings->setReordering(*data, reorderCodes, length, errorCode);
     setFastLatinOptions(*ownedSettings);
 }
 
 void
 RuleBasedCollator::setFastLatinOptions(CollationSettings &ownedSettings) const {
     ownedSettings.fastLatinOptions = CollationFastLatin::getOptions(
             data, ownedSettings,
             ownedSettings.fastLatinPrimaries, UPRV_LENGTHOF(ownedSettings.fastLatinPrimaries));
 }
 
@@ skipping 950 matching lines @@
 int32_t
 RuleBasedCollator::getMaxExpansion(int32_t order) const {
     UErrorCode errorCode = U_ZERO_ERROR;
     (void)initMaxExpansions(errorCode);
     return CollationElementIterator::getMaxExpansion(tailoring->maxExpansions, order);
 }
 
 U_NAMESPACE_END
 
 #endif  // !UCONFIG_NO_COLLATION