ICU 56 update step 1

source/i18n/collationdatabuilder.cpp

 /*
 *******************************************************************************
-* Copyright (C) 2012-2014, International Business Machines
+* Copyright (C) 2012-2015, International Business Machines
 * Corporation and others.  All Rights Reserved.
 *******************************************************************************
 * collationdatabuilder.cpp
 *
 * (replaced the former ucol_elm.cpp)
 *
 * created on: 2012apr01
 * created by: Markus W. Scherer
 */
 
@@ skipping 1192 matching lines @@
             &errorCode);
     }
 }
 
 void
 CollationDataBuilder::build(CollationData &data, UErrorCode &errorCode) {
     buildMappings(data, errorCode);
     if(base != NULL) {
         data.numericPrimary = base->numericPrimary;
         data.compressibleBytes = base->compressibleBytes;
-        data.scripts = base->scripts;
-        data.scriptsLength = base->scriptsLength;
+        data.numScripts = base->numScripts;
+        data.scriptsIndex = base->scriptsIndex;
+        data.scriptStarts = base->scriptStarts;
+        data.scriptStartsLength = base->scriptStartsLength;
     }
     buildFastLatinTable(data, errorCode);
 }
 
 void
 CollationDataBuilder::buildMappings(CollationData &data, UErrorCode &errorCode) {
     if(U_FAILURE(errorCode)) { return; }
     if(trie == NULL || utrie2_isFrozen(trie)) {
         errorCode = U_INVALID_STATE_ERROR;
         return;
@@ skipping 142 matching lines @@
         int32_t suffixStart = prefixLength + 1;  // == prefix.length()
         if(lastCond->context.length() == suffixStart) {
             // One prefix without contraction suffix.
             U_ASSERT(firstCond == lastCond);
             ce32 = lastCond->ce32;
             cond = lastCond;
         } else {
             // Build the contractions trie.
             contractionBuilder.clear();
             // Entry for an empty suffix, to be stored before the trie.
-            uint32_t emptySuffixCE32;
+            uint32_t emptySuffixCE32 = 0;
             uint32_t flags = 0;
             if(firstCond->context.length() == suffixStart) {
                 // There is a mapping for the prefix and the single character c. (p|c)
                 // If no other suffix matches, then we return this value.
                 emptySuffixCE32 = firstCond->ce32;
                 cond = getConditionalCE32(firstCond->next);
             } else {
                 // There is no mapping for the prefix and just the single character.
                 // (There is no p|c, only p|cd, p|ce etc.)
                 flags |= Collation::CONTRACT_SINGLE_CP_NO_MATCH;
@@ skipping 131 matching lines @@
     if(collIter == NULL) {
         collIter = new DataBuilderCollationIterator(*this);
         if(collIter == NULL) { return 0; }
     }
     return collIter->fetchCEs(s, start, ces, cesLength);
 }
 
 U_NAMESPACE_END
 
 #endif  // !UCONFIG_NO_COLLATION