Makefile.am: Build property resource files into libgcj.

2004-03-08  Anthony Green  <green@redhat.com>

	* Makefile.am: Build property resource files into libgcj.
	* Makefile.in: Rebuilt.
	* java/util/regex/Matcher.java, java/util/regex/Pattern.java,
	java/util/regex/PatternSyntaxException.java,
	gnu/regexp/CharIndexed.java,
	gnu/regexp/CharIndexedCharArray.java,
	gnu/regexp/CharIndexedInputStream.java,
	gnu/regexp/CharIndexedReader.java,
	gnu/regexp/CharIndexedString.java,
	gnu/regexp/CharIndexedStringBuffer.java, gnu/regexp/RE.java,
	gnu/regexp/REException.java,
	gnu/regexp/REFilterInputStream.java,
	gnu/regexp/REFilterReader.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/RETokenEndSub.java,
	gnu/regexp/RETokenLookAhead.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: Files merged from GNU Classpath.

From-SVN: r79198

libjava/ChangeLog

+2004-03-08  Anthony Green  <green@redhat.com>
+
+	* Makefile.am: Build property resource files into libgcj.
+	* Makefile.in: Rebuilt.
+	* java/util/regex/Matcher.java, java/util/regex/Pattern.java,
+	java/util/regex/PatternSyntaxException.java,
+	gnu/regexp/CharIndexed.java,
+	gnu/regexp/CharIndexedCharArray.java,
+	gnu/regexp/CharIndexedInputStream.java,
+	gnu/regexp/CharIndexedReader.java,
+	gnu/regexp/CharIndexedString.java,
+	gnu/regexp/CharIndexedStringBuffer.java, gnu/regexp/RE.java,
+	gnu/regexp/REException.java,
+	gnu/regexp/REFilterInputStream.java,
+	gnu/regexp/REFilterReader.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/RETokenEndSub.java,
+	gnu/regexp/RETokenLookAhead.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: Files merged from GNU Classpath.
+
 2004-03-03  Per Bothner  <per@bothner.com>
 
 	* java/nio/channels/Channels.java (newInputStream, newOutputStream):

libjava/Makefile.am

@@ -156,10 +156,11 @@ EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \
 	$(extra_cc_source_files) $(java_source_files) $(built_java_source_files)
 libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(javao_files) \
 	$(c_files) $(extra_cc_files) $(GCOBJS) $(THREADOBJS) \
-       $(PLATFORMOBJS) $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS)
+	$(PLATFORMOBJS) $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) \
+	$(propertyo_files)
 
 libgcj_la_LIBADD = $(javao_files) $(c_files) $(extra_cc_files) $(GCOBJS) \
-	$(THREADOBJS) $(PLATFORMOBJS)
+	$(THREADOBJS) $(PLATFORMOBJS) $(propertyo_files)
 # Include THREADLIBS here to ensure that the correct version of
 # certain linuxthread functions get linked:
 libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
@@ -374,6 +375,16 @@ all_java_source_files = \
 
 all_java_class_files = $(all_java_source_files:.java=.class)
 
