diff options
author | Mark Wielaard <mark@klomp.org> | 2005-02-07 20:44:27 +0000 |
---|---|---|
committer | Anthony Green <green@gcc.gnu.org> | 2005-02-07 20:44:27 +0000 |
commit | 0384c7652f54fa6091c16213bbd885b9a9b64a1e (patch) | |
tree | ac0595a63671d3b78325011c53603e721bdcd337 /libjava/java/util/regex/Matcher.java | |
parent | 7f5c93ac95dcf6e499bba466e7ebb28ddaaeb772 (diff) | |
download | gcc-0384c7652f54fa6091c16213bbd885b9a9b64a1e.zip gcc-0384c7652f54fa6091c16213bbd885b9a9b64a1e.tar.gz gcc-0384c7652f54fa6091c16213bbd885b9a9b64a1e.tar.bz2 |
Reported by Timo Lindfors <timo.lindfors@iki.fi> java/util/regex/Matcher.java...
2005-02-07 Mark Wielaard <mark@klomp.org>
Reported by Timo Lindfors <timo.lindfors@iki.fi>
java/util/regex/Matcher.java (lookingAt): Set position when match
found.
(matches): Implemented through lookingAt().
2005-02-07 Mark Wielaard <mark@klomp.org>
Fix suggested by Timo Lindfors <timo.lindfors@iki.fi>
* java/util/regex/Pattern.java (split(CharSequence,int)):
Fix while empties > 0 loops.
From-SVN: r94713
Diffstat (limited to 'libjava/java/util/regex/Matcher.java')
-rw-r--r-- | libjava/java/util/regex/Matcher.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libjava/java/util/regex/Matcher.java b/libjava/java/util/regex/Matcher.java index 994893a..f8c8f1a 100644 --- a/libjava/java/util/regex/Matcher.java +++ b/libjava/java/util/regex/Matcher.java @@ -212,7 +212,10 @@ public final class Matcher if (match != null) { if (match.getStartIndex() == 0) - return true; + { + position = match.getEndIndex(); + return true; + } match = null; } return false; @@ -230,7 +233,13 @@ public final class Matcher */ public boolean matches () { - return find(0); + if (lookingAt()) + { + if (position == input.length()) + return true; + match = null; + } + return false; } /** |