From 4f9533c7722fa07511a94d005227961f4a4dec23 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Thu, 18 May 2006 17:29:21 +0000
Subject: Imported GNU Classpath 0.90

       Imported GNU Classpath 0.90
       * scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale.

       * sources.am: Regenerated.
       * gcj/javaprims.h: Regenerated.
       * Makefile.in: Regenerated.
       * gcj/Makefile.in: Regenerated.
       * include/Makefile.in: Regenerated.
       * testsuite/Makefile.in: Regenerated.

       * gnu/java/lang/VMInstrumentationImpl.java: New override.
       * gnu/java/net/local/LocalSocketImpl.java: Likewise.
       * gnu/classpath/jdwp/VMMethod.java: Likewise.
       * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest
       interface.
       * java/lang/Thread.java: Add UncaughtExceptionHandler.
       * java/lang/reflect/Method.java: Implements GenericDeclaration and
       isSynthetic(),
       * java/lang/reflect/Field.java: Likewise.
       * java/lang/reflect/Constructor.java
       * java/lang/Class.java: Implements Type, GenericDeclaration,
       getSimpleName() and getEnclosing*() methods.
       * java/lang/Class.h: Add new public methods.
       * java/lang/Math.java: Add signum(), ulp() and log10().
       * java/lang/natMath.cc (log10): New function.
       * java/security/VMSecureRandom.java: New override.
       * java/util/logging/Logger.java: Updated to latest classpath
       version.
       * java/util/logging/LogManager.java: New override.

From-SVN: r113887
---
 libjava/classpath/gnu/regexp/RETokenRange.java | 34 ++++++++++++++++++++------
 1 file changed, 26 insertions(+), 8 deletions(-)

(limited to 'libjava/classpath/gnu/regexp/RETokenRange.java')

diff --git a/libjava/classpath/gnu/regexp/RETokenRange.java b/libjava/classpath/gnu/regexp/RETokenRange.java
index 8a1ac86..9d3da32 100644
--- a/libjava/classpath/gnu/regexp/RETokenRange.java
+++ b/libjava/classpath/gnu/regexp/RETokenRange.java
@@ -1,5 +1,5 @@
 /* gnu/regexp/RETokenRange.java
-   Copyright (C) 1998-2001, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -56,23 +56,41 @@ final class RETokenRange extends REToken {
     return 1;
   }
 
-    boolean match(CharIndexed input, REMatch mymatch) {
+    REMatch matchThis(CharIndexed input, REMatch mymatch) {
 	char c = input.charAt(mymatch.index);
+	if (matchOneChar(c)) {
+	    ++mymatch.index;
+	    return mymatch;
+	}
+	return null;
+    }
+
+    boolean matchOneChar(char c) {
 	if (c == CharIndexed.OUT_OF_BOUNDS) return false;
 	boolean matches = (c >= lo) && (c <= hi);
 	if (! matches && insens) {
-	  char c1 = Character.toLowerCase(c);
+	  char c1 = toLowerCase(c, unicodeAware);
 	  matches = (c1 >= lo) && (c1 <= hi);
 	  if (!matches) {
-	    c1 = Character.toUpperCase(c);
+	    c1 = toUpperCase(c, unicodeAware);
 	    matches = (c1 >= lo) && (c1 <= hi);
 	  }
 	}
-	if (matches) {
-	    ++mymatch.index;
-	    return next(input, mymatch);
+	return matches;
+    }
+
+    boolean returnsFixedLengthMatches() { return true; }
+
+    int findFixedLengthMatches(CharIndexed input, REMatch mymatch, int max) {
+        int index = mymatch.index;
+	int numRepeats = 0;
+	while (true) {
+	    if (numRepeats >= max) break;
+	    char ch = input.charAt(index++);
+	    if (! matchOneChar(ch)) break;
+	    numRepeats++;
 	}
-	return false;
+        return numRepeats;
     }
     
   void dump(StringBuffer os) {
-- 
cgit v1.1