Changeset 12662

Timestamp:

05/09/10 15:44:04 (13 years ago)

Author:

astalla

Message:

JCLASS now supports an optional CLASS-LOADER argument.

File:

• trunk/abcl/src/org/armedbear/lisp/Java.java (modified) (5 diffs)

trunk/abcl/src/org/armedbear/lisp/Java.java

@@ -116 +116 @@
     }
 
-    // ### jclass name-or-class-ref => class-ref
+    // ### jclass name-or-class-ref &optional class-loader => class-ref
     private static final Primitive JCLASS = new pf_jclass();
     private static final class pf_jclass extends Primitive 
@@ -123 +123 @@
         {
             super(Symbol.JCLASS, "name-or-class-ref",
-                  "Returns a reference to the Java class designated by NAME-OR-CLASS-REF.");
+                  "Returns a reference to the Java class designated by NAME-OR-CLASS-REF. If the CLASS-LOADER parameter is passed, the class is resolved with respect to the given ClassLoader.");
         }
 
@@ -130 +130 @@
         {
             return JavaObject.getInstance(javaClass(arg));
+        }
+
+        @Override
+        public LispObject execute(LispObject className, LispObject classLoader)
+        {
+      ClassLoader loader = (ClassLoader) classLoader.javaInstance(ClassLoader.class);
+      if(loader != null) {
+    return JavaObject.getInstance(javaClass(className, loader));
+      } else {
+    return JavaObject.getInstance(javaClass(className));
+      }
         }
     };
@@ -1150 +1161 @@
     }
     
-    static Class classForName(String className)
-    {
+    private static Class classForName(String className) {
+  return classForName(className, JavaClassLoader.getPersistentInstance());
+    }
+
+    private static Class classForName(String className, ClassLoader classLoader) {
         try {
-            return Class.forName(className);
+            return Class.forName(className, true, classLoader);
         }
         catch (ClassNotFoundException e) {
-            try {
-                return Class.forName(className, true, JavaClassLoader.getPersistentInstance());
-            }
-            catch (ClassNotFoundException ex) {
-                error(new LispError("Class not found: " + className));
-                // Not reached.
-                return null;
-            }
-        }
+      error(new LispError("Class not found: " + className));
+      // Not reached.
+      return null;
+        }
+    }
+
+    private static Class javaClass(LispObject obj) {
+  return javaClass(obj, null);
     }
 
     // Supports Java primitive types too.
-    static Class javaClass(LispObject obj)
+    static Class javaClass(LispObject obj, ClassLoader classLoader)
     {
         if (obj instanceof AbstractString || obj instanceof Symbol) {
@@ -1189 +1202 @@
                 return Double.TYPE;
             // Not a primitive Java type.
-            Class c = classForName(s);
+            Class c;
+      if(classLoader != null) {
+    c = classForName(s, classLoader);
+      } else {
+    c = classForName(s);
+      }
             if (c == null)
                 error(new LispError(s + " does not designate a Java class."));