[kaffe] CVS kaffe (dalibor): Replaced gnu/regexp/RE* with implementation from GNU Classpath

Kaffe CVS Kaffe Mailing List <kaffe@kaffe.org>
Wed Mar 17 12:11:02 2004


PatchSet 4533 
Date: 2004/03/17 19:27:59
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Replaced gnu/regexp/RE* with implementation from GNU Classpath

2004-03-17  Dalibor Topic <robilad@kaffe.org>

        * libraries/javalib/gnu/regexp/REException.java,
        libraries/javalib/gnu/regexp/REFilterInputStream.java,
        libraries/javalib/gnu/regexp/REMatch.java,
        libraries/javalib/gnu/regexp/REMatchEnumeration.java,
        libraries/javalib/gnu/regexp/RESyntax.java,
        libraries/javalib/gnu/regexp/REToken.java,
        libraries/javalib/gnu/regexp/RETokenAny.java,
        libraries/javalib/gnu/regexp/RETokenBackRef.java,
        libraries/javalib/gnu/regexp/RETokenChar.java,
        libraries/javalib/gnu/regexp/RETokenEnd.java,
        libraries/javalib/gnu/regexp/RETokenEndSub.java,
        libraries/javalib/gnu/regexp/RETokenOneOf.java,
        libraries/javalib/gnu/regexp/RETokenPOSIX.java,
        libraries/javalib/gnu/regexp/RETokenRange.java,
        libraries/javalib/gnu/regexp/RETokenRepeated.java,
        libraries/javalib/gnu/regexp/RETokenStart.java,
        libraries/javalib/gnu/regexp/RETokenWordBoundary.java,
        libraries/javalib/gnu/regexp/UncheckedRE.java:
        Replaced by implementation from GNU Classpath.

Members: 
	ChangeLog:1.2111->1.2112 
	libraries/javalib/gnu/regexp/REException.java:1.1->1.2 
	libraries/javalib/gnu/regexp/REFilterInputStream.java:1.1->1.2 
	libraries/javalib/gnu/regexp/REMatch.java:1.1->1.2 
	libraries/javalib/gnu/regexp/REMatchEnumeration.java:1.1->1.2 
	libraries/javalib/gnu/regexp/RESyntax.java:1.1->1.2 
	libraries/javalib/gnu/regexp/REToken.java:1.1->1.2 
	libraries/javalib/gnu/regexp/RETokenAny.java:1.1->1.2 
	libraries/javalib/gnu/regexp/RETokenBackRef.java:1.1->1.2 
	libraries/javalib/gnu/regexp/RETokenChar.java:1.1->1.2 
	libraries/javalib/gnu/regexp/RETokenEnd.java:1.1->1.2 
	libraries/javalib/gnu/regexp/RETokenEndSub.java:1.1->1.2 
	libraries/javalib/gnu/regexp/RETokenOneOf.java:1.1->1.2 
	libraries/javalib/gnu/regexp/RETokenPOSIX.java:1.1->1.2 
	libraries/javalib/gnu/regexp/RETokenRange.java:1.1->1.2 
	libraries/javalib/gnu/regexp/RETokenRepeated.java:1.1->1.2 
	libraries/javalib/gnu/regexp/RETokenStart.java:1.1->1.2 
	libraries/javalib/gnu/regexp/RETokenWordBoundary.java:1.1->1.2 
	libraries/javalib/gnu/regexp/UncheckedRE.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2111 kaffe/ChangeLog:1.2112
