Changeset 12673

Timestamp:

05/13/10 12:47:51 (15 years ago)

Author:

Mark Evenson

Message:

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

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Interpreter.java (modified) (3 diffs)
• boot.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Interpreter.java ¶

@@ -93 +93 @@
         initializeLisp();
         initializeTopLevel();
+        initializeSystem();
         if (!noinit)
             processInitializationFile();
@@ -118 +119 @@
         initializeJLisp();
         initializeTopLevel();
+        initializeSystem();
         processInitializationFile();
         return interpreter;
@@ -210 +212 @@
             e.printStackTrace();
         }
+    }
+
+    private static synchronized void initializeSystem() 
+    {
+        Load.loadSystemFile("system");
     }
 

trunk/abcl/src/org/armedbear/lisp/boot.lisp ¶

@@ -210 +210 @@
              (float (/ (ext:uptime) 1000)))))
 
-;;; "system.lisp" contains system installation specific information
-;;; (currently only the logical pathname definition for "SYS;SRC")
-;;; that is not currently required for ABCL to run.  Since
-;;; LOAD-SYSTEM-FILE exits the JVM if its argument cannot be found, we
-;;; use REQUIRE trapping any error.
-(handler-case 
-    (require 'system)
-  (t ()))
-
+