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

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Tue Sep 20 13:26:31 2011
New Revision: 13604

Log:
Bump FASL format because of the now supported circularity: even though
we're backward compatible, older versions aren't forward compatible.

Modified:
   trunk/abcl/src/org/armedbear/lisp/FaslClassLoader.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	Tue Sep 20 11:01:00 2011	(r13603)
+++ trunk/abcl/src/org/armedbear/lisp/FaslClassLoader.java	Tue Sep 20 13:26:31 2011	(r13604)
@@ -150,12 +150,6 @@
             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/Load.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Load.java	Tue Sep 20 11:01:00 2011	(r13603)
+++ trunk/abcl/src/org/armedbear/lisp/Load.java	Tue Sep 20 13:26:31 2011	(r13604)
@@ -342,16 +342,8 @@
 
     // ### *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));
+        exportConstant("*FASL-VERSION*", PACKAGE_SYS, Fixnum.getInstance(38));
 
     // ### *fasl-external-format*
     // internal symbol

Modified: trunk/abcl/src/org/armedbear/lisp/compile-file.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	Tue Sep 20 11:01:00 2011	(r13603)
+++ trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	Tue Sep 20 13:26:31 2011	(r13604)
@@ -568,10 +568,8 @@
   (when compile-time-too
     (let ((*load-truename* *output-file-pathname*)
           (*fasl-loader* (make-fasl-class-loader
-                          nil
                           (concatenate 'string
-                                       "org.armedbear.lisp." (base-classname))
-                          nil)))
+                                       "org.armedbear.lisp." (base-classname)))))
       (eval form))))
 
 (defun populate-zip-fasl (output-file)
@@ -638,9 +636,8 @@
     (when (> *class-number* 0)
       (write (list 'setq '*fasl-loader*
                    `(sys::make-fasl-class-loader
-                     nil
-                     ,(concatenate 'string "org.armedbear.lisp." (base-classname))
-                     nil))
+                     ,(concatenate 'string "org.armedbear.lisp."
+                                   (base-classname))))
              :stream out))
     (%stream-terpri out)))