+## Build property files into the library.
+property_files = \
+gnu/regexp/MessagesBundle.properties \
+gnu/regexp/MessagesBundle_fr.properties 
+
+propertyo_files = $(property_files:.properties=.properties.lo) 
+
+%.properties.lo: %.properties
+	$(GCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
+
 if ONESTEP
 
 # Compile all classfiles in one go.
@@ -433,7 +444,7 @@ distclean-local:
 clean-nat:
 	rm -f $(nat_files) $(x_nat_files)
 
-SUFFIXES = .class .java .h
+SUFFIXES = .class .java .h .properties
 
 .class.lo:
 	$(GCJCOMPILE) -o $@ $<
@@ -2368,6 +2379,33 @@ gnu/java/nio/charset/UTF_16Decoder.java \
 gnu/java/nio/charset/UTF_16Encoder.java \
 gnu/java/nio/charset/UTF_16LE.java \
 gnu/java/nio/charset/UTF_8.java \
+gnu/regexp/CharIndexed.java \
+gnu/regexp/CharIndexedCharArray.java \
+gnu/regexp/CharIndexedInputStream.java \
+gnu/regexp/CharIndexedReader.java \
+gnu/regexp/CharIndexedString.java \
+gnu/regexp/CharIndexedStringBuffer.java \
+gnu/regexp/RE.java \
+gnu/regexp/REException.java \
+gnu/regexp/REFilterInputStream.java \
+gnu/regexp/REFilterReader.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/RETokenEndSub.java \
+gnu/regexp/RETokenLookAhead.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/security/Engine.java \
 gnu/java/security/OID.java \
 gnu/java/security/der/BitString.java \

libjava/gnu/regexp/CharIndexed.java

+/* gnu/regexp/CharIndexed.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+/**
+ * Defines the interface used internally so that different types of source
+ * text can be accessed in the same way.  Built-in concrete classes provide
+ * support for String, StringBuffer, InputStream and char[] types.
+ * A class that is CharIndexed supports the notion of a cursor within a
+ * block of text.  The cursor must be able to be advanced via the move()
+ * method.  The charAt() method returns the character at the cursor position
+ * plus a given offset.
+ *
+ * @author <A HREF="mailto:wes@cacas.org">Wes Biggs</A>
+ */
+public interface CharIndexed {
+    /**
+     * Defines a constant (0xFFFF was somewhat arbitrarily chosen)
+     * that can be returned by the charAt() function indicating that
+     * the specified index is out of range.
+     */
+    char OUT_OF_BOUNDS = '\uFFFF';
+
+    /**
+     * Returns the character at the given offset past the current cursor
+     * position in the input.  The index of the current position is zero.
+     * It is possible for this method to be called with a negative index.
+     * This happens when using the '^' operator in multiline matching mode
+     * or the '\b' or '\<' word boundary operators.  In any case, the lower
+     * bound is currently fixed at -2 (for '^' with a two-character newline).
+     *
+     * @param index the offset position in the character field to examine
+     * @return the character at the specified index, or the OUT_OF_BOUNDS
+     *   character defined by this interface.
+     */
+    char charAt(int index);
+
+    /**
+     * Shifts the input buffer by a given number of positions.  Returns
+     * true if the new cursor position is valid.
+     */
+    boolean move(int index);
+
+    /**
+     * Returns true if the most recent move() operation placed the cursor
+     * position at a valid position in the input.
+     */
+    boolean isValid();
+}

libjava/gnu/regexp/CharIndexedCharArray.java

+/* gnu/regexp/CharIndexedCharArray.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+import java.io.Serializable;
+
+class CharIndexedCharArray implements CharIndexed, Serializable {
+    private char[] s;
+    private int anchor;
+    
+    CharIndexedCharArray(char[] str, int index) {
+	s = str;
+	anchor = index;
+    }
+    
+    public char charAt(int index) {
+	int pos = anchor + index;
+	return ((pos < s.length) && (pos >= 0)) ? s[pos] : OUT_OF_BOUNDS;
+    }
+    
+    public boolean isValid() {
+	return (anchor < s.length);
+    }
+    
+    public boolean move(int index) {
+	return ((anchor += index) < s.length);
+    }
+}

libjava/gnu/regexp/CharIndexedInputStream.java

+/* gnu/regexp/CharIndexedInputStream.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+import java.io.InputStream;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+
+// TODO: move(x) shouldn't rely on calling next() x times
+
+class CharIndexedInputStream implements CharIndexed {
+    private static final int BUFFER_INCREMENT = 1024;
+    private static final int UNKNOWN = Integer.MAX_VALUE; // value for end
+    
+    private BufferedInputStream br;
+
+    // so that we don't try to reset() right away
+    private int index = -1;
+
+    private int bufsize = BUFFER_INCREMENT;
+
+    private int end = UNKNOWN;
+
+    private char cached = OUT_OF_BOUNDS;
+
+    // Big enough for a \r\n pair
+    // lookBehind[0] = most recent
+    // lookBehind[1] = second most recent
+    private char[] lookBehind = new char[] { OUT_OF_BOUNDS, OUT_OF_BOUNDS }; 
+    
+    CharIndexedInputStream(InputStream str, int index) {
+	if (str instanceof BufferedInputStream) br = (BufferedInputStream) str;
+	else br = new BufferedInputStream(str,BUFFER_INCREMENT);
+	next();
+	if (index > 0) move(index);
+    }
+    
+    private boolean next() {
+	if (end == 1) return false;
+	end--; // closer to end
+
+	try {
+	    if (index != -1) {
+		br.reset();
+	    }
+	    int i = br.read();
+	    br.mark(bufsize);
+	    if (i == -1) {
+		end = 1;
+		cached = OUT_OF_BOUNDS;
+		return false;
+	    }
+	    cached = (char) i;
+	    index = 1;
+	} catch (IOException e) { 
+	    e.printStackTrace();
+	    cached = OUT_OF_BOUNDS;
+	    return false; 
+	}
+	return true;
+    }
+    
+    public char charAt(int index) {
+	if (index == 0) {
+	    return cached;
+	} else if (index >= end) {
+	    return OUT_OF_BOUNDS;
+	} else if (index == -1) {
+	    return lookBehind[0];
+	} else if (index == -2) {
+	    return lookBehind[1];
+	} else if (index < -2) {
+	    return OUT_OF_BOUNDS;
+	} else if (index >= bufsize) {
+	    // Allocate more space in the buffer.
+	    try {
+		while (bufsize <= index) bufsize += BUFFER_INCREMENT;
+		br.reset();
+		br.mark(bufsize);
+		br.skip(index-1);
+	    } catch (IOException e) { }
+	} else if (this.index != index) {
+	    try {
+		br.reset();
+		br.skip(index-1);
+	    } catch (IOException e) { }
+	}
+	char ch = OUT_OF_BOUNDS;
+	
+	try {
+	    int i = br.read();
+	    this.index = index+1; // this.index is index of next pos relative to charAt(0)
+	    if (i == -1) {
+		// set flag that next should fail next time?
+		end = index;
+		return ch;
+	    }
+	    ch = (char) i;
+	} catch (IOException ie) { }
+	
+	return ch;
+    }
+    
+    public boolean move(int index) {
+	// move read position [index] clicks from 'charAt(0)'
+	boolean retval = true;
+	while (retval && (index-- > 0)) retval = next();
+	return retval;
+    }
+    
+    public boolean isValid() {
+	return (cached != OUT_OF_BOUNDS);
+    }
+}
+

libjava/gnu/regexp/CharIndexedReader.java

+/*
+ *  gnu/regexp/CharIndexedReader.java
+ *  Copyright (C) 2001 Lee Sau Dan
+ *  Based on gnu.regexp.CharIndexedInputStream by Wes Biggs
+ *
+ *  This library is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published
+ *  by the Free Software Foundation; either version 2.1 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This library 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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package gnu.regexp;
+import java.io.Reader;
+import java.io.BufferedReader;
+import java.io.IOException;
+
+// TODO: move(x) shouldn't rely on calling next() x times
+
+class CharIndexedReader implements CharIndexed {
+    private static final int BUFFER_INCREMENT = 1024;
+    private static final int UNKNOWN = Integer.MAX_VALUE; // value for end
+    
+    private final BufferedReader br;
+    // so that we don't try to reset() right away
+    private int index = -1;
+
+    private int bufsize = BUFFER_INCREMENT;
+
+    private int end = UNKNOWN;
+
+    private char cached = OUT_OF_BOUNDS;
+
+    // Big enough for a \r\n pair
+    // lookBehind[0] = most recent
+    // lookBehind[1] = second most recent
+    private char[] lookBehind = new char[] { OUT_OF_BOUNDS, OUT_OF_BOUNDS }; 
+  
+    CharIndexedReader(Reader reader, int index) {
+	if (reader instanceof BufferedReader) {
+	    br = (BufferedReader) reader; 
+	} else {
+	    br = new BufferedReader(reader,BUFFER_INCREMENT);
+	}
+	next();
+	if (index > 0) move(index);
+    }
+    
+    private boolean next() {
+	lookBehind[1] = lookBehind[0];
+	lookBehind[0] = cached;
+
+	if (end == 1) {
+	    cached = OUT_OF_BOUNDS;
+	    return false;
+	}
+	end--; // closer to end
+	
+	try {
+	    if (index != -1) {
+		br.reset();
+	    }
+	    int i = br.read();
+	    br.mark(bufsize);
+	    if (i == -1) {
+		end = 1;
+		cached = OUT_OF_BOUNDS;
+		return false;
+	    }
+
+	    // convert the byte read into a char
+	    cached = (char) i;
+	    index = 1;
+	} catch (IOException e) { 
+	    e.printStackTrace();
+	    cached = OUT_OF_BOUNDS;
+	    return false; 
+	}
+	return true;
+    }
+    
+    public char charAt(int index) {
+	if (index == 0) {
+	    return cached;
+	} else if (index >= end) {
+	    return OUT_OF_BOUNDS;
+	} else if (index >= bufsize) {
+	    // Allocate more space in the buffer.
+	    try {
+		while (bufsize <= index) bufsize += BUFFER_INCREMENT;
+		br.reset();
+		br.mark(bufsize);
+		br.skip(index-1);
+	    } catch (IOException e) { }
+	} else if (this.index != index) {
+	    try {
+		br.reset();
+		br.skip(index-1);
+	    } catch (IOException e) { }
+	} else if (index == -1) {
+	    return lookBehind[0];
+	} else if (index == -2) {
+	    return lookBehind[1];
+	} else if (index < -2) {
+	    return OUT_OF_BOUNDS;
+	}
+
+	char ch = OUT_OF_BOUNDS;
+	
+	try {
+	    int i = br.read();
+	    this.index = index+1; // this.index is index of next pos relative to charAt(0)
+	    if (i == -1) {
+		// set flag that next should fail next time?
+		end = index;
+		return ch;
+	    }
+	    ch = (char) i;
+	} catch (IOException ie) { }
+	
+	return ch;
+    }
+    
+    public boolean move(int index) {
+	// move read position [index] clicks from 'charAt(0)'
+	boolean retval = true;
+	while (retval && (index-- > 0)) retval = next();
+	return retval;
+    }
+    
+    public boolean isValid() {
+	return (cached != OUT_OF_BOUNDS);
+    }
+}

libjava/gnu/regexp/CharIndexedString.java

+/* gnu/regexp/CharIndexedString.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+import java.io.Serializable;
+
+class CharIndexedString implements CharIndexed, Serializable {
+    private String s;
+    private int anchor;
+    private int len;
+    
+    CharIndexedString(String str, int index) {
+	s = str;
+	len = s.length();
+	anchor = index;
+    }
+
+    public char charAt(int index) {
+	int pos = anchor + index;
+	return ((pos < len) && (pos >= 0)) ? s.charAt(pos) : OUT_OF_BOUNDS;
+    }
+    
+    public boolean isValid() {
+	return (anchor < len);
+    }
+    
+    public boolean move(int index) {
+	return ((anchor += index) < len);
+    }
+}

libjava/gnu/regexp/CharIndexedStringBuffer.java

+/* gnu/regexp/CharIndexedStringBuffer.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+import java.io.Serializable;
+
+class CharIndexedStringBuffer implements CharIndexed, Serializable {
+    private StringBuffer s;
+    private int anchor;
+
+    CharIndexedStringBuffer(StringBuffer str, int index) {
+	s = str;
+	anchor = index;
+    }
+
+  public char charAt(int index) {
+      int pos = anchor + index;
+    return ((pos < s.length()) && (pos >= 0)) ? s.charAt(pos) : OUT_OF_BOUNDS;
+  }
+
+  public boolean isValid() {
+    return (anchor < s.length());
+  }
+
+  public boolean move(int index) {
+    return ((anchor += index) < s.length());
+  }
+}

libjava/gnu/regexp/MessagesBundle.properties

+# Localized error messages for gnu.regexp
+
+# Prefix for REException messages
+error.prefix=At position {0} in regular expression pattern:
+
+# REException (parse error) messages
+repeat.assertion=repeated token is zero-width assertion
+repeat.chained=attempted to repeat a token that is already repeated
+repeat.no.token=quantifier (?*+{}) without preceding token
+repeat.empty.token=repeated token may be empty
+unmatched.brace=unmatched brace
+unmatched.bracket=unmatched bracket
+unmatched.paren=unmatched parenthesis
+interval.no.end=expected end of interval
+class.no.end=expected end of character class
+subexpr.no.end=expected end of subexpression
+interval.order=interval minimum is greater than maximum
+interval.error=interval is empty or contains illegal characters
+ends.with.backslash=backslash at end of pattern
+
+# RESyntax message
+syntax.final=Syntax has been declared final and cannot be modified

libjava/gnu/regexp/MessagesBundle_fr.properties

+# Localized error messages for gnu.regexp
+
+# Prefix for REException messages
+error.prefix=A l''index {0} dans le modle d''expression rgulire:
+
+# REException (parse error) messages
+repeat.assertion=l'lment rpt est de largeur zro
+repeat.chained=tentative de rptition d'un lment dj rpt
+repeat.no.token=quantifieur (?*+{}) sans lment prcdent
+repeat.empty.token=l'lment rpt peut tre vide
+unmatched.brace=accolade ingale
+unmatched.bracket=crochet ingal
+unmatched.paren=parenthse ingale
+interval.no.end=fin d'interval attendue
+class.no.end=fin de classe de caractres attendue
+subexpr.no.end=fin de sous-expression attendue
+interval.order=l'interval minimum est suprieur  l'interval maximum
+interval.error=l'interval est vide ou contient des caractres illgaux
+ends.with.backslash=antislash  la fin du modle
+
+# RESyntax message
+syntax.final=La syntaxe a t dclare finale et ne peut pas tre modifie

libjava/gnu/regexp/REException.java

+/* gnu/regexp/REException.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+import java.text.MessageFormat;
+
+/**
+ * This is the regular expression exception class.  An exception of this type
+ * defines the three attributes:
+ * <OL>
+ * <LI> A descriptive message of the error.
+ * <LI> An integral type code equivalent to one of the statically
+ *      defined symbols listed below.
+ * <LI> The approximate position in the input string where the error
+ *      occurred.
+ * </OL>
+ *
+ * @author <A HREF="mailto:wes@cacas.org">Wes Biggs</A>
+ */
+
+public class REException extends Exception {
+  private int type;
+  private int pos;
+
+  // Error conditions from GNU regcomp(3) manual
+
+  /**
+   * Error flag.
+   * Invalid use of repetition operators such  as  using
+   * `*' as the first character.
+   */
+  public static final int REG_BADRPT  =  1;
+
+  /**
+   * Error flag.
+   * Invalid use of back reference operator.
+   */
+  public static final int REG_BADBR   =  2;
+
+  /**
+   * Error flag.
+   * Un-matched brace interval operators.
+   */
+  public static final int REG_EBRACE  =  3;
+
+  /**
+   * Error flag.
+   * Un-matched bracket list operators.
+   */
+  public static final int REG_EBRACK  =  4;
+
+  /**
+   * Error flag.
+   * Invalid  use  of the range operator, eg. the ending
+   * point of the range occurs  prior  to  the  starting
+   * point.
+   */
+  public static final int REG_ERANGE  =  5;
+
+  /**
+   * Error flag.
+   * Unknown character class name. <B>Not implemented</B>.
+   */
+  public static final int REG_ECTYPE  =  6;
+
+  /**
+   * Error flag.
+   * Un-matched parenthesis group operators.
+   */
+  public static final int REG_EPAREN  =  7;
+
+  /**
+   * Error flag.
+   * Invalid back reference to a subexpression.
+   */
+  public static final int REG_ESUBREG =  8;
+
+  /**
+   * Error flag.
+   * Non specific error. <B>Not implemented</B>.
+   */
+  public static final int REG_EEND    =  9;
+
+  /**
+   * Error flag.
+   * Invalid escape sequence. <B>Not implemented</B>.
+   */
+  public static final int REG_ESCAPE  = 10;
+
+  /**
+   * Error flag.
+   * Invalid  use  of pattern operators such as group or list.
+   */
+  public static final int REG_BADPAT  = 11;
+
+  /**
+   * Error flag.
+   * Compiled  regular  expression  requires  a  pattern
+   * buffer larger than 64Kb. <B>Not implemented</B>.
+   */
+  public static final int REG_ESIZE   = 12;
+
+  /**
+   * Error flag.
+   * The regex routines ran out of memory. <B>Not implemented</B>.
+   */
+  public static final int REG_ESPACE  = 13;
+
+  REException(String msg, int type, int position) { 
+    super(msg); 
+    this.type = type;
+    this.pos = position;
+  }
+
+  /**
+   * Returns the type of the exception, one of the constants listed above.
+   */
+
+  public int getType() {
+    return type;
+  }
+
+  /**
+   * Returns the position, relative to the string or character array being
+   * compiled, where the error occurred.  This position is generally the point
+   * where the error was detected, not necessarily the starting index of
+   * a bad subexpression.
+   */
+  public int getPosition() {
+    return pos;
+  }
+
+  /**
+   * Reports the descriptive message associated with this exception
+   * as well as its index position in the string or character array
+   * being compiled.
+   */
+  public String getMessage() {
+    Object[] args = {new Integer(pos)};
+    StringBuffer sb = new StringBuffer();
+    String prefix = RE.getLocalizedMessage("error.prefix");
+    sb.append(MessageFormat.format(prefix, args));
+    sb.append('\n');
+    sb.append(super.getMessage());
+    return sb.toString();
+  }
+}

libjava/gnu/regexp/REFilterInputStream.java

+/* gnu/regexp/REFilterInputStream.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+import java.io.FilterInputStream;
+import java.io.InputStream;
+
+/**
+ * Replaces instances of a given RE found within an InputStream
+ * with replacement text.   The replacements are interpolated into the
+ * stream when a match is found.
+ *
+ * @author <A HREF="mailto:wes@cacas.org">Wes Biggs</A>
+ * @deprecated This class cannot properly handle all character
+ *             encodings.  For proper handling, use the REFilterReader
+ *             class instead.
+ */
+
+public class REFilterInputStream extends FilterInputStream {
+
+    private RE expr;
+    private String replace;
+    private String buffer;
+    private int bufpos;
+    private int offset;
+    private CharIndexedInputStream stream;
+
+  /**
+   * Creates an REFilterInputStream.  When reading from this stream,
+   * occurrences of patterns matching the supplied regular expression
+   * will be replaced with the supplied replacement text (the
+   * metacharacters $0 through $9 may be used to refer to the full
+   * match or subexpression matches).
+   *
+   * @param stream The InputStream to be filtered.
+   * @param expr The regular expression to search for.
+   * @param replace The text pattern to replace matches with.  
+   */
+  public REFilterInputStream(InputStream stream, RE expr, String replace) {
+    super(stream);
+    this.stream = new CharIndexedInputStream(stream,0);
+    this.expr = expr;
+    this.replace = replace;
+  }
+
+  /**
+   * Reads the next byte from the stream per the general contract of
+   * InputStream.read().  Returns -1 on error or end of stream.
+   */
+  public int read() {
+    // If we have buffered replace data, use it.
+    if ((buffer != null) && (bufpos < buffer.length())) {
+      return (int) buffer.charAt(bufpos++);
+    }
+
+    // check if input is at a valid position
+    if (!stream.isValid()) return -1;
+
+    REMatch mymatch = new REMatch(expr.getNumSubs(),offset,0);
+    if (expr.match(stream, mymatch)) {
+      mymatch.end[0] = mymatch.index;
+      mymatch.finish(stream);
+      stream.move(mymatch.toString().length());
+      offset += mymatch.toString().length();
+      buffer = mymatch.substituteInto(replace);
+      bufpos = 1;
+
+      // This is prone to infinite loops if replace string turns out empty.
+      if (buffer.length() > 0) {
+	  return buffer.charAt(0);
+      }
+    }
+    char ch = stream.charAt(0);
+    if (ch == CharIndexed.OUT_OF_BOUNDS) return -1;
+    stream.move(1);
+    offset++;
+    return ch;
+  }
+
+  /** 
+   * Returns false.  REFilterInputStream does not support mark() and
+   * reset() methods. 
+   */
+  public boolean markSupported() {
+    return false;
+  }
+
+  /** Reads from the stream into the provided array. */
+  public int read(byte[] b, int off, int len) {
+    int i;
+    int ok = 0;
+    while (len-- > 0) {
+      i = read();
+      if (i == -1) return (ok == 0) ? -1 : ok;
+      b[off++] = (byte) i;
+      ok++;
+    }
+    return ok;
+  }
+
+  /** Reads from the stream into the provided array. */
+  public int read(byte[] b) {
+    return read(b,0,b.length);
+  }
+}

libjava/gnu/regexp/REFilterReader.java

+/*
+ *  gnu/regexp/REFilterReader.java
+ *  Copyright (C) 2001 Lee Sau Dan
+ *  Based on gnu.regexp.REFilterInputStream by Wes Biggs
+ *
+ *  This library is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published
+ *  by the Free Software Foundation; either version 2.1 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This library 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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package gnu.regexp;
+import java.io.FilterReader;
+import java.io.Reader;
+
+/**
+ * Replaces instances of a given RE with replacement text. 
+ *
+ * @author <A HREF="http://www.csis.hku.hk/~sdlee/">Lee Sau Dan</A>
+ * @since gnu.regexp 1.1.0
+ */
+
+public class REFilterReader extends FilterReader {
+
+  private RE expr;
+  private String replace;
+  private String buffer;
+  private int bufpos;
+  private int offset;
+  private CharIndexedReader stream;
+
+  /**
+   * Creates an REFilterReader.  When reading from this stream,
+   * occurrences of patterns matching the supplied regular expression
+   * will be replaced with the supplied replacement text (the
+   * metacharacters $0 through $9 may be used to refer to the full
+   * match or subexpression matches.
+   *
+   * @param stream The Reader to be filtered.
+   * @param expr The regular expression to search for.
+   * @param replace The text pattern to replace matches with.  
+   */
+  public REFilterReader(Reader stream, RE expr, String replace) {
+    super(stream);
+    this.stream = new CharIndexedReader(stream,0);
+    this.expr = expr;
+    this.replace = replace;
+  }
+
+  /**
+   * Reads the next character from the stream per the general contract of
+   * Reader.read().  Returns -1 on error or end of stream.
+   */
+  public int read() {
+    // If we have buffered replace data, use it.
+    if ((buffer != null) && (bufpos < buffer.length())) {
+      return (int) buffer.charAt(bufpos++);
+    }
+
+    // check if input is at a valid position
+    if (!stream.isValid()) return -1;
+
+    REMatch mymatch = new REMatch(expr.getNumSubs(),offset,0);
+    if (expr.match(stream,mymatch)) {
+      mymatch.end[0] = mymatch.index;
+      mymatch.finish(stream);
+      stream.move(mymatch.toString().length());
+      offset += mymatch.toString().length();
+      buffer = mymatch.substituteInto(replace);
+      bufpos = 1;
+
+      if (buffer.length() > 0) {
+	  return buffer.charAt(0);
+      }
+    }
+    char ch = stream.charAt(0);
+    if (ch == CharIndexed.OUT_OF_BOUNDS) return -1;
+    stream.move(1);
+    offset++;
+    return ch;
+  }
+
+  /** 
+   * Returns false.  REFilterReader does not support mark() and
+   * reset() methods. 
+   */
+  public boolean markSupported() {
+    return false;
+  }
+
+  /** Reads from the stream into the provided array. */
+  public int read(char[] b, int off, int len) {
+    int i;
+    int ok = 0;
+    while (len-- > 0) {
+      i = read();
+      if (i == -1) return (ok == 0) ? -1 : ok;
+      b[off++] = (char) i;
+      ok++;
+    }
+    return ok;
+  }
+
+  /** Reads from the stream into the provided array. */
+  public int read(char[] b) {
+    return read(b,0,b.length);
+  }
+}

libjava/gnu/regexp/REMatch.java

+/* gnu/regexp/REMatch.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+import java.io.Serializable;
+
+/**
+ * An instance of this class represents a match
+ * completed by a gnu.regexp matching function. It can be used
+ * to obtain relevant information about the location of a match
+ * or submatch.
+ *
+ * @author <A HREF="mailto:wes@cacas.org">Wes Biggs</A>
+ */
+public final class REMatch implements Serializable, Cloneable {
+    private String matchedText;
+
+    // These variables are package scope for fast access within the engine
+    int eflags; // execution flags this match was made using
+
+    // Offset in source text where match was tried.  This is zero-based;
+    // the actual position in the source text is given by (offset + anchor).
+    int offset;
+
+    // Anchor position refers to the index into the source input
+    // at which the matching operation began.
+    // This is also useful for the ANCHORINDEX option.
+    int anchor;
+
+    // Package scope; used by RE.
+    int index; // used while matching to mark current match position in input
+    int[] start; // start positions (relative to offset) for each (sub)exp.
+    int[] end;   // end positions for the same
+    REMatch next; // other possibility (to avoid having to use arrays)
+
+    public Object clone() {
+	try {
+	    REMatch copy = (REMatch) super.clone();
+	    copy.next = null;
+
+	    copy.start = (int[]) start.clone();
+	    copy.end = (int[]) end.clone();
+
+	    return copy;
+	} catch (CloneNotSupportedException e) {
+	    throw new Error(); // doesn't happen
+	}
+    }
+
+    void assignFrom(REMatch other) {
+	start = other.start;
+	end = other.end;
+	index = other.index;
+	// need to deep clone?
+	next = other.next;
+    }
+
+    REMatch(int subs, int anchor, int eflags) {
+	start = new int[subs+1];
+	end = new int[subs+1];
+	this.anchor = anchor;
+	this.eflags = eflags;
+	clear(anchor);
+    }
+
+    void finish(CharIndexed text) {
+	start[0] = 0;
+	StringBuffer sb = new StringBuffer();
+	int i;
+	for (i = 0; i < end[0]; i++)
+	    sb.append(text.charAt(i));
+	matchedText = sb.toString();
+	for (i = 0; i < start.length; i++) {
+	    // If any subexpressions didn't terminate, they don't count
+	    // TODO check if this code ever gets hit
+	    if ((start[i] == -1) ^ (end[i] == -1)) {
+		start[i] = -1;
+		end[i] = -1;
+	    }
+	}
+	next = null; // cut off alternates
+    }
+    
+    /** Clears the current match and moves the offset to the new index. */
+    void clear(int index) {
+	offset = index;
+	this.index = 0;
+	for (int i = 0; i < start.length; i++) {
+	    start[i] = end[i] = -1;
+	}
+	next = null; // cut off alternates
+    }
+    
+    /**
+     * Returns the string matching the pattern.  This makes it convenient
+     * to write code like the following:
+     * <P>
+     * <code> 
+     * REMatch myMatch = myExpression.getMatch(myString);<br>
+     * if (myMatch != null) System.out.println("Regexp found: "+myMatch);
+     * </code>
+     */
+    public String toString() {
+	return matchedText;
+    }
+    
+    /**
+     * Returns the index within the input text where the match in its entirety
+     * began.
+     */
+    public int getStartIndex() {
+	return offset + start[0];
+    }
+    
+    /**
+     * Returns the index within the input string where the match in
+     * its entirety ends.  The return value is the next position after
+     * the end of the string; therefore, a match created by the
+     * following call:
+     *
+     * <P>
+     * <code>REMatch myMatch = myExpression.getMatch(myString);</code>
+     * <P>
+     * can be viewed (given that myMatch is not null) by creating
+     * <P>
+     * <code>String theMatch = myString.substring(myMatch.getStartIndex(),
+     * myMatch.getEndIndex());</code>
+     * <P>
+     * But you can save yourself that work, since the <code>toString()</code>
+     * method (above) does exactly that for you.  
+     */
+    public int getEndIndex() {
+	return offset + end[0];
+    }
+  
+    /**
+     * Returns the string matching the given subexpression.  The subexpressions
+     * are indexed starting with one, not zero.  That is, the subexpression
+     * identified by the first set of parentheses in a regular expression
+     * could be retrieved from an REMatch by calling match.toString(1).
+     *
+     * @param sub Index of the subexpression.
+     */
+    public String toString(int sub) {
+	if ((sub >= start.length) || (start[sub] == -1)) return "";
+	return (matchedText.substring(start[sub],end[sub]));
+    }
+    
+    /** 
+     * Returns the index within the input string used to generate this match
+     * where subexpression number <i>sub</i> begins, or <code>-1</code> if
+     * the subexpression does not exist.  The initial position is zero.
+     *
+     * @param sub Subexpression index
+     * @deprecated Use getStartIndex(int) instead.
+     */
+    public int getSubStartIndex(int sub) {
+	if (sub >= start.length) return -1;
+	int x = start[sub];
+	return (x == -1) ? x : offset + x;
+    }
+    
+    /** 
+     * Returns the index within the input string used to generate this match
+     * where subexpression number <i>sub</i> begins, or <code>-1</code> if
+     * the subexpression does not exist.  The initial position is zero.
+     *
+     * @param sub Subexpression index
+     * @since gnu.regexp 1.1.0
+     */
+    public int getStartIndex(int sub) {
+	if (sub >= start.length) return -1;
+	int x = start[sub];
+	return (x == -1) ? x : offset + x;
+    }
+  
+    /** 
+     * Returns the index within the input string used to generate this match
+     * where subexpression number <i>sub</i> ends, or <code>-1</code> if
+     * the subexpression does not exist.  The initial position is zero.
+     *
+     * @param sub Subexpression index
+     * @deprecated Use getEndIndex(int) instead
+     */
+    public int getSubEndIndex(int sub) {
+	if (sub >= start.length) return -1;
+	int x = end[sub];
+	return (x == -1) ? x : offset + x;
+    }
+    
+    /** 
+     * Returns the index within the input string used to generate this match
+     * where subexpression number <i>sub</i> ends, or <code>-1</code> if
+     * the subexpression does not exist.  The initial position is zero.
+     *
+     * @param sub Subexpression index
+     */
+    public int getEndIndex(int sub) {
+	if (sub >= start.length) return -1;
+	int x = end[sub];
+	return (x == -1) ? x : offset + x;
+    }
+    
+    /**
+     * Substitute the results of this match to create a new string.
+     * This is patterned after PERL, so the tokens to watch out for are
+     * <code>$0</code> through <code>$9</code>.  <code>$0</code> matches
+     * the full substring matched; <code>$<i>n</i></code> matches
+     * subexpression number <i>n</i>.
+     *
+     * @param input A string consisting of literals and <code>$<i>n</i></code> tokens.
+     */
+    public String substituteInto(String input) {
+	// a la Perl, $0 is whole thing, $1 - $9 are subexpressions
+	StringBuffer output = new StringBuffer();
+	int pos;
+	for (pos = 0; pos < input.length()-1; pos++) {
+	    if ((input.charAt(pos) == '$') && (Character.isDigit(input.charAt(pos+1)))) {
+		int val = Character.digit(input.charAt(++pos),10);
+		if (val < start.length) {
+		    output.append(toString(val));
+		} 
+	    } else output.append(input.charAt(pos));
+	}
+	if (pos < input.length()) output.append(input.charAt(pos));
+	return output.toString();
+    }
+}

libjava/gnu/regexp/REMatchEnumeration.java

+/* gnu/regexp/REMatchEnumeration.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+import java.io.Serializable;
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+
+/**
+ * An REMatchEnumeration enumerates regular expression matches over a
+ * given input text.  You obtain a reference to an enumeration using
+ * the <code>getMatchEnumeration()</code> methods on an instance of
+ * RE. 
+ *
+ * <P>
+ *
+ * REMatchEnumeration does lazy computation; that is, it will not
+ * search for a match until it needs to.  If you'd rather just get all
+ * the matches at once in a big array, use the
+ * <code>getAllMatches()</code> methods on RE.  However, using an
+ * enumeration can help speed performance when the entire text does
+ * not need to be searched immediately.
+ *
+ * <P>
+ * 
+ * The enumerated type is especially useful when searching on a Reader
+ * or InputStream, because the InputStream read position cannot be
+ * guaranteed after calling <code>getMatch()</code> (see the
+ * description of that method for an explanation of why).  Enumeration
+ * also saves a lot of overhead required when calling
+ * <code>getMatch()</code> multiple times.
+ * 
+ * @author <A HREF="mailto:wes@cacas.org">Wes Biggs</A> 
+ */
+public class REMatchEnumeration implements Enumeration, Serializable {
+  private static final int YES = 1;
+  private static final int MAYBE = 0;
+  private static final int NO = -1;
+  
+  private int more;
+  private REMatch match;
+  private RE expr;
+  private CharIndexed input;
+  private int eflags;
+    private int index;
+
+  // Package scope constructor is used by RE.getMatchEnumeration()
+  REMatchEnumeration(RE expr, CharIndexed input, int index, int eflags) {
+    more = MAYBE;
+    this.expr = expr;
+    this.input = input;
+    this.index = index;
+    this.eflags = eflags;
+  }
+
+  /** Returns true if there are more matches in the input text. */
+  public boolean hasMoreElements() {
+    return hasMoreMatches(null);
+  }
+
+  /** Returns true if there are more matches in the input text. */
+  public boolean hasMoreMatches() {
+    return hasMoreMatches(null);
+  }
+
+  /** Returns true if there are more matches in the input text.
+   * Saves the text leading up to the match (or to the end of the input)
+   * in the specified buffer.
+   */
+  public boolean hasMoreMatches(StringBuffer buffer) {
+    if (more == MAYBE) {
+	match = expr.getMatchImpl(input,index,eflags,buffer);
+	if (match != null) {
+	    input.move((match.end[0] > 0) ? match.end[0] : 1);
+	    
+	    index = (match.end[0] > 0) ? match.end[0] + match.offset : index + 1;
+	    more = YES;
+	} else more = NO;
+    }
+    return (more == YES);
+  }
+
+  /** Returns the next match in the input text. */
+  public Object nextElement() throws NoSuchElementException {
+    return nextMatch();
+  }
+
+  /** 
+   * Returns the next match in the input text. This method is provided
+   * for convenience to avoid having to explicitly cast the return value
+   * to class REMatch.
+   */
+  public REMatch nextMatch() throws NoSuchElementException {
+    if (hasMoreElements()) {
+	more = (input.isValid()) ? MAYBE : NO;
+	return match;
+    }
+    throw new NoSuchElementException();
+  }
+}
+

libjava/gnu/regexp/REToken.java

+/* gnu/regexp/REToken.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+import java.io.Serializable;
+
+abstract class REToken implements Serializable {
+
+  protected REToken next = null;
+  protected REToken uncle = null;
+  protected int subIndex;
+
+  protected REToken(int subIndex) {
+      this.subIndex = subIndex;
+  }
+
+  int getMinimumLength() {
+    return 0;
+  }
+
+  void setUncle(REToken anUncle) {
+    uncle = anUncle;
+  }
+
+    /** Returns true if the match succeeded, false if it failed. */
+    abstract boolean match(CharIndexed input, REMatch mymatch);
+  
+    /** Returns true if the rest of the tokens match, false if they fail. */
+    protected boolean next(CharIndexed input, REMatch mymatch) {
+	if (next == null) {
+	    if (uncle == null) {
+		return true;
+	    } else {
+		return uncle.match(input, mymatch);
+	    }
+	} else {
+	    return next.match(input, mymatch);
+	}
+    }
+  
+  boolean chain(REToken token) {
+      next = token;
+      return true; // Token was accepted
+  }
+
+    abstract void dump(StringBuffer os);
+
+  void dumpAll(StringBuffer os) {
+    dump(os);
+    if (next != null) next.dumpAll(os);
+  }
+}

