Changeset 14019


Ignore:
Timestamp:
07/29/12 15:24:16 (8 years ago)
Author:
ehuelsmann
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/Load.java

    r14002 r14019  
    216216    }
    217217
    218     public static final LispObject loadSystemFile(String filename, boolean auto)
    219 
     218    public static LispObject loadSystemFile(String filename, boolean auto)
    220219    {
    221220        LispThread thread = LispThread.currentThread();
    222221        if (auto) {
    223222            final SpecialBindingsMark mark = thread.markSpecialBindings();
     223            // Due to autoloading, we're not sure about the loader state.
     224            // Make sure that all reader relevant variables have known state.
    224225            thread.bindSpecial(Symbol.CURRENT_READTABLE,
    225226                               STANDARD_READTABLE.symbolValue(thread));
     227            thread.bindSpecial(Symbol.READ_BASE, Fixnum.constants[10]);
     228            thread.bindSpecial(Symbol.READ_SUPPRESS, NIL);
     229            thread.bindSpecial(Symbol.READ_EVAL, T);
     230            thread.bindSpecial(Symbol.READ_DEFAULT_FLOAT_FORMAT, Symbol.SINGLE_FLOAT);
    226231            thread.bindSpecial(Symbol._PACKAGE_, PACKAGE_CL_USER);
    227232            try {
Note: See TracChangeset for help on using the changeset viewer.