From ff730949f98d01a18fe57758c663317cc4f7454b Mon Sep 17 00:00:00 2001 From: green Date: Mon, 7 Feb 2005 20:44:27 +0000 Subject: 2005-02-07 Mark Wielaard Reported by Timo Lindfors java/util/regex/Matcher.java (lookingAt): Set position when match found. (matches): Implemented through lookingAt(). 2005-02-07 Mark Wielaard Fix suggested by Timo Lindfors * java/util/regex/Pattern.java (split(CharSequence,int)): Fix while empties > 0 loops. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94713 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/util/regex/Matcher.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'libjava/java/util/regex/Matcher.java') diff --git a/libjava/java/util/regex/Matcher.java b/libjava/java/util/regex/Matcher.java index 994893ad84b..f8c8f1a4a1e 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; } /** -- cgit v1.2.3