libjava/gnu/regexp/RETokenAny.java

+/* gnu/regexp/RETokenAny.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+final class RETokenAny extends REToken {
+  /** True if '.' can match a newline (RE_DOT_NEWLINE) */
+  private boolean newline; 
+
+  /** True if '.' can't match a null (RE_DOT_NOT_NULL) */
+  private boolean matchNull;    
+  
+  RETokenAny(int subIndex, boolean newline, boolean matchNull) { 
+    super(subIndex);
+    this.newline = newline;
+    this.matchNull = matchNull;
+  }
+
+  int getMinimumLength() {
+    return 1;
+  }
+
+    boolean match(CharIndexed input, REMatch mymatch) {
+    char ch = input.charAt(mymatch.index);
+    if ((ch == CharIndexed.OUT_OF_BOUNDS)
+	|| (!newline && (ch == '\n'))
+	|| (matchNull && (ch == 0))) {
+	return false;
+    }
+    ++mymatch.index;
+    return next(input, mymatch);
+  }
+
+  void dump(StringBuffer os) {
+    os.append('.');
+  }
+}
+

libjava/gnu/regexp/RETokenBackRef.java

+/* gnu/regexp/RETokenBackRef.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+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?
+
+    boolean match(CharIndexed input, REMatch mymatch) {
+	int b,e;
+	b = mymatch.start[num];
+	e = mymatch.end[num];
+	if ((b==-1)||(e==-1)) return false; // this shouldn't happen, but...
+	for (int i=b; i<e; i++) {
+	    if (input.charAt(mymatch.index+i-b) != input.charAt(i)) {
+		return false;
+	    }
+	}
+	mymatch.index += e-b;
+	return next(input, mymatch);
+    }
+    
+    void dump(StringBuffer os) {
+	os.append('\\').append(num);
+    }
+}
+
+

libjava/gnu/regexp/RETokenChar.java

+/* gnu/regexp/RETokenChar.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+final class RETokenChar extends REToken {
+  private char[] ch;
+  private boolean insens;
+
+  RETokenChar(int subIndex, char c, boolean ins) {
+    super(subIndex);
+    ch = new char [1];
+    ch[0] = (insens = ins) ? Character.toLowerCase(c) : c;
+  }
+
+  int getMinimumLength() {
+    return ch.length;
+  }
+  
+    boolean match(CharIndexed input, REMatch mymatch) {
+	int z = ch.length;
+	char c;
+	for (int i=0; i<z; i++) {
+	    c = input.charAt(mymatch.index+i);
+	    if (( (insens) ? Character.toLowerCase(c) : c ) != ch[i]) {
+		return false;
+	    }
+	}
+	mymatch.index += z;
+
+	return next(input, mymatch);
+    }
+
+  // Overrides REToken.chain() to optimize for strings
+  boolean chain(REToken next) {
+    if (next instanceof RETokenChar) {
+      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];
+      
+      System.arraycopy(ch,0,chTemp,0,ch.length);
+      System.arraycopy(cnext.ch,0,chTemp,ch.length,cnext.ch.length);
+      
+      ch = chTemp;
+      return false;
+    } else return super.chain(next);
+  }
+
+  void dump(StringBuffer os) {
+    os.append(ch);
+  }
+}
+
+

libjava/gnu/regexp/RETokenEnd.java

+/* gnu/regexp/RETokenEnd.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+final class RETokenEnd extends REToken {
+    /**
+     * Indicates whether this token should match on a line break.
+     */
+  private String newline;
+
+  RETokenEnd(int subIndex,String newline) { 
+    super(subIndex);
+    this.newline = newline;
+  }
+
+    boolean match(CharIndexed input, REMatch mymatch) {
+	char ch = input.charAt(mymatch.index);
+	if (ch == CharIndexed.OUT_OF_BOUNDS)
+	    return ((mymatch.eflags & RE.REG_NOTEOL)>0) ? 
+		false : next(input, mymatch);
+	if (newline != null) {
+	    char z;
+	    int i = 0; // position in newline
+	    do {
+		z = newline.charAt(i);
+		if (ch != z) return false;
+		++i;
+		ch = input.charAt(mymatch.index + i);
+	    } while (i < newline.length());
+	    
+	    return next(input, mymatch);
+	}
+	return false;
+    }
+
+  void dump(StringBuffer os) {
+    os.append('$');
+  }
+}