--- kaffe/ChangeLog:1.2111	Wed Mar 17 04:08:19 2004
+++ kaffe/ChangeLog	Wed Mar 17 19:27:59 2004
@@ -1,3 +1,25 @@
+2004-03-17  Dalibor Topic <robilad@kaffe.org>
+
+        * libraries/javalib/gnu/regexp/REException.java,
+        libraries/javalib/gnu/regexp/REFilterInputStream.java,
+        libraries/javalib/gnu/regexp/REMatch.java,
+        libraries/javalib/gnu/regexp/REMatchEnumeration.java,
+        libraries/javalib/gnu/regexp/RESyntax.java,
+        libraries/javalib/gnu/regexp/REToken.java,
+        libraries/javalib/gnu/regexp/RETokenAny.java,
+        libraries/javalib/gnu/regexp/RETokenBackRef.java,
+        libraries/javalib/gnu/regexp/RETokenChar.java,
+        libraries/javalib/gnu/regexp/RETokenEnd.java,
+        libraries/javalib/gnu/regexp/RETokenEndSub.java,
+        libraries/javalib/gnu/regexp/RETokenOneOf.java,
+        libraries/javalib/gnu/regexp/RETokenPOSIX.java,
+        libraries/javalib/gnu/regexp/RETokenRange.java,
+        libraries/javalib/gnu/regexp/RETokenRepeated.java,
+        libraries/javalib/gnu/regexp/RETokenStart.java,
+        libraries/javalib/gnu/regexp/RETokenWordBoundary.java,
+        libraries/javalib/gnu/regexp/UncheckedRE.java:
+	Replaced by implementation from GNU Classpath.
+
 2004-03-16  Dalibor Topic <robilad@kaffe.org>
 
 	* libraries/javalib/gnu/regexp/CharIndexed.java,
