summaryrefslogtreecommitdiffstats
path: root/libjava/java/util/regex/Matcher.java
diff options
context:
space:
mode:
authorgreen <green@138bc75d-0d04-0410-961f-82ee72b054a4>2005-02-07 20:44:27 +0000
committergreen <green@138bc75d-0d04-0410-961f-82ee72b054a4>2005-02-07 20:44:27 +0000
commitff730949f98d01a18fe57758c663317cc4f7454b (patch)
treeac0595a63671d3b78325011c53603e721bdcd337 /libjava/java/util/regex/Matcher.java
parentbd051348a7ce81c83d72abc0937d21ca3848f245 (diff)
downloadppe42-gcc-ff730949f98d01a18fe57758c663317cc4f7454b.tar.gz
ppe42-gcc-ff730949f98d01a18fe57758c663317cc4f7454b.zip
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94713 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util/regex/Matcher.java')
-rw-r--r--libjava/java/util/regex/Matcher.java13
1 files changed, 11 insertions, 2 deletions
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;
}
/**
OpenPOWER on IntegriCloud