ICU 56 update step 1

source/i18n/collation.h

 /*
 *******************************************************************************
-* Copyright (C) 2010-2014, International Business Machines
+* Copyright (C) 2010-2015, International Business Machines
 * Corporation and others.  All Rights Reserved.
 *******************************************************************************
 * collation.h
 *
 * created on: 2010oct27
 * created by: Markus W. Scherer
 */
 
 #ifndef __COLLATION_H__
 #define __COLLATION_H__
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_COLLATION
 
 U_NAMESPACE_BEGIN
 
 /**
  * Collation v2 basic definitions and static helper functions.
  *
  * Data structures except for expansion tables store 32-bit CEs which are
  * either specials (see tags below) or are compact forms of 64-bit CEs.
  */
 class U_I18N_API Collation {
 public:
     // Special sort key bytes for all levels.
     static const uint8_t TERMINATOR_BYTE = 0;
     static const uint8_t LEVEL_SEPARATOR_BYTE = 1;
+
+    /** The secondary/tertiary lower limit for tailoring before any root elements. */
+    static const uint32_t BEFORE_WEIGHT16 = 0x0100;
+
     /**
      * Merge-sort-key separator.
-     * Must not be used as the lead byte of any CE weight,
-     * nor as primary compression low terminator.
+     * Same as the unique primary and identical-level weights of U+FFFE.
+     * Must not be used as primary compression low terminator.
      * Otherwise usable.
      */
     static const uint8_t MERGE_SEPARATOR_BYTE = 2;
     static const uint32_t MERGE_SEPARATOR_PRIMARY = 0x02000000;  // U+FFFE
-    static const uint32_t MERGE_SEPARATOR_WEIGHT16 = 0x0200;  // U+FFFE
-    static const uint32_t MERGE_SEPARATOR_LOWER32 = 0x02000200;  // U+FFFE
-    static const uint32_t MERGE_SEPARATOR_CE32 = 0x02000202;  // U+FFFE
+    static const uint32_t MERGE_SEPARATOR_CE32 = 0x02000505;  // U+FFFE
 
     /**
      * Primary compression low terminator, must be greater than MERGE_SEPARATOR_BYTE.
      * Reserved value in primary second byte if the lead byte is compressible.
      * Otherwise usable in all CE weight bytes.
      */
     static const uint8_t PRIMARY_COMPRESSION_LOW_BYTE = 3;
     /**
      * Primary compression high terminator.
      * Reserved value in primary second byte if the lead byte is compressible.
@@ skipping 426 matching lines @@
 
     /**
      * Returns the unassigned-character implicit primary weight for any valid code point c.
      */
     static uint32_t unassignedPrimaryFromCodePoint(UChar32 c);
 
     static inline int64_t unassignedCEFromCodePoint(UChar32 c) {
         return makeCE(unassignedPrimaryFromCodePoint(c));
     }
 
-    static inline uint32_t reorder(const uint8_t reorderTable[256], uint32_t primary) {
-        return ((uint32_t)reorderTable[primary >> 24] << 24) | (primary & 0xffffff);
-    }
-
 private:
     Collation();  // No instantiation.
 };
 
 U_NAMESPACE_END
 
 #endif  // !UCONFIG_NO_COLLATION
 #endif  // __COLLATION_H__