ICU-66108.tar.gz

[apple/icu.git] / icuSources / common / ruleiter.cpp

diff --git a/icuSources/common/ruleiter.cpp b/icuSources/common/ruleiter.cpp
index b99a831513de46cd8247b323c417bac506fafc6d..41eea23c0dcb32120254d0e0980984e6e498f89f 100644 (file)
--- a/icuSources/common/ruleiter.cpp
+++ b/icuSources/common/ruleiter.cpp
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
-* Copyright (c) 2003-2007, International Business Machines
+* Copyright (c) 2003-2011, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
@@ -10,9 +12,10 @@
 */
 #include "ruleiter.h"
 #include "unicode/parsepos.h"
-#include "unicode/unistr.h"
 #include "unicode/symtable.h"
-#include "util.h"
+#include "unicode/unistr.h"
+#include "unicode/utf16.h"
+#include "patternprops.h"
 
 /* \U87654321 or \ud800\udc00 */
 #define MAX_U_NOTATION_LEN 12
@@ -40,7 +43,7 @@ UChar32 RuleCharacterIterator::next(int32_t options, UBool& isEscaped, UErrorCod
 
     for (;;) {
         c = _current();
-        _advance(UTF_CHAR_LENGTH(c));
+        _advance(U16_LENGTH(c));
 
         if (c == SymbolTable::SYMBOL_REF && buf == 0 &&
             (options & PARSE_VARIABLES) != 0 && sym != 0) {
@@ -63,8 +66,7 @@ UChar32 RuleCharacterIterator::next(int32_t options, UBool& isEscaped, UErrorCod
             continue;
         }
 
-        if ((options & SKIP_WHITESPACE) != 0 &&
-            uprv_isRuleWhiteSpace(c)) {
+        if ((options & SKIP_WHITESPACE) != 0 && PatternProps::isWhiteSpace(c)) {
             continue;
         }
 
@@ -102,8 +104,8 @@ void RuleCharacterIterator::skipIgnored(int32_t options) {
     if ((options & SKIP_WHITESPACE) != 0) {
         for (;;) {
             UChar32 a = _current();
-            if (!uprv_isRuleWhiteSpace(a)) break;
-            _advance(UTF_CHAR_LENGTH(a));
+            if (!PatternProps::isWhiteSpace(a)) break;
+            _advance(U16_LENGTH(a));
         }
     }
 }