ICU-9099 Fix break iterarator problem that was causing Finnish line break tests to...

X-SVN-Rev: 31479

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedBreakIterator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedBreakIterator.java
index af15abc54672951839d969bba3f1bd96a974b0d0..59c74e284254d06acdb615213e1e5f1e4bc8767b 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedBreakIterator.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedBreakIterator.java
@@ -1125,6 +1125,7 @@ public int getRuleStatusVec(int[] fillInArray) {
                     lookaheadStatus      = 0;
                     // TODO: make a standalone hard break in a rule work.
                     if (lookAheadHardBreak) {
+                        fText.setIndex(result);
                         return result;
                     }
                     // Look-ahead completed, but other rules may match further.  Continue on.

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/RBBITestExtended.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/RBBITestExtended.java
index f0e938b345a92eff646fbc2bacafee335f422191..4ac00e9879940d81c9166c1724d2bf03bfeb1325 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/RBBITestExtended.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/RBBITestExtended.java
@@ -1,7 +1,7 @@
 /*
  * Created on May 5, 2004
  * 
- * Copyright (C) 2004-2010 International Business Machines Corporation and others.
+ * Copyright (C) 2004-2012 International Business Machines Corporation and others.
  * All Rights Reserved.
  *
  */
@@ -446,7 +446,7 @@ void executeTest(TestParams t) {
             break;
         }
 
-        // Check that there were we didn't miss an expected break between the last one
+        // Check that we didn't miss an expected break between the last one
         //  and this one.  (UVector returns zeros for index out of bounds.)
         for (i=prevBP-1; i>bp; i--) {
             if (t.expectedBreaks[i] != 0) {
@@ -481,7 +481,7 @@ void executeTest(TestParams t) {
     // Verify that there were no missed breaks prior to the last one found
     for (i=prevBP-1; i>=0; i--) {
         if (t.expectedBreaks[i] != 0) {
-            errln("Forward Itertion, break expected, but not found.  Pos=" + i +
+            errln("Reverse Itertion, break expected, but not found.  Pos=" + i +
                     "  File line,col= " + t.srcLine[i] + ", " + t.srcCol[i]);
          }
     }

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/rbbitst.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/rbbitst.txt
index a72eefac1be9a6fd5d37ede3f162cc93b1a7320a..1d00e528285a3add8d74ef35fbc3e513f016ef6e 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/rbbitst.txt
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/rbbitst.txt
@@ -799,6 +799,6 @@ What is the proper use of the abbreviation pp.? •Yes, I am definatelly 12" tal
 
 <locale fi>
 <line>
-#<data>•abc •- •def    •abc •-def    •abc- •def   •abc-•def•</data>   # With ASCII hyphen
-#<data>•abc •‐ •def    •abc •‐def    •abc‐ •def   •abc‐•def•</data>   # With Unicode u2010 hyphen
+<data>•abc •- •def    •abc •-def    •abc- •def   •abc-•def•</data>   # With ASCII hyphen
+<data>•abc •‐ •def    •abc •‐def    •abc‐ •def   •abc‐•def•</data>   # With Unicode u2010 hyphen