[kaffe] CVS kaffe (kaz): libraries/javalib/external/classpath/gnu/java/util/regex/RETokenChar.java :

[Kaffe CVS]

PatchSet 7470 
Date: 2007/02/09 14:49:55
Author: kaz
Branch: HEAD
Tag: (none) 
Log:
2007-02-09  Ito Kazumitsu  <kaz at maczuka.gcd.org>

	* libraries/javalib/external/classpath/gnu/java/util/regex/RETokenChar.java :
	Copied from GNU Classpath. Some bugs have been fixed.

Members: 
	ChangeLog:1.4970->1.4971 
	libraries/javalib/external/classpath/gnu/java/util/regex/RETokenChar.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4970 kaffe/ChangeLog:1.4971
--- kaffe/ChangeLog:1.4970	Sun Jan 28 13:56:21 2007
+++ kaffe/ChangeLog	Fri Feb  9 14:49:55 2007
@@ -1,3 +1,8 @@
+2007-02-09  Ito Kazumitsu  <kaz at maczuka.gcd.org>
+
+	* libraries/javalib/external/classpath/gnu/java/util/regex/RETokenChar.java :
+	Copied from GNU Classpath. Some bugs have been fixed.
+
 2007-01-28  Ito Kazumitsu  <kaz at maczuka.gcd.org>
 
 	* libraries/javalib/external/classpath/native/jni/java-nio/gnu_java_nio_VMChannel.c,
Index: kaffe/libraries/javalib/external/classpath/gnu/java/util/regex/RETokenChar.java
diff -u kaffe/libraries/javalib/external/classpath/gnu/java/util/regex/RETokenChar.java:1.2 kaffe/libraries/javalib/external/classpath/gnu/java/util/regex/RETokenChar.java:1.3
--- kaffe/libraries/javalib/external/classpath/gnu/java/util/regex/RETokenChar.java:1.2	Wed Jan  3 23:02:23 2007
+++ kaffe/libraries/javalib/external/classpath/gnu/java/util/regex/RETokenChar.java	Fri Feb  9 14:49:56 2007
@@ -113,7 +113,6 @@
   boolean chain(REToken next) {
     if (next instanceof RETokenChar && ((RETokenChar)next).insens == insens) {
       RETokenChar cnext = (RETokenChar) next;
-      // assume for now that next can only be one character
       int newsize = ch.length + cnext.ch.length;
       
       char[] chTemp = new char [newsize];
@@ -122,7 +121,9 @@
       System.arraycopy(cnext.ch,0,chTemp,ch.length,cnext.ch.length);
       
       ch = chTemp;
-      return false;
+      if (cnext.next == null)
+        return false;
+      return chain(cnext.next);
     } else return super.chain(next);
   }