Changeset 11715

Timestamp:

03/25/09 20:29:48 (15 years ago)

Author:

astalla

Message:

Factored out an overload of loadCompiledFunction that can load a
function from a byte array.

File:

• trunk/abcl/src/org/armedbear/lisp/Lisp.java (modified) (1 diff)

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

@@ -1134 +1134 @@
           Debug.trace("bytesRemaining = " + bytesRemaining);
 
-        //JavaClassLoader loader = new JavaClassLoader();
-        Class c =
-          (new JavaClassLoader()).loadClassFromByteArray(null, bytes, 0, bytes.length);
-        if (c != null)
-          {
+  return loadCompiledFunction(bytes);
+      }
+    catch (Throwable t)
+      {
+        Debug.trace(t);
+      }
+    return null;
+  }
+
+    public static final LispObject loadCompiledFunction(byte[] bytes) throws Throwable {
+  Class c = (new JavaClassLoader()).loadClassFromByteArray(null, bytes, 0, bytes.length);
+        if (c != null) {
+      Class sc = c.getSuperclass();
             Constructor constructor = c.getConstructor((Class[])null);
-            LispObject obj =
-                  (LispObject) constructor.newInstance((Object[])null);
-            if (obj instanceof Function)
+            LispObject obj = (LispObject) constructor.newInstance((Object[])null);
+            if (obj instanceof Function) {
               ((Function)obj).setClassBytes(bytes);
+      }
             return obj;
-          }
-      }
-    catch (Throwable t)
-      {
-        Debug.trace(t);
-      }
-    return null;
-  }
+  } else {
+      return null;
+  }
+    }
 
   public static final LispObject makeCompiledClosure(LispObject template,