libjava/gnu/regexp/RETokenEndSub.java

+/* gnu/regexp/RETokenEndSub.java
+   Copyright (C) 2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+final class RETokenEndSub extends REToken {
+    RETokenEndSub(int subIndex) {
+	super(subIndex);
+    }
+    
+    boolean match(CharIndexed input, REMatch mymatch) {
+	mymatch.end[subIndex] = mymatch.index;
+	return next(input, mymatch);
+    }
+    
+    void dump(StringBuffer os) {
+	// handled by RE
+    }
+}

libjava/gnu/regexp/RETokenLookAhead.java

+/*
+ *  gnu/regexp/RETokenOneOf.java
+ *  Copyright (C) 1998-2001 Wes Biggs
+ *
+ *  This library is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published
+ *  by the Free Software Foundation; either version 2.1 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This library 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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package gnu.regexp;
+
+/**
+ * @since gnu.regexp 1.1.3
+ * @author Shashank Bapat
+ */
+final class RETokenLookAhead extends REToken
+{
+  REToken re;
+  boolean negative;
+
+  RETokenLookAhead(REToken re, boolean negative) throws REException {
+    super(0);
+    this.re = re;
+    this.negative = negative;
+  }
+
+  boolean match(CharIndexed input, REMatch mymatch)
+  {
+    REMatch trymatch = (REMatch)mymatch.clone();
+    REMatch trymatch1 = (REMatch)mymatch.clone();
+    REMatch newMatch = null;
+    if (re.match(input, trymatch)) {
+      if (negative) return false;
+      if (next(input, trymatch1))
+        newMatch = trymatch1;
+    }
+
+    if (newMatch != null) {
+      if (negative) return false;
+      //else
+      mymatch.assignFrom(newMatch);
+      return true;
+    }
+    else { // no match
+      if (negative)
+        return next(input, mymatch);
+      //else
+      return false;
+    }
+  }
+
+    void dump(StringBuffer os) {
+	os.append("(?");
+	os.append(negative ? '!' : '=');
+	re.dumpAll(os);
+	os.append(')');
+    }
+}
+

