Changeset 14019

Timestamp:

07/29/12 15:24:16 (8 years ago)

Author:

ehuelsmann

Message:

Fix #224: autoloading clobbered by unknown special variable state.

File:

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

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

@@ -216 +216 @@
     }
 
-    public static final LispObject loadSystemFile(String filename, boolean auto)
-
+    public static LispObject loadSystemFile(String filename, boolean auto)
     {
         LispThread thread = LispThread.currentThread();
         if (auto) {
             final SpecialBindingsMark mark = thread.markSpecialBindings();
+            // Due to autoloading, we're not sure about the loader state.
+            // Make sure that all reader relevant variables have known state.
             thread.bindSpecial(Symbol.CURRENT_READTABLE,
                                STANDARD_READTABLE.symbolValue(thread));
+            thread.bindSpecial(Symbol.READ_BASE, Fixnum.constants[10]);
+            thread.bindSpecial(Symbol.READ_SUPPRESS, NIL);
+            thread.bindSpecial(Symbol.READ_EVAL, T);
+            thread.bindSpecial(Symbol.READ_DEFAULT_FLOAT_FORMAT, Symbol.SINGLE_FLOAT);
             thread.bindSpecial(Symbol._PACKAGE_, PACKAGE_CL_USER);
             try {