Changeset 12649

Timestamp:

05/02/10 18:51:35 (13 years ago)

Author:

ehuelsmann

Message:

Re #79: Add *FASL-UNINTERNED-SYMBOLS* variable to Load.java and save its value
in AutoloadedFunctionProxy?, just like *FASL-ANONYMOUS-PACKAGE*.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• AutoloadedFunctionProxy.java (modified) (1 diff)
• Load.java (modified) (3 diffs)

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

@@ -52 +52 @@
             AUTOLOADING_CACHE, // allow loading local preloaded functions
             Load._FASL_ANONYMOUS_PACKAGE_, // package for uninterned symbols
+            Load._FASL_UNINTERNED_SYMBOLS_, // vector of uninterned symbols
             Symbol._PACKAGE_,              // current package
             Symbol.LOAD_TRUENAME           // LOAD-TIME-VALUE depends on this

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

@@ -380 +380 @@
         internSpecial("*FASL-ANONYMOUS-PACKAGE*", PACKAGE_SYS, NIL);
 
+    // ### *fasl-uninterned-symbols*
+    // internal symbol
+    /**
+     * This variable gets bound to NIL upon loading a FASL, but
+     * gets set to a vector of symbols as one of the first actions
+     * by the FASL itself.
+     *
+     */
+    public static final Symbol _FASL_UNINTERNED_SYMBOLS_ =
+        internSpecial("*FASL-UNINTERNED-SYMBOLS*", PACKAGE_SYS, NIL);
+
     // ### init-fasl &key version
     private static final Primitive INIT_FASL = new init_fasl();
@@ -395 +406 @@
                     final LispThread thread = LispThread.currentThread();
                     thread.bindSpecial(_FASL_ANONYMOUS_PACKAGE_, NIL);
+                    thread.bindSpecial(_FASL_UNINTERNED_SYMBOLS_, NIL);
                     thread.bindSpecial(_SOURCE_, NIL);
                     return faslLoadStream(thread);
@@ -410 +422 @@
                                                        boolean auto)
         {
-            return loadFileFromStream(pathname == null ? NIL : pathname, 
-                                      truename == null ? NIL : truename, 
+            return loadFileFromStream(pathname == null ? NIL : pathname,
+                                      truename == null ? NIL : truename,
                                       in, verbose, print, auto, false);
     }