From 1d533a66e8eba6ae80a97ea5ea81d7d53fcca5d3 Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Wed, 9 Jul 2014 23:36:43 +0000
Subject: [PATCH] ICU-10998 collation reorder others=Zzzz, recognize only
 others = reset

X-SVN-Rev: 36019
---
 .../icu/impl/coll/CollationRuleParser.java    | 12 ++++-----
 .../src/com/ibm/icu/text/Collator.java        |  3 +++
 .../com/ibm/icu/text/RuleBasedCollator.java   |  7 ++++--
 .../com/ibm/icu/dev/data/collationtest.txt    | 25 +++++++++++++++++++
 .../dev/test/collator/CollationMiscTest.java  |  7 ++++++
 .../icu/dev/test/collator/CollationTest.java  | 12 ++++++---
 6 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/impl/coll/CollationRuleParser.java b/icu4j/main/classes/collate/src/com/ibm/icu/impl/coll/CollationRuleParser.java
index 9ebbcb26417..cf2681648d3 100644
--- a/icu4j/main/classes/collate/src/com/ibm/icu/impl/coll/CollationRuleParser.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/impl/coll/CollationRuleParser.java
@@ -719,8 +719,7 @@ public final class CollationRuleParser {
             i = limit;
         }
         int length = reorderCodes.size();
-        if(length == 1 && reorderCodes.get(0) == Collator.ReorderCodes.DEFAULT) {
-            // The root collator does not have a reordering, by definition.
+        if(length == 1 && reorderCodes.get(0) == Collator.ReorderCodes.NONE) {
             settings.resetReordering();
             return;
         }
@@ -739,8 +738,7 @@ public final class CollationRuleParser {
     /**
      * Gets a script or reorder code from its string representation.
      * @return the script/reorder code, or
-     * -1==Collator.ReorderCodes.REORDER_CODE_DEFAULT, or
-     * -2 if not recognized
+     * -1 if not recognized
      */
     public static int getReorderCode(String word) {
         for(int i = 0; i < gSpecialReorderCodes.length; ++i) {
@@ -756,10 +754,10 @@ public final class CollationRuleParser {
         } catch (IllegalIcuArgumentException e) {
             // fall through
         }
-        if(word.equalsIgnoreCase("default")) {
-            return Collator.ReorderCodes.DEFAULT;
+        if(word.equalsIgnoreCase("others")) {
+            return Collator.ReorderCodes.OTHERS;  // same as Zzzz = USCRIPT_UNKNOWN 
         }
-        return -2;
+        return -1;
     }
 
     private static int getOnOffValue(String s) {
diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java
index 6c8dc49dde9..03e7765793f 100644
--- a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java
@@ -644,6 +644,9 @@ public abstract class Collator implements Comparator<Object>, Freezable<Collator
     private static final int getReorderCode(String keyword, String s) {
         return Collator.ReorderCodes.FIRST +
                 getIntValue(keyword, s, "space", "punct", "symbol", "currency", "digit");
+        // Not supporting "others" = UCOL_REORDER_CODE_OTHERS
+        // as a synonym for Zzzz = USCRIPT_UNKNOWN for now:
+        // Avoid introducing synonyms/aliases.
     }
 
     /**
diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
index 519840e631f..ab7d23066af 100644
--- a/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/RuleBasedCollator.java
@@ -935,12 +935,15 @@ public final class RuleBasedCollator extends Collator {
     @Override
     public void setReorderCodes(int... order) {
         checkNotFrozen();
-        if(order == null ?
+        int length = (order != null) ? order.length : 0;
+        if(length == 1 && order[0] == ReorderCodes.NONE) {
+            length = 0;
+        }
+        if(length == 0 ?
                 settings.readOnly().reorderCodes.length == 0 :
                 Arrays.equals(order, settings.readOnly().reorderCodes)) {
             return;
         }
-        int length = (order != null) ? order.length : 0;
         CollationSettings defaultSettings = getDefaultSettings();
         if(length == 1 && order[0] == Collator.ReorderCodes.DEFAULT) {
             if(settings.readOnly() != defaultSettings) {
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/collationtest.txt b/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/collationtest.txt
index ec6a2c526b1..5b14a77fae7 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/collationtest.txt
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/data/collationtest.txt
@@ -2439,3 +2439,28 @@
 <1 a
 <1 ae
 <2 ä
+
+** test: import rules from a language with non-Latin native script, and reset the reordering, ICU ticket 10998
+# Greek should sort Greek first.
+@ rules
+[import el]
+* compare
+<1 4
+<1 Ω
+<1 L
+
+# Import Greek, and then reset the reordering.
+@ rules
+[import el][reorder Zzzz]
+* compare
+<1 4
+<1 L
+<1 Ω
+
+# "others" is a synonym for Zzzz.
+@ rules
+[import el][reorder others]
+* compare
+<1 4
+<1 L
+<1 Ω
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java
index ad4c70406d2..02bbce06070 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java
@@ -3204,6 +3204,13 @@ public class CollationMiscTest extends TestFmwk {
             errln("ERROR: collation result should have been greater.");
         }
         
+        /* clear the reordering using [NONE] */
+        myCollation.setReorderCodes(new int[]{ ReorderCodes.NONE });    
+        retrievedReorderCodes = myCollation.getReorderCodes();
+        if (retrievedReorderCodes.length != 0) {
+            errln("ERROR: [NONE] retrieved reorder codes was not null.");
+        }
+
         boolean gotException = false;
         /* set duplicates in the reorder codes */
         try {
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationTest.java
index 764bbff0cec..4f9197d2fca 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationTest.java
@@ -1290,10 +1290,14 @@ public class CollationTest extends TestFmwk {
             String name = fileLine.substring(start, limit);
             int code = CollationRuleParser.getReorderCode(name);
             if (code < -1) {
-                logln(fileLine);
-                error = new ParseException("invalid reorder code '" + name + "' on line "
-                                            + fileLineNumber, fileLineNumber);
-                return;
+                if (name.equalsIgnoreCase("default")) {
+                    code = ReorderCodes.DEFAULT;  // -1
+                } else {
+                    logln(fileLine);
+                    error = new ParseException("invalid reorder code '" + name + "' on line "
+                                                + fileLineNumber, fileLineNumber);
+                    return;
+                }
             }
             reorderCodes.addElement(code);
             start = limit;
-- 
2.40.0