diff options
Diffstat (limited to 'libjava/classpath/java/util/regex')
| -rw-r--r-- | libjava/classpath/java/util/regex/Matcher.java | 14 | ||||
| -rw-r--r-- | libjava/classpath/java/util/regex/Pattern.java | 6 |
2 files changed, 14 insertions, 6 deletions
diff --git a/libjava/classpath/java/util/regex/Matcher.java b/libjava/classpath/java/util/regex/Matcher.java index 98086bf..e86be25 100644 --- a/libjava/classpath/java/util/regex/Matcher.java +++ b/libjava/classpath/java/util/regex/Matcher.java @@ -40,6 +40,7 @@ package java.util.regex; import gnu.regexp.RE; import gnu.regexp.REMatch; +import gnu.regexp.CharIndexed; /** * Instance of a regular expression applied to a char sequence. @@ -50,6 +51,10 @@ public final class Matcher implements MatchResult { private Pattern pattern; private CharSequence input; + // We use CharIndexed as an input object to the getMatch method in order + // that /\G/ (the end of the previous match) may work. The information + // of the previous match is stored in the CharIndexed object. + private CharIndexed inputCharIndexed; private int position; private int appendPosition; private REMatch match; @@ -58,6 +63,7 @@ public final class Matcher implements MatchResult { this.pattern = pattern; this.input = input; + this.inputCharIndexed = RE.makeCharIndexed(input, 0); } /** @@ -119,7 +125,7 @@ public final class Matcher implements MatchResult public boolean find () { boolean first = (match == null); - match = pattern.getRE().getMatch(input, position); + match = pattern.getRE().getMatch(inputCharIndexed, position); if (match != null) { int endIndex = match.getEndIndex(); @@ -150,7 +156,7 @@ public final class Matcher implements MatchResult */ public boolean find (int start) { - match = pattern.getRE().getMatch(input, start); + match = pattern.getRE().getMatch(inputCharIndexed, start); if (match != null) { position = match.getEndIndex(); @@ -212,7 +218,7 @@ public final class Matcher implements MatchResult public boolean lookingAt () { - match = pattern.getRE().getMatch(input, 0); + match = pattern.getRE().getMatch(inputCharIndexed, 0); if (match != null) { if (match.getStartIndex() == 0) @@ -237,7 +243,7 @@ public final class Matcher implements MatchResult */ public boolean matches () { - match = pattern.getRE().getMatch(input, 0, RE.REG_TRY_ENTIRE_MATCH); + match = pattern.getRE().getMatch(inputCharIndexed, 0, RE.REG_TRY_ENTIRE_MATCH); if (match != null) { if (match.getStartIndex() == 0) diff --git a/libjava/classpath/java/util/regex/Pattern.java b/libjava/classpath/java/util/regex/Pattern.java index d39f1cf..8c19983 100644 --- a/libjava/classpath/java/util/regex/Pattern.java +++ b/libjava/classpath/java/util/regex/Pattern.java @@ -74,14 +74,16 @@ public final class Pattern implements Serializable this.flags = flags; int gnuFlags = 0; + gnuFlags |= RE.REG_ICASE_USASCII; if ((flags & CASE_INSENSITIVE) != 0) gnuFlags |= RE.REG_ICASE; if ((flags & MULTILINE) != 0) gnuFlags |= RE.REG_MULTILINE; if ((flags & DOTALL) != 0) gnuFlags |= RE.REG_DOT_NEWLINE; + if ((flags & UNICODE_CASE) != 0) + gnuFlags &= ~RE.REG_ICASE_USASCII; // not yet supported: - // if ((flags & UNICODE_CASE) != 0) gnuFlags = // if ((flags & CANON_EQ) != 0) gnuFlags = RESyntax syntax = RESyntax.RE_SYNTAX_JAVA_1_4; @@ -94,7 +96,7 @@ public final class Pattern implements Serializable if ((flags & COMMENTS) != 0) { - // Use a syntax with support for comments? + gnuFlags |= RE.REG_X_COMMENTS; } try |