2006-06-07 Roman Kennke <kennke@aicas.com>

	PR 27902
	* gnu/regexp/BacktrackStack.java
	* gnu/regexp/CharIndexed.java
	* gnu/regexp/CharIndexedCharArray.java
	* gnu/regexp/CharIndexedCharSequence.java
	* gnu/regexp/CharIndexedInputStream.java
	* gnu/regexp/CharIndexedString.java
	* gnu/regexp/CharIndexedStringBuffer.java
	* gnu/regexp/RE.java
	* gnu/regexp/REException.java
	* gnu/regexp/REFilterInputStream.java
	* gnu/regexp/REMatch.java
	* gnu/regexp/REMatchEnumeration.java
	* gnu/regexp/RESyntax.java
	* gnu/regexp/REToken.java
	* gnu/regexp/RETokenAny.java
	* gnu/regexp/RETokenBackRef.java
	* gnu/regexp/RETokenChar.java
	* gnu/regexp/RETokenEnd.java
	* gnu/regexp/RETokenEndOfPreviousMatch.java
	* gnu/regexp/RETokenEndSub.java
	* gnu/regexp/RETokenIndependent.java
	* gnu/regexp/RETokenLookAhead.java
	* gnu/regexp/RETokenLookBehind.java
	* gnu/regexp/RETokenNamedProperty.java
	* gnu/regexp/RETokenOneOf.java
	* gnu/regexp/RETokenPOSIX.java
	* gnu/regexp/RETokenRange.java
	* gnu/regexp/RETokenRepeated.java
	* gnu/regexp/RETokenStart.java
	* gnu/regexp/RETokenWordBoundary.java
	* gnu/regexp/UncheckedRE.java
	* gnu/java/util/regex/BacktrackStack.java
	* gnu/java/util/regex/CharIndexed.java
	* gnu/java/util/regex/CharIndexedCharArray.java
	* gnu/java/util/regex/CharIndexedCharSequence.java
	* gnu/java/util/regex/CharIndexedInputStream.java
	* gnu/java/util/regex/CharIndexedString.java
	* gnu/java/util/regex/CharIndexedStringBuffer.java
	* gnu/java/util/regex/RE.java
	* gnu/java/util/regex/REException.java
	* gnu/java/util/regex/REFilterInputStream.java
	* gnu/java/util/regex/REMatch.java
	* gnu/java/util/regex/REMatchEnumeration.java
	* gnu/java/util/regex/RESyntax.java
	* gnu/java/util/regex/REToken.java
	* gnu/java/util/regex/RETokenAny.java
	* gnu/java/util/regex/RETokenBackRef.java
	* gnu/java/util/regex/RETokenChar.java
	* gnu/java/util/regex/RETokenEnd.java
	* gnu/java/util/regex/RETokenEndOfPreviousMatch.java
	* gnu/java/util/regex/RETokenEndSub.java
	* gnu/java/util/regex/RETokenIndependent.java
	* gnu/java/util/regex/RETokenLookAhead.java
	* gnu/java/util/regex/RETokenLookBehind.java
	* gnu/java/util/regex/RETokenNamedProperty.java
	* gnu/java/util/regex/RETokenOneOf.java
	* gnu/java/util/regex/RETokenPOSIX.java
	* gnu/java/util/regex/RETokenRange.java
	* gnu/java/util/regex/RETokenRepeated.java
	* gnu/java/util/regex/RETokenStart.java
	* gnu/java/util/regex/RETokenWordBoundary.java
	* gnu/java/util/regex/UncheckedRE.java
	Moved gnu.regexp classes to gnu.java.util.regex package.
	* java/util/regex/Matcher.java
	* java/util/regex/Pattern.java
	Adjusted import statements for new package name for gnu regexp.

1 files changed, 86 insertions, 0 deletions

diff --git a/gnu/java/util/regex/RETokenBackRef.java b/gnu/java/util/regex/RETokenBackRef.java
new file mode 100644
index 000000000..3a912f9bb
--- /dev/null
+++ b/gnu/java/util/regex/RETokenBackRef.java
@@ -0,0 +1,86 @@
+/* gnu/regexp/RETokenBackRef.java
+   Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.util.regex;
+
+final class RETokenBackRef extends REToken {
+  private int num;
+  private boolean insens;
+  
+  RETokenBackRef(int subIndex, int num, boolean insens) {
+    super(subIndex);
+    this.num = num;
+    this.insens = insens;
+  }
+
+  // should implement getMinimumLength() -- any ideas?
+
+    REMatch matchThis(CharIndexed input, REMatch mymatch) {
+	if (num >= mymatch.start.length) return null;
+	if (num >= mymatch.end.length) return null;
+	int b,e;
+	b = mymatch.start[num];
+	e = mymatch.end[num];
+	if ((b==-1)||(e==-1)) return null; // this shouldn't happen, but...
+	if (b < 0) b += 1;
+	if (e < 0) e += 1;
+	for (int i=b; i<e; i++) {
+	    char c1 = input.charAt(mymatch.index+i-b);
+	    char c2 = input.charAt(i);
+	    if (c1 != c2) {
+		if (insens) {
+		    if (c1 != toLowerCase(c2, unicodeAware) &&
+			c1 != toUpperCase(c2, unicodeAware)) {
+			return null;
+		    }
+		}
+		else {
+		    return null;
+		}
+	    }
+	}
+	mymatch.index += e-b;
+	return mymatch;
+    }
+    
+    void dump(StringBuffer os) {
+	os.append('\\').append(num);
+    }
+}
+
+