From: Andy Heninger <andy.heninger@gmail.com>
Date: Mon, 2 Apr 2018 20:54:56 +0000 (+0000)
Subject: ICU-13194 RBBI safe table generation, all tests passing.
X-Git-Tag: release-62-rc~204^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74abb225105bf686370358d5b24ec7d54914fd49;p=icu

ICU-13194 RBBI safe table generation, all tests passing.

X-SVN-Rev: 41187
---

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java
index 200f814fd49..22263c9cd78 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java
@@ -352,7 +352,7 @@ public final class RBBIDataWrapper {
         }
 
         // Current position in the buffer.
-        int pos = 24 * 4;     // offset of end of header, which has 24 fields, all int32_t (4 bytes)
+        int pos = DH_SIZE * 4;     // offset of end of header, which has DH_SIZE fields, all int32_t (4 bytes)
 
         //
         // Read in the Forward state transition table as an array of shorts.
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIRuleBuilder.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIRuleBuilder.java
index 12e7b0e0b58..65bd1f77374 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIRuleBuilder.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIRuleBuilder.java
@@ -43,8 +43,8 @@ class RBBIRuleBuilder {
     RBBINode[]         fTreeRoots = new RBBINode[4];
     static final int   fForwardTree = 0;  // Indexes into the above fTreeRoots array
     static final int   fReverseTree = 1;  //   for each of the trees.
-    static final int   fSafeFwdTree = 3;  //   (in C, these are pointer variables and
-    static final int   fSafeRevTree = 4;  //    there is no array.)
+    static final int   fSafeFwdTree = 2;  //   (in C, these are pointer variables and
+    static final int   fSafeRevTree = 3;  //    there is no array.)
     int fDefaultTree = fForwardTree;      // For rules not qualified with a !
                                           //   the tree to which they belong to.
 
@@ -59,7 +59,7 @@ class RBBIRuleBuilder {
                                           // longest match.
 
     RBBISetBuilder fSetBuilder;           // Set and Character Category builder.
-    List<RBBINode> fUSetNodes;            // Vector of all uset nodes.
+    List<RBBINode> fUSetNodes;            // Vector of all used nodes.
     RBBITableBuilder fForwardTable;       // State transition tables
 
     //
@@ -99,7 +99,7 @@ class RBBIRuleBuilder {
     /**< Syntax error in RBBI rule.                        */
 
     static final int U_BRK_UNCLOSED_SET = 0x10205;
-    /**< UnicodeSet witing an RBBI rule missing a closing ']'.  */
+    /**< UnicodeSet writing an RBBI rule missing a closing ']'.  */
 
     static final int U_BRK_ASSIGN_ERROR = 0x10206;
     /**< Syntax error in RBBI rule assignment statement.   */
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIRuleScanner.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIRuleScanner.java
index 8fb44c71a3f..5751e4183c4 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIRuleScanner.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIRuleScanner.java
@@ -285,7 +285,7 @@ class RBBIRuleScanner {
             // All rule expressions are ORed together.
             // The ';' that terminates an expression really just functions as a
             // '|' with
-            //   a low operator prededence.
+            //   a low operator precedence.
             //
             // Each of the four sets of rules are collected separately.
             //  (forward, reverse, safe_forward, safe_reverse)
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBITableBuilder.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBITableBuilder.java
index a40a1bff46a..c511a5a16ce 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBITableBuilder.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBITableBuilder.java
@@ -1004,7 +1004,7 @@ class RBBITableBuilder {
         */
        void removeSafeState(int keepState, int duplState) {
            assert(keepState < duplState);
-           assert(duplState < fDStates.size());
+           assert(duplState < fSafeTable.size());
 
            fSafeTable.remove(duplState);
            int numStates = fSafeTable.size();