Changeset 13167

Timestamp:

01/21/11 20:57:57 (12 years ago)

Author:

ehuelsmann

Message:

Merge r13148 and r13149: Additional changes to use reflection based
function instantiation.

Location:

branches/0.24.x/abcl/src/org/armedbear/lisp

Files:

• FaslClassLoader.java (modified) (4 diffs)
• Lisp.java (modified) (1 diff)
• Load.java (modified) (1 diff)
• compile-file.lisp (modified) (2 diffs)

branches/0.24.x/abcl/src/org/armedbear/lisp/FaslClassLoader.java

@@ -40 +40 @@
 public class FaslClassLoader extends JavaClassLoader {
 
-    private String baseName;
-    private LispObject loader; //The function used to load FASL functions by number
+    private final String baseName;
     private final JavaObject boxedThis = new JavaObject(this);
     
@@ -64 +63 @@
             Class<?> c = this.findLoadedClass(internalName);
 
-            if (c == null)
+            if (c == null) {
                 c = findClass(name);
-
+            }
             if (c != null) {
-                if (resolve)
+                if (resolve) {
                     resolveClass(c);
-
+                }
                 return c;
             }
@@ -109 +108 @@
   try {
       //Function name is fnIndex + 1
-      LispObject o = (LispObject) loadClass(baseName + "_" + (fnNumber + 1)).newInstance();
-      return o;
+            String name = baseName + "_" + (fnNumber + 1);
+            Function f = (Function) loadClass(name).newInstance();
+            f.setClassBytes(getFunctionClassBytes(name));
+            return f;
   } catch(Exception e) {
       if(e instanceof ControlTransfer) { throw (ControlTransfer) e; }
@@ -129 +130 @@
         }
 
+        @Override
+        //TODO delete this next time the fasl version is bumbed
+        public LispObject execute(LispObject unused1, LispObject baseName, LispObject unused2) {
+            return execute(baseName);
+        }
+
     };
 

branches/0.24.x/abcl/src/org/armedbear/lisp/Lisp.java

@@ -1285 +1285 @@
           if (input == null) {
                   Debug.trace("Pathname: " + name);
+                  Debug.trace("load: " + load);
                   Debug.trace("LOAD_TRUENAME_FASL: " + truenameFasl);
                   Debug.trace("LOAD_TRUENAME: " + truename);

branches/0.24.x/abcl/src/org/armedbear/lisp/Load.java

@@ -343 +343 @@
     // ### *fasl-version*
     // internal symbol
+
+    /* TODO when bumping the version for any reason, remember to:
+     *  - remove the overload taking 3 args in
+     *    FaslClassLoader.MAKE_FASL_CLASS_LOADER
+     *  - remove the extra args (1 and 3, both NIL) passed to
+     *    make-fasl-class-loader in compile-file.lisp
+     *  - delete this comment :)
+     */
     static final Symbol _FASL_VERSION_ =
         exportConstant("*FASL-VERSION*", PACKAGE_SYS, Fixnum.getInstance(37));

branches/0.24.x/abcl/src/org/armedbear/lisp/compile-file.lisp

@@ -370 +370 @@
     (let ((*load-truename* *output-file-pathname*)
     (*fasl-loader* (make-fasl-class-loader
-                          (concatenate 'string "org.armedbear.lisp." (base-classname)))))
+                          nil
+                          (concatenate 'string "org.armedbear.lisp." (base-classname))
+                          nil)))
       (eval form))))
 
@@ -612 +614 @@
                 (write (list 'setq '*fasl-loader*
                              `(sys::make-fasl-class-loader
-                               ,(concatenate 'string "org.armedbear.lisp." (base-classname)))) :stream out))
+                               nil
+                               ,(concatenate 'string "org.armedbear.lisp." (base-classname))
+                               nil)) :stream out))
               (%stream-terpri out))