libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137223 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 134 insertions, 2 deletions

diff --git a/libjava/classpath/gnu/java/util/LRUCache.java b/libjava/classpath/gnu/java/util/LRUCache.java
new file mode 100644
index 00000000000..784a442ab2d
--- /dev/null
+++ b/libjava/classpath/gnu/java/util/LRUCache.java
@@ -0,0 +1,77 @@
+/* LRUCache.java -- A LRU Cache implementation
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.java.util;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * A least recently used cache, based on LinkedHashMap.
+ */
+public class LRUCache<K,V>
+  extends LinkedHashMap<K,V>
+{
+
+  /**
+   * The capacity of the cache.
+   */
+  private int capacity;
+
+  /**
+   * Creates a new LRUCache instance with the specified capacity.
+   *
+   * @param cap the capacity of the new cache
+   */
+  public LRUCache(int cap)
+  {
+    super();
+    capacity = cap;
+  }
+
+  /**
+   * Returns <code>true</code> when the oldest entry should be removed.
+   *
+   * @param eldest the entry about to be removed
+   *
+   * @return <code>true</code> when the oldest entry should be removed
+   */
+  protected boolean removeEldestEntry(Map.Entry<K, V> eldest)
+  {
+    return size() > capacity;
+  }
+}
diff --git a/libjava/classpath/gnu/java/util/regex/RE.java b/libjava/classpath/gnu/java/util/regex/RE.java
index 09ff74b908f..421640ff293 100644
--- a/libjava/classpath/gnu/java/util/regex/RE.java
+++ b/libjava/classpath/gnu/java/util/regex/RE.java
@@ -41,7 +41,6 @@ import java.io.Serializable;
 import java.util.Locale;
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
-import java.util.Stack;
 import java.util.Vector;
 
 /**
diff --git a/libjava/classpath/gnu/java/util/regex/REException.java b/libjava/classpath/gnu/java/util/regex/REException.java
index 4104fbcd8a7..7a277ca3ae3 100644
--- a/libjava/classpath/gnu/java/util/regex/REException.java
+++ b/libjava/classpath/gnu/java/util/regex/REException.java
@@ -147,6 +147,12 @@ public class REException extends Exception {
     this.pos = position;
   }
 
+  REException(String msg, Throwable cause, int type, int position) { 
+    super(msg, cause); 
+    this.type = type;
+    this.pos = position;
+  }
+
   /**
    * Returns the type of the exception, one of the constants listed above.
    */
diff --git a/libjava/classpath/gnu/java/util/regex/REToken.java b/libjava/classpath/gnu/java/util/regex/REToken.java
index 9affd4ee3c9..addc62225eb 100644
--- a/libjava/classpath/gnu/java/util/regex/REToken.java
+++ b/libjava/classpath/gnu/java/util/regex/REToken.java
@@ -128,7 +128,7 @@ abstract class REToken implements Serializable, Cloneable {
       * of the REmatch found this time so that another possible match
       * may be found when backtrack is called.
       * By default, nothing is added to the backtrackStack.
-      * @param CharIndexed input Input character sequence.
+      * @param input Input character sequence.
       * @param mymatch Position at which a match should be found
       * @return REMatch object if a match was found, null otherwise.
       */
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenNamedProperty.java b/libjava/classpath/gnu/java/util/regex/RETokenNamedProperty.java
index aec27583a58..0051f164364 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenNamedProperty.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenNamedProperty.java
@@ -38,6 +38,9 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 final class RETokenNamedProperty extends REToken {
   String name;
   boolean insens;
@@ -268,6 +271,20 @@ final class RETokenNamedProperty extends REToken {
 	      return true;
 	    }
 	  };
+      if (name.startsWith("java"))
+	{
+	  try
+	    {
+	      Method m = Character.class.getMethod("is" + name.substring(4),
+						   Character.TYPE);
+	      return new JavaCategoryHandler(m);
+	    }
+	  catch (NoSuchMethodException e)
+	    {
+	      throw new REException("Unsupported Java handler: " + name, e,
+				    REException.REG_ESCAPE, 0);
+	    }
+	}
       throw new REException("unsupported name " + name, REException.REG_ESCAPE, 0);
   }
 
@@ -320,4 +337,37 @@ final class RETokenNamedProperty extends REToken {
       }
   }
 
+  /**
+   * Handle the Java-specific extensions \p{javaX} where X
+   * is a method from Character of the form isX
+   *
+   * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+   */
+  private static class JavaCategoryHandler 
+    extends Handler 
+  {
+    private Method method;
+
+    public JavaCategoryHandler(Method m) 
+    {
+      this.method = m;
+    }
+
+    public boolean includes(char c) 
+    {
+      try
+	{
+	  return (Boolean) method.invoke(null, c);
+	}
+      catch (IllegalAccessException e)
+	{
+	  throw new InternalError("Unable to access method " + method);
+	}
+      catch (InvocationTargetException e)
+	{
+	  throw new InternalError("Error invoking " + method);
+	}
+    }
+  }
+
 }