Index: kaffe/libraries/javalib/gnu/regexp/REException.java
diff -u kaffe/libraries/javalib/gnu/regexp/REException.java:1.1 kaffe/libraries/javalib/gnu/regexp/REException.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/REException.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/REException.java	Wed Mar 17 19:28:05 2004
@@ -1,21 +1,39 @@
-/*
- *  gnu/regexp/REException.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.
- */
+/* 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;
 
Index: kaffe/libraries/javalib/gnu/regexp/REFilterInputStream.java
diff -u kaffe/libraries/javalib/gnu/regexp/REFilterInputStream.java:1.1 kaffe/libraries/javalib/gnu/regexp/REFilterInputStream.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/REFilterInputStream.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/REFilterInputStream.java	Wed Mar 17 19:28:05 2004
@@ -1,21 +1,40 @@
-/*
- *  gnu/regexp/REFilterInputStream.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.
- */
+/* 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;
Index: kaffe/libraries/javalib/gnu/regexp/REMatch.java
diff -u kaffe/libraries/javalib/gnu/regexp/REMatch.java:1.1 kaffe/libraries/javalib/gnu/regexp/REMatch.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/REMatch.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/REMatch.java	Wed Mar 17 19:28:05 2004
@@ -1,21 +1,40 @@
-/*
- *  gnu/regexp/REMatch.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.
- */
+/* 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;
Index: kaffe/libraries/javalib/gnu/regexp/REMatchEnumeration.java
diff -u kaffe/libraries/javalib/gnu/regexp/REMatchEnumeration.java:1.1 kaffe/libraries/javalib/gnu/regexp/REMatchEnumeration.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/REMatchEnumeration.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/REMatchEnumeration.java	Wed Mar 17 19:28:05 2004
@@ -1,21 +1,40 @@
-/*
- *  gnu/regexp/REMatchEnumeration.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.
- */
+/* 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;
Index: kaffe/libraries/javalib/gnu/regexp/RESyntax.java
diff -u kaffe/libraries/javalib/gnu/regexp/RESyntax.java:1.1 kaffe/libraries/javalib/gnu/regexp/RESyntax.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/RESyntax.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/RESyntax.java	Wed Mar 17 19:28:05 2004
@@ -1,21 +1,40 @@
-/*
- *  gnu/regexp/RESyntax.java
- *  Copyright (C) 1998-2002 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.
- */
+/* gnu/regexp/RESyntax.java
+   Copyright (C) 1998-2002, 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;
Index: kaffe/libraries/javalib/gnu/regexp/REToken.java
diff -u kaffe/libraries/javalib/gnu/regexp/REToken.java:1.1 kaffe/libraries/javalib/gnu/regexp/REToken.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/REToken.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/REToken.java	Wed Mar 17 19:28:05 2004
@@ -1,21 +1,39 @@
-/*
- *  gnu/regexp/REToken.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.
- */
+/* 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;
Index: kaffe/libraries/javalib/gnu/regexp/RETokenAny.java
diff -u kaffe/libraries/javalib/gnu/regexp/RETokenAny.java:1.1 kaffe/libraries/javalib/gnu/regexp/RETokenAny.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/RETokenAny.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/RETokenAny.java	Wed Mar 17 19:28:05 2004
@@ -1,21 +1,40 @@
-/*
- *  gnu/regexp/RETokenAny.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.
- */
+/* 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;
 
Index: kaffe/libraries/javalib/gnu/regexp/RETokenBackRef.java
diff -u kaffe/libraries/javalib/gnu/regexp/RETokenBackRef.java:1.1 kaffe/libraries/javalib/gnu/regexp/RETokenBackRef.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/RETokenBackRef.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/RETokenBackRef.java	Wed Mar 17 19:28:05 2004
@@ -1,21 +1,40 @@
-/*
- *  gnu/regexp/RETokenBackRef.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.
- */
+/* 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;
 
Index: kaffe/libraries/javalib/gnu/regexp/RETokenChar.java
diff -u kaffe/libraries/javalib/gnu/regexp/RETokenChar.java:1.1 kaffe/libraries/javalib/gnu/regexp/RETokenChar.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/RETokenChar.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/RETokenChar.java	Wed Mar 17 19:28:05 2004
@@ -1,21 +1,40 @@
-/*
- *  gnu/regexp/RETokenChar.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.
- */
+/* 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;
 
Index: kaffe/libraries/javalib/gnu/regexp/RETokenEnd.java
diff -u kaffe/libraries/javalib/gnu/regexp/RETokenEnd.java:1.1 kaffe/libraries/javalib/gnu/regexp/RETokenEnd.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/RETokenEnd.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/RETokenEnd.java	Wed Mar 17 19:28:06 2004
@@ -1,21 +1,41 @@
-/*
- *  gnu/regexp/RETokenEnd.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.
- */
+/* 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 {
Index: kaffe/libraries/javalib/gnu/regexp/RETokenEndSub.java
diff -u kaffe/libraries/javalib/gnu/regexp/RETokenEndSub.java:1.1 kaffe/libraries/javalib/gnu/regexp/RETokenEndSub.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/RETokenEndSub.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/RETokenEndSub.java	Wed Mar 17 19:28:06 2004
@@ -1,21 +1,39 @@
-/*
- *  gnu/regexp/RETokenEndSub.java
- *  Copyright (C) 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.
- */
+/* 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;
 
Index: kaffe/libraries/javalib/gnu/regexp/RETokenOneOf.java
diff -u kaffe/libraries/javalib/gnu/regexp/RETokenOneOf.java:1.1 kaffe/libraries/javalib/gnu/regexp/RETokenOneOf.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/RETokenOneOf.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/RETokenOneOf.java	Wed Mar 17 19:28:06 2004
@@ -1,21 +1,39 @@
-/*
- *  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.
- */
+/* 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;
Index: kaffe/libraries/javalib/gnu/regexp/RETokenPOSIX.java
diff -u kaffe/libraries/javalib/gnu/regexp/RETokenPOSIX.java:1.1 kaffe/libraries/javalib/gnu/regexp/RETokenPOSIX.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/RETokenPOSIX.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/RETokenPOSIX.java	Wed Mar 17 19:28:06 2004
@@ -1,21 +1,40 @@
-/*
- *  gnu/regexp/RETokenPOSIX.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.
- */
+/* 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;
 
Index: kaffe/libraries/javalib/gnu/regexp/RETokenRange.java
diff -u kaffe/libraries/javalib/gnu/regexp/RETokenRange.java:1.1 kaffe/libraries/javalib/gnu/regexp/RETokenRange.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/RETokenRange.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/RETokenRange.java	Wed Mar 17 19:28:06 2004
@@ -1,21 +1,39 @@
-/*
- *  gnu/regexp/RETokenRange.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.
- */
+/* 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;
 
Index: kaffe/libraries/javalib/gnu/regexp/RETokenRepeated.java
diff -u kaffe/libraries/javalib/gnu/regexp/RETokenRepeated.java:1.1 kaffe/libraries/javalib/gnu/regexp/RETokenRepeated.java:1.2
--- kaffe/libraries/javalib/gnu/regexp/RETokenRepeated.java:1.1	Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/gnu/regexp/RETokenRepeated.java	Wed Mar 17 19:28:06 2004
@@ -1,23 +1,43 @@
-/*
- *  gnu/regexp/RETokenRepeated.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.
- */
+/* 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

*** Patch too long, truncated ***