procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported GNU Classpath 0.90

Browse source 
Imported GNU Classpath 0.90
       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r111942
This commit is contained in:
Mark Wielaard 2006-03-10 21:46:48 +00:00
parent 27079765d0
commit 8aa540d2f7
1367 changed files with 188789 additions and 22762 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libjava/classpath/java/util/regex/Matcher.java
View file

@ -1,5 +1,5 @@
/* Matcher.java -- Instance of a regular expression applied to a char sequence.
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -38,6 +38,7 @@ exception statement from your version. */
package java.util.regex;
import gnu.regexp.RE;
import gnu.regexp.REMatch;
/**
@ -45,7 +46,7 @@ import gnu.regexp.REMatch;
*
* @since 1.4
*/
public final class Matcher
public final class Matcher implements MatchResult
{
private Pattern pattern;
private CharSequence input;
@ -74,7 +75,8 @@ public final class Matcher
assertMatchOp();
sb.append(input.subSequence(appendPosition,
match.getStartIndex()).toString());
sb.append(match.substituteInto(replacement));
sb.append(RE.getReplacement(replacement, match,
RE.REG_REPLACE_USE_BACKSLASHESCAPE));
appendPosition = match.getEndIndex();
return this;
}
@ -189,7 +191,8 @@ public final class Matcher
{
reset();
// Semantics might not quite match
return pattern.getRE().substitute(input, replacement, position);
return pattern.getRE().substitute(input, replacement, position,
RE.REG_REPLACE_USE_BACKSLASHESCAPE);
}
/**
@ -198,7 +201,8 @@ public final class Matcher
public String replaceAll (String replacement)
{
reset();
return pattern.getRE().substituteAll(input, replacement, position);
return pattern.getRE().substituteAll(input, replacement, position,
RE.REG_REPLACE_USE_BACKSLASHESCAPE);
}
public int groupCount ()
@ -233,10 +237,15 @@ public final class Matcher
*/
public boolean matches ()
{
if (lookingAt())
match = pattern.getRE().getMatch(input, 0, RE.REG_TRY_ENTIRE_MATCH);
if (match != null)
{
if (position == input.length())
return true;
if (match.getStartIndex() == 0)
{
position = match.getEndIndex();
if (position == input.length())
return true;
}
match = null;
}
return false;