[armedbear-cvs] r13149 - trunk/abcl/src/org/armedbear/lisp

[Alessio Stalla]

Author: astalla
Date: Fri Jan 14 16:12:30 2011
New Revision: 13149

Log:
Keep sys::make-fasl-class-loader API compatible to avoid changing the FASL version number.


Modified:
   trunk/abcl/src/org/armedbear/lisp/FaslClassLoader.java
   trunk/abcl/src/org/armedbear/lisp/Lisp.java
   trunk/abcl/src/org/armedbear/lisp/Load.java
   trunk/abcl/src/org/armedbear/lisp/compile-file.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/FaslClassLoader.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/FaslClassLoader.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/FaslClassLoader.java	Fri Jan 14 16:12:30 2011
@@ -129,6 +129,12 @@
             return new FaslClassLoader(baseName.getStringValue()).boxedThis;
         }
 
+        @Override
+        //TODO delete this next time the fasl version is bumbed
+        public LispObject execute(LispObject unused1, LispObject baseName, LispObject unused2) {
+            return execute(baseName);
+        }
+
     };
 
     private static final Primitive GET_FASL_FUNCTION = new pf_get_fasl_function();

Modified: trunk/abcl/src/org/armedbear/lisp/Lisp.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Lisp.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Lisp.java	Fri Jan 14 16:12:30 2011
@@ -1292,6 +1292,7 @@
       try {
           if (input == null) {
                   Debug.trace("Pathname: " + name);
+                  Debug.trace("load: " + load);
                   Debug.trace("LOAD_TRUENAME_FASL: " + truenameFasl);
                   Debug.trace("LOAD_TRUENAME: " + truename);
                   Debug.assertTrue(input != null);

Modified: trunk/abcl/src/org/armedbear/lisp/Load.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Load.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Load.java	Fri Jan 14 16:12:30 2011
@@ -342,6 +342,14 @@
 
     // ### *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));
 

Modified: trunk/abcl/src/org/armedbear/lisp/compile-file.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	Fri Jan 14 16:12:30 2011
@@ -369,7 +369,9 @@
   (when compile-time-too
     (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))))
 
 (declaim (ftype (function (t) t) convert-ensure-method))
@@ -611,7 +613,9 @@
               (when (> *class-number* 0)
                 (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))
 
 
@@ -620,7 +624,7 @@
                while (not (eq line :eof))
                do (write-line line out))))
         (delete-file temp-file)
-	(remove-zip-cache-entry output-file) ;; Necessary under windows
+        (remove-zip-cache-entry output-file) ;; Necessary under windows
         (rename-file temp-file2 output-file)
 
         (when *compile-file-zip*