Changeset 12673


Ignore:
Timestamp:
05/13/10 12:47:51 (11 years ago)
Author:
Mark Evenson
Message:

Load 'system.lisp' later in boot so conditions trigger debugger.

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
2 edited

Legend:

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

    r12629 r12673  
    9393        initializeLisp();
    9494        initializeTopLevel();
     95        initializeSystem();
    9596        if (!noinit)
    9697            processInitializationFile();
     
    118119        initializeJLisp();
    119120        initializeTopLevel();
     121        initializeSystem();
    120122        processInitializationFile();
    121123        return interpreter;
     
    210212            e.printStackTrace();
    211213        }
     214    }
     215
     216    private static synchronized void initializeSystem()
     217    {
     218        Load.loadSystemFile("system");
    212219    }
    213220
  • trunk/abcl/src/org/armedbear/lisp/boot.lisp

    r12516 r12673  
    210210             (float (/ (ext:uptime) 1000)))))
    211211
    212 ;;; "system.lisp" contains system installation specific information
    213 ;;; (currently only the logical pathname definition for "SYS;SRC")
    214 ;;; that is not currently required for ABCL to run.  Since
    215 ;;; LOAD-SYSTEM-FILE exits the JVM if its argument cannot be found, we
    216 ;;; use REQUIRE trapping any error.
    217 (handler-case
    218     (require 'system)
    219   (t ()))
    220 
     212
Note: See TracChangeset for help on using the changeset viewer.