libjava/gnu/regexp/RETokenOneOf.java

+/* gnu/regexp/RETokenOneOf.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+import java.util.Vector;
+
+final class RETokenOneOf extends REToken {
+  private Vector options;
+  private boolean negative;
+
+  // This constructor is used for convenience when we know the set beforehand,
+  // e.g. \d --> new RETokenOneOf("0123456789",false, ..)
+  //      \D --> new RETokenOneOf("0123456789",true, ..)
+
+  RETokenOneOf(int subIndex, String optionsStr, boolean negative, boolean insens) {
+    super(subIndex);
+    options = new Vector();
+    this.negative = negative;
+    for (int i = 0; i < optionsStr.length(); i++)
+      options.addElement(new RETokenChar(subIndex,optionsStr.charAt(i),insens));
+  }
+
+  RETokenOneOf(int subIndex, Vector options, boolean negative) {
+    super(subIndex);
+    this.options = options;
+    this.negative = negative;
+  }
+
+  int getMinimumLength() {
+    int min = Integer.MAX_VALUE;
+    int x;
+    for (int i=0; i < options.size(); i++) {
+      if ((x = ((REToken) options.elementAt(i)).getMinimumLength()) < min)
+	min = x;
+    }
+    return min;
+  }
+
+    boolean match(CharIndexed input, REMatch mymatch) {
+    if (negative && (input.charAt(mymatch.index) == CharIndexed.OUT_OF_BOUNDS)) 
+      return false;
+
+    REMatch newMatch = null;
+    REMatch last = null;
+    REToken tk;
+    boolean isMatch;
+    for (int i=0; i < options.size(); i++) {
+	tk = (REToken) options.elementAt(i);
+	REMatch tryMatch = (REMatch) mymatch.clone();
+	if (tk.match(input, tryMatch)) { // match was successful
+	    if (negative) return false;
+
+	    if (next(input, tryMatch)) {
+		// Add tryMatch to list of possibilities.
+		if (last == null) {
+		    newMatch = tryMatch;
+		    last = tryMatch;
+		} else {
+		    last.next = tryMatch;
+		    last = tryMatch;
+		}
+	    } // next succeeds
+	} // is a match
+    } // try next option
+
+    if (newMatch != null) {
+	if (negative) {
+	    return false;
+	} else {
+	    // set contents of mymatch equal to newMatch
+
+	    // try each one that matched
+	    mymatch.assignFrom(newMatch);
+	    return true;
+	}
+    } else {
+	if (negative) {
+	    ++mymatch.index;
+	    return next(input, mymatch);
+	} else {
+	    return false;
+	}
+    }
+
+    // index+1 works for [^abc] lists, not for generic lookahead (--> index)
+  }
+
+  void dump(StringBuffer os) {
+    os.append(negative ? "[^" : "(?:");
+    for (int i = 0; i < options.size(); i++) {
+      if (!negative && (i > 0)) os.append('|');
+      ((REToken) options.elementAt(i)).dumpAll(os);
+    }
+    os.append(negative ? ']' : ')');
+  }  
+}

libjava/gnu/regexp/RETokenPOSIX.java

+/* gnu/regexp/RETokenPOSIX.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+final class RETokenPOSIX extends REToken {
+  int type;
+  boolean insens;
+  boolean negated;
+
+  static final int  ALNUM = 0;
+  static final int  ALPHA = 1;
+  static final int  BLANK = 2;
+  static final int  CNTRL = 3;
+  static final int  DIGIT = 4;
+  static final int  GRAPH = 5;
+  static final int  LOWER = 6;
+  static final int  PRINT = 7;
+  static final int  PUNCT = 8;
+  static final int  SPACE = 9;
+  static final int  UPPER = 10;
+  static final int XDIGIT = 11;
+
+  // Array indices correspond to constants defined above.
+  static final String[] s_nameTable =  {
+    "alnum", "alpha", "blank", "cntrl", "digit", "graph", "lower",
+    "print", "punct", "space", "upper", "xdigit" 
+  };
+
+  // The RE constructor uses this to look up the constant for a string
+  static int intValue(String key) {
+    for (int i = 0; i < s_nameTable.length; i++) {
+      if (s_nameTable[i].equals(key)) return i;
+    }
+    return -1;
+  }
+
+  RETokenPOSIX(int subIndex, int type, boolean insens, boolean negated) {
+    super(subIndex);
+    this.type = type;
+    this.insens = insens;
+    this.negated = negated;
+  }
+
+    int getMinimumLength() {
+	return 1;
+    }
+
+    boolean match(CharIndexed input, REMatch mymatch) {
+    char ch = input.charAt(mymatch.index);
+    if (ch == CharIndexed.OUT_OF_BOUNDS)
+      return false;
+    
+    boolean retval = false;
+    switch (type) {
+    case ALNUM:
+	// Note that there is some debate over whether '_' should be included
+	retval = Character.isLetterOrDigit(ch) || (ch == '_');
+	break;
+    case ALPHA:
+	retval = Character.isLetter(ch);
+	break;
+    case BLANK:
+	retval = ((ch == ' ') || (ch == '\t'));
+	break;
+    case CNTRL:
+	retval = Character.isISOControl(ch);
+	break;
+    case DIGIT:
+	retval = Character.isDigit(ch);
+	break;
+    case GRAPH:
+	retval = (!(Character.isWhitespace(ch) || Character.isISOControl(ch)));
+	break;
+    case LOWER:
+	retval = ((insens && Character.isLetter(ch)) || Character.isLowerCase(ch));
+	break;
+    case PRINT:
+	retval = (!(Character.isWhitespace(ch) || Character.isISOControl(ch)))
+	    || (ch == ' ');
+	break;
+    case PUNCT:
+	// This feels sloppy, especially for non-U.S. locales.
+	retval = ("`~!@#$%^&*()-_=+[]{}\\|;:'\"/?,.<>".indexOf(ch)!=-1);
+	break;
+    case SPACE:
+	retval = Character.isWhitespace(ch);
+	break;
+    case UPPER:
+	retval = ((insens && Character.isLetter(ch)) || Character.isUpperCase(ch));
+	break;
+    case XDIGIT:
+	retval = (Character.isDigit(ch) || ("abcdefABCDEF".indexOf(ch)!=-1));
+	break;
+    }
+
+    if (negated) retval = !retval;
+    if (retval) {
+	++mymatch.index;
+	return next(input, mymatch);
+    }
+    else return false;
+  }
+
+  void dump(StringBuffer os) {
+    if (negated) os.append('^');
+    os.append("[:" + s_nameTable[type] + ":]");
+  }
+}

libjava/gnu/regexp/RETokenRange.java

+/* gnu/regexp/RETokenRange.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+final class RETokenRange extends REToken {
+  private char lo, hi;
+  private boolean insens;
+
+  RETokenRange(int subIndex, char lo, char hi, boolean ins) {
+    super(subIndex);
+    this.lo = (insens = ins) ? Character.toLowerCase(lo) : lo;
+    this.hi = ins ? Character.toLowerCase(hi) : hi;
+  }
+
+  int getMinimumLength() {
+    return 1;
+  }
+
+    boolean match(CharIndexed input, REMatch mymatch) {
+	char c = input.charAt(mymatch.index);
+	if (c == CharIndexed.OUT_OF_BOUNDS) return false;
+	if (insens) c = Character.toLowerCase(c);
+	if ((c >= lo) && (c <= hi)) {
+	    ++mymatch.index;
+	    return next(input, mymatch);
+	}
+	return false;
+    }
+    
+  void dump(StringBuffer os) {
+    os.append(lo).append('-').append(hi);
+  }
+}
+

libjava/gnu/regexp/RETokenRepeated.java

+/* gnu/regexp/RETokenRepeated.java
+   Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+import java.util.Vector;
+
+final class RETokenRepeated extends REToken {
+    private REToken token;
+    private int min,max;
+    private boolean stingy;
+    
+    RETokenRepeated(int subIndex, REToken token, int min, int max) {
+	super(subIndex);
+	this.token = token;
+	this.min = min;
+	this.max = max;
+    }
+
+    /** Sets the minimal matching mode to true. */
+    void makeStingy() {
+	stingy = true;
+    }
+    
+    /** Queries if this token has minimal matching enabled. */
+    boolean isStingy() {
+	return stingy;
+    }
+    
+    /**
+     * The minimum length of a repeated token is the minimum length
+     * of the token multiplied by the minimum number of times it must
+     * match.
+     */
+    int getMinimumLength() {
+	return (min * token.getMinimumLength());
+    }
+
+    // We do need to save every possible point, but the number of clone()
+    // invocations here is really a killer for performance on non-stingy
+    // repeat operators.  I'm open to suggestions...
+
+    // Hypothetical question: can you have a RE that matches 1 times,
+    // 3 times, 5 times, but not 2 times or 4 times?  Does having
+    // the subexpression back-reference operator allow that?
+
+    boolean match(CharIndexed input, REMatch mymatch) {
+	// number of times we've matched so far
+	int numRepeats = 0; 
+	
+	// Possible positions for the next repeat to match at
+	REMatch newMatch = mymatch;
+	REMatch last = null;
+	REMatch current;
+
+	// Add the '0-repeats' index
+	// positions.elementAt(z) == position [] in input after <<z>> matches
+	Vector positions = new Vector();
+	positions.addElement(newMatch);
+	
+	// Declare variables used in loop
+	REMatch doables;
+	REMatch doablesLast;
+	REMatch recurrent;
+
+	do {
+	    // Check for stingy match for each possibility.
+	    if (stingy && (numRepeats >= min)) {
+		REMatch result = matchRest(input, newMatch);
+		if (result != null) {
+		    mymatch.assignFrom(result);
+		    return true;
+		}
+	    }
+
+	    doables = null;
+	    doablesLast = null;
+
+	    // try next repeat at all possible positions
+	    for (current = newMatch; current != null; current = current.next) {
+		recurrent = (REMatch) current.clone();
+		if (token.match(input, recurrent)) {
+		    // add all items in current to doables array
+		    if (doables == null) {
+			doables = recurrent;
+			doablesLast = recurrent;
+		    } else {
+			// Order these from longest to shortest
+			// Start by assuming longest (more repeats)
+			doablesLast.next = recurrent;
+		    }
+		    // Find new doablesLast
+		    while (doablesLast.next != null) {
+			doablesLast = doablesLast.next;
+		    }
+		}
+	    }
+	    // if none of the possibilities worked out, break out of do/while
+	    if (doables == null) break;
+	    
+	    // reassign where the next repeat can match
+	    newMatch = doables;
+	    
+	    // increment how many repeats we've successfully found
+	    ++numRepeats;
+	    
+	    positions.addElement(newMatch);
+	} while (numRepeats < max);
+	
+	// If there aren't enough repeats, then fail
+	if (numRepeats < min) return false;
+	
+	// We're greedy, but ease off until a true match is found 
+	int posIndex = positions.size();
+	
+	// At this point we've either got too many or just the right amount.
+	// See if this numRepeats works with the rest of the regexp.
+	REMatch allResults = null;
+	REMatch allResultsLast = null;
+
+	REMatch results = null;
+	while (--posIndex >= min) {
+	    newMatch = (REMatch) positions.elementAt(posIndex);
+	    results = matchRest(input, newMatch);
+	    if (results != null) {
+		if (allResults == null) {
+		    allResults = results;
+		    allResultsLast = results;
+		} else {
+		    // Order these from longest to shortest
+		    // Start by assuming longest (more repeats)
+		    allResultsLast.next = results;
+		}
+		// Find new doablesLast
+		while (allResultsLast.next != null) {
+		    allResultsLast = allResultsLast.next;
+		}
+	    }
+	    // else did not match rest of the tokens, try again on smaller sample
+	}
+	if (allResults != null) {
+	    mymatch.assignFrom(allResults); // does this get all?
+	    return true;
+	}
+	// If we fall out, no matches.
+	return false;
+    }
+
+    private REMatch matchRest(CharIndexed input, final REMatch newMatch) {
+	REMatch current, single;
+	REMatch doneIndex = null;
+	REMatch doneIndexLast = null;
+	// Test all possible matches for this number of repeats
+	for (current = newMatch; current != null; current = current.next) {
+	    // clone() separates a single match from the chain
+	    single = (REMatch) current.clone();
+	    if (next(input, single)) {
+		// chain results to doneIndex
+		if (doneIndex == null) {
+		    doneIndex = single;
+		    doneIndexLast = single;
+		} else {
+		    doneIndexLast.next = single;
+		}
+		// Find new doneIndexLast
+		while (doneIndexLast.next != null) {
+		    doneIndexLast = doneIndexLast.next;
+		}
+	    }
+	}
+	return doneIndex;
+    }
+
+    void dump(StringBuffer os) {
+	os.append("(?:");
+	token.dumpAll(os);
+	os.append(')');
+	if ((max == Integer.MAX_VALUE) && (min <= 1))
+	    os.append( (min == 0) ? '*' : '+' );
+	else if ((min == 0) && (max == 1))
+	    os.append('?');
+	else {
+	    os.append('{').append(min);
+	    if (max > min) {
+		os.append(',');
+		if (max != Integer.MAX_VALUE) os.append(max);
+	    }
+	    os.append('}');
+	}
+	if (stingy) os.append('?');
+    }
+}

libjava/gnu/regexp/RETokenStart.java

+/*  gnu/regexp/RETokenStart.java
+    Copyright (C) 1998-2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+class RETokenStart extends REToken {
+    private String newline; // matches after a newline
+    
+    RETokenStart(int subIndex, String newline) {
+	super(subIndex);
+	this.newline = newline;
+    }
+    
+    boolean match(CharIndexed input, REMatch mymatch) {
+	// charAt(index-n) may be unknown on a Reader/InputStream. FIXME
+	// Match after a newline if in multiline mode
+	
+	if (newline != null) {
+	    int len = newline.length();
+	    if (mymatch.offset >= len) {
+		boolean found = true;
+		char z;
+		int i = 0; // position in REToken.newline
+		char ch = input.charAt(mymatch.index - len);
+		do {
+		    z = newline.charAt(i);
+		    if (ch != z) {
+			found = false;
+			break;
+		    }
+		    ++i;
+		    ch = input.charAt(mymatch.index - len + i);
+		} while (i < len);
+	    
+		if (found) return next(input, mymatch);
+	    }
+	}
+	
+	// Don't match at all if REG_NOTBOL is set.
+	if ((mymatch.eflags & RE.REG_NOTBOL) > 0) return false;
+	
+	if ((mymatch.eflags & RE.REG_ANCHORINDEX) > 0)
+	    return (mymatch.anchor == mymatch.offset) ? 
+		next(input, mymatch) : false;
+	else
+	    return ((mymatch.index == 0) && (mymatch.offset == 0)) ?
+		next(input, mymatch) : false;
+    }
+    
+    void dump(StringBuffer os) {
+	os.append('^');
+    }
+}

libjava/gnu/regexp/RETokenWordBoundary.java

+/* gnu/regexp/RETokenWordBoundary.java
+   Copyright (C) 2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+/**
+ * Represents a combination lookahead/lookbehind for POSIX [:alnum:].
+ */
+final class RETokenWordBoundary extends REToken {
+    private boolean negated;
+    private int where;
+    static final int BEGIN = 1;
+    static final int END = 2;
+
+    RETokenWordBoundary(int subIndex, int where, boolean negated) {
+	super(subIndex);
+	this.where = where;
+	this.negated = negated;
+    }
+    
+    boolean match(CharIndexed input, REMatch mymatch) {
+	// Word boundary means input[index-1] was a word character
+	// and input[index] is not, or input[index] is a word character
+	// and input[index-1] was not
+	//  In the string "one two three", these positions match:
+	//  |o|n|e| |t|w|o| |t|h|r|e|e|
+	//  ^     ^ ^     ^ ^         ^
+	boolean after = false;  // is current character a letter or digit?
+	boolean before = false; // is previous character a letter or digit?
+	char ch;
+
+	// TODO: Also check REG_ANCHORINDEX vs. anchor
+	if (((mymatch.eflags & RE.REG_ANCHORINDEX) != RE.REG_ANCHORINDEX) 
+	    || (mymatch.offset + mymatch.index > mymatch.anchor)) {
+	    if ((ch = input.charAt(mymatch.index - 1)) != CharIndexed.OUT_OF_BOUNDS) {
+		before = Character.isLetterOrDigit(ch) || (ch == '_');
+	    }
+	}
+
+	if ((ch = input.charAt(mymatch.index)) != CharIndexed.OUT_OF_BOUNDS) {
+	    after = Character.isLetterOrDigit(ch) || (ch == '_');
+	}
+
+	// if (before) and (!after), we're at end (\>)
+	// if (after) and (!before), we're at beginning (\<)
+	boolean doNext = false;
+
+	if ((where & BEGIN) == BEGIN) {
+	    doNext = after && !before;
+	}
+	if ((where & END) == END) {
+	    doNext ^= before && !after;
+	}
+
+	if (negated) doNext = !doNext;
+
+	return (doNext ? next(input, mymatch) : false);
+    }
+    
+    void dump(StringBuffer os) {
+	if (where == (BEGIN | END)) {
+	    os.append( negated ? "\\B" : "\\b" );
+	} else if (where == BEGIN) {
+	    os.append("\\<");
+	} else {
+	    os.append("\\>");
+	}
+    }
+}

libjava/gnu/regexp/UncheckedRE.java

+/* gnu/regexp/UncheckedRE.java
+   Copyright (C) 2001, 2004 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., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 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.regexp;
+
+/**
+ * UncheckedRE is a subclass of RE that allows programmers an easier means
+ * of programmatically precompiling regular expressions.  It is constructed
+ * and used in exactly the same manner as an instance of the RE class; the
+ * only difference is that its constructors do not throw REException.
+ * Instead, if a syntax error is encountered during construction, a
+ * RuntimeException will be thrown.
+ * <P>
+ * Note that this makes UncheckedRE dangerous if constructed with
+ * dynamic data.  Do not use UncheckedRE unless you are completely sure
+ * that all input being passed to it contains valid, well-formed 
+ * regular expressions for the syntax specified.
+ *
+ * @author <A HREF="mailto:wes@cacas.org">Wes Biggs</A>
+ * @see gnu.regexp.RE 
+ * @since gnu.regexp 1.1.4
+ */
+
+public final class UncheckedRE extends RE {
+  /**
+   * Constructs a regular expression pattern buffer without any compilation
+   * flags set, and using the default syntax (RESyntax.RE_SYNTAX_PERL5).
+   *
+   * @param pattern A regular expression pattern, in the form of a String,
+   *   StringBuffer or char[].  Other input types will be converted to
+   *   strings using the toString() method.
+   * @exception RuntimeException The input pattern could not be parsed.
+   * @exception NullPointerException The pattern was null.
+   */
+  public UncheckedRE(Object pattern) {
+      this(pattern,0,RESyntax.RE_SYNTAX_PERL5);
+  }
+
+  /**
+   * Constructs a regular expression pattern buffer using the specified
+   * compilation flags and the default syntax (RESyntax.RE_SYNTAX_PERL5).
+   *
+   * @param pattern A regular expression pattern, in the form of a String,
+   *   StringBuffer, or char[].  Other input types will be converted to
+   *   strings using the toString() method.
+   * @param cflags The logical OR of any combination of the compilation flags in the RE class.
+   * @exception RuntimeException The input pattern could not be parsed.
+   * @exception NullPointerException The pattern was null.
+   */
+  public UncheckedRE(Object pattern, int cflags) {
+      this(pattern,cflags,RESyntax.RE_SYNTAX_PERL5);
+  }
+
+  /**
+   * Constructs a regular expression pattern buffer using the specified
+   * compilation flags and regular expression syntax.
+   *
+   * @param pattern A regular expression pattern, in the form of a String,
+   *   StringBuffer, or char[].  Other input types will be converted to
+   *   strings using the toString() method.
+   * @param cflags The logical OR of any combination of the compilation flags in the RE class.
+   * @param syntax The type of regular expression syntax to use.
+   * @exception RuntimeException The input pattern could not be parsed.
+   * @exception NullPointerException The pattern was null.
+   */
+  public UncheckedRE(Object pattern, int cflags, RESyntax syntax) {
+      try {
+	  initialize(pattern,cflags,syntax,0,0);
+      } catch (REException e) { 
+	  throw new RuntimeException(e.getMessage());
+      }
+  }
+}
+
+

libjava/java/util/regex/Matcher.java

-/* Matcher.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+/* Matcher.java -- Instance of a regular expression applied to a char sequence.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,13 +38,27 @@ exception statement from your version. */
 
 package java.util.regex;
 
+import gnu.regexp.RE;
+import gnu.regexp.REMatch;
+
 /**
- * @author Michael Koch
+ * Instance of a regular expression applied to a char sequence.
+ *
  * @since 1.4
  */
 public class Matcher
 {
   private Pattern pattern;
+  private CharSequence input;
+  private int position;
+  private int appendPosition;
+  private REMatch match;
+
+  Matcher(Pattern pattern, CharSequence input)
+  {
+    this.pattern = pattern;
+    this.input = input;
+  }
   
   /**
    * @param sb The target string buffer
@@ -58,7 +72,12 @@ public class Matcher
   public Matcher appendReplacement (StringBuffer sb, String replacement)
     throws IllegalStateException
   {
-    throw new Error("Not implemented");
+    assertMatchOp();
+    sb.append(input.subSequence(appendPosition,
+				match.getStartIndex()).toString());
+    sb.append(match.substituteInto(replacement));
+    appendPosition = match.getEndIndex();
+    return this;
   }
 
   /**
@@ -66,7 +85,8 @@ public class Matcher
    */
   public StringBuffer appendTail (StringBuffer sb)
   {
-    throw new Error("Not implemented");
+    sb.append(input.subSequence(appendPosition, input.length()).toString());
+    return sb;
   }
  
   /**
@@ -76,7 +96,8 @@ public class Matcher
   public int end ()
     throws IllegalStateException
   {
-    throw new Error ("Not implemented");
+    assertMatchOp();
+    return match.getEndIndex();
   }
   
   /**
@@ -90,14 +111,36 @@ public class Matcher
   public int end (int group)
     throws IllegalStateException
   {
-    throw new Error ("Not implemented");
+    assertMatchOp();
+    return match.getEndIndex(group);
   }
  
   public boolean find ()
   {
-    throw new Error ("Not implemented");
-  }
-  
+    boolean first = (match == null);
+    match = pattern.getRE().getMatch(input, position);
+    if (match != null)
+      {
+	int endIndex = match.getEndIndex();
+	// Are we stuck at the same position?
+	if (!first && endIndex == position)
+	  {
+	    match = null;
+	    // Not at the end of the input yet?
+	    if (position < input.length() - 1)
+	      {
+		position++;
+		return find(position);
+	      }
+	    else
+	      return false;
+	  }
+	position = endIndex;
+	return true;
+      }
+    return false;
+  } 
+
   /**
    * @param start The index to start the new pattern matching
    *
@@ -106,7 +149,13 @@ public class Matcher
    */
   public boolean find (int start)
   {
-    throw new Error ("Not implemented");
+    match = pattern.getRE().getMatch(input, start);
+    if (match != null)
+      {
+	position = match.getEndIndex();
+	return true;
+      }
+    return false;
   }
  
   /**
@@ -115,7 +164,8 @@ public class Matcher
    */
   public String group ()
   {
-    throw new Error ("Not implemented");
+    assertMatchOp();
+    return match.toString();
   }
   
   /**
@@ -129,7 +179,8 @@ public class Matcher
   public String group (int group)
     throws IllegalStateException
   {
-    throw new Error ("Not implemented");
+    assertMatchOp();
+    return match.toString(group);
   }
 
   /**
@@ -137,7 +188,9 @@ public class Matcher
    */
   public String replaceFirst (String replacement)
   {
-    throw new Error ("Not implemented");
+    reset();
+    // Semantics might not quite match
+    return pattern.getRE().substitute(input, replacement, position);
   }
 
   /**
@@ -145,17 +198,25 @@ public class Matcher
    */
   public String replaceAll (String replacement)
   {
-    throw new Error ("Not implemented");
+    reset();
+    return pattern.getRE().substituteAll(input, replacement, position);
   }
   
   public int groupCount ()
   {
-    throw new Error("Not implemented");
+    return pattern.getRE().getNumSubs();
   }
  
   public boolean lookingAt ()
   {
-    throw new Error("Not implemented");
+    match = pattern.getRE().getMatch(input, 0);
+    if (match != null)
+      {
+	if (match.getStartIndex() == 0)
+	  return true;
+	match = null;
+      }
+    return false;
   }
   
   /**
@@ -170,7 +231,7 @@ public class Matcher
    */
   public boolean matches ()
   {
-    throw new Error("Not implemented");
+    return find(0);
   }
   
   /**
@@ -183,7 +244,9 @@ public class Matcher
   
   public Matcher reset ()
   {
-    throw new Error ("Not implemented");
+    position = 0;
+    match = null;
+    return this;
   }
   
   /**
@@ -191,7 +254,8 @@ public class Matcher
    */
   public Matcher reset (CharSequence input)
   {
-    throw new Error ("Not implemented");
+    this.input = input;
+    return reset();
   }
   
   /**
@@ -203,7 +267,8 @@ public class Matcher
   public int start ()
     throws IllegalStateException
   {
-    throw new Error("Not implemented");
+    assertMatchOp();
+    return match.getStartIndex();
   }
 
   /**
@@ -217,6 +282,12 @@ public class Matcher
   public int start (int group)
     throws IllegalStateException
   {
-    throw new Error("Not implemented");
+    assertMatchOp();
+    return match.getStartIndex(group);
+  }
+
+  private void assertMatchOp()
+  {
+    if (match == null) throw new IllegalStateException();
   }
 }

libjava/java/util/regex/Pattern.java

-/* Pattern.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+/* Pattern.java -- Compiled regular expression ready to be applied.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,13 +35,19 @@ 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. */
 
-// Stub class until java.util.regex is implemented.
 package java.util.regex;
 
+import gnu.regexp.RE;
+import gnu.regexp.RESyntax;
+import gnu.regexp.REException;
+
 import java.io.Serializable;
+import java.util.ArrayList;
+
 
 /**
- * @author Michael Koch
+ * Compiled regular expression ready to be applied. 
+ *
  * @since 1.4
  */
 public class Pattern implements Serializable
@@ -56,8 +62,10 @@ public class Pattern implements Serializable
   public static final int UNICODE_CASE = 64;
   public static final int UNIX_LINES = 1;
   
-  private String regex;
-  private int flags;
+  private final String regex;
+  private final int flags;
+
+  private final RE re;
 
   private Pattern (String regex)
     throws PatternSyntaxException
@@ -71,9 +79,48 @@ public class Pattern implements Serializable
     this.regex = regex;
     this.flags = flags;
 
-    throw new Error ("Not implemented");
+    int gnuFlags = 0;
+    if ((flags & CASE_INSENSITIVE) != 0)
+      gnuFlags |= RE.REG_ICASE;
+    if ((flags & MULTILINE) != 0)
+      gnuFlags |= RE.REG_MULTILINE;
+    if ((flags & DOTALL) != 0)
+      gnuFlags |= RE.REG_DOT_NEWLINE;
+    // not yet supported:
+    // if ((flags & UNICODE_CASE) != 0) gnuFlags =
+    // if ((flags & CANON_EQ) != 0) gnuFlags =
+
+    // Eventually there will be such a thing as JDK 1_4 syntax
+    RESyntax syntax = RESyntax.RE_SYNTAX_PERL5;
+    if ((flags & UNIX_LINES) != 0)
+      {
+	// Use a syntax set with \n for linefeeds?
+	syntax = new RESyntax(syntax);
+	syntax.setLineSeparator("\n");
+      }
+
+    if ((flags & COMMENTS) != 0)
+      {
+	// Use a syntax with support for comments?
+      }
+
+    try
+      {
+	this.re = new RE(regex, gnuFlags, syntax);
+      }
+    catch (REException e)
+      {
+	throw new PatternSyntaxException(e.getMessage(),
+					 regex, e.getPosition());
+      }
   }
  
+  // package private accessor method
+  RE getRE()
+  {
+    return re;
+  }
+
   /**
    * @param regex The regular expression
    *
@@ -82,7 +129,7 @@ public class Pattern implements Serializable
   public static Pattern compile (String regex)
     throws PatternSyntaxException
   {
-    throw new Error ("Not implemented");
+    return compile(regex, 0);
   }
   
   /**
@@ -116,7 +163,7 @@ public class Pattern implements Serializable
    */
   public static boolean matches (String regex, CharSequence input) 
   {
-    throw new Error ("Not implemented");
+    return compile(regex).matcher(input).matches();
   }
   
   /**
@@ -124,7 +171,7 @@ public class Pattern implements Serializable
    */
   public Matcher matcher (CharSequence input)
   {
-    throw new Error ("Not implemented");
+    return new Matcher(this, input);
   }
   
   /**
@@ -132,7 +179,7 @@ public class Pattern implements Serializable
    */
   public String[] split (CharSequence input)
   {
-    throw new Error ("Not implemented");
+    return split(input, 0);
   }
   
   /**
@@ -141,11 +188,67 @@ public class Pattern implements Serializable
    */
   public String[] split (CharSequence input, int limit)
   {
-    throw new Error ("Not implemented");
+    Matcher matcher = new Matcher(this, input);
+    ArrayList list = new ArrayList();
+    int empties = 0;
+    int count = 0;
+    int start = 0;
+    int end;
+    boolean matched;
+
+    while (matched = matcher.find() && (limit <= 0 || count < limit - 1))
+      {
+	++count;
+	end = matcher.start();
+	if (start == end)
+	  empties++;
+	else
+	  {
+	    while (empties-- > 0)
+	      list.add("");
+
+	    String text = input.subSequence(start, end).toString();
+	    list.add(text);
+	  }
+	start = matcher.end();
+      }
+
+    // We matched nothing.
+    if (!matched && count == 0)
+      return new String[] { input.toString() };
+    
+    // Is the last token empty?
+    boolean emptyLast = (start == input.length());
+
+    // Can/Must we add empties or an extra last token at the end?
+    if (list.size() < limit || limit < 0 || (limit == 0 && !emptyLast))
+      {
+	if (limit > list.size())
+	  {
+	    int max = limit - list.size();
+	    empties = (empties > max) ? max : empties;
+	  }
+	while (empties-- > 0)
+	  list.add("");
+      }
+
+    // last token at end
+    if (limit != 0 || (limit == 0 && !emptyLast))
+      {
+	String t = input.subSequence(start, input.length()).toString();
+	if ("".equals(t) && limit == 0)
+	  ; // Don't add.
+	else
+	  list.add(t);
+      }
+
+    String[] output = new String [list.size()];
+    list.toArray(output);
+    return output;
   }
   
   public String pattern ()
   {
-    throw new Error ("Not implemented");
+    return regex;
   }
 }