Changeset 14111

Timestamp:

08/17/12 16:02:52 (10 years ago)

Author:

ehuelsmann

Message:

Reverse the REQUIREs graph: before, modules would require JVM,
which would require the rest of the compiler. That doesn't work
with the automatic autoloader, because that requires the files
in which symbol function bindings are located.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• compile-file.lisp (modified) (1 diff)
• compiler-pass1.lisp (modified) (1 diff)
• compiler-pass2.lisp (modified) (1 diff)
• jvm-instructions.lisp (modified) (1 diff)
• jvm.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/compile-file.lisp

@@ -32 +32 @@
 (in-package #:system)
 
-(require "JVM")
-;; (require "COMPILER-ERROR") already made accessible through JVM
+(require "COMPILER-PASS2")
 
 (defvar *fbound-names*)

trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp

@@ -40 +40 @@
 (require "KNOWN-SYMBOLS")
 (require "DUMP-FORM")
-(require "OPCODES")
 (require "JAVA")
 

trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -44 +44 @@
   (require "JVM-INSTRUCTIONS")
   (require "JVM-CLASS-FILE")
+  (require "JVM")
+  (require "COMPILER-PASS1")
   (require "JAVA"))
 

trunk/abcl/src/org/armedbear/lisp/jvm-instructions.lisp

@@ -32 +32 @@
 
 (in-package #:jvm)
+
+(require "COMPILER-ERROR")
+
 
 (declaim (inline u2 s1 s2))

trunk/abcl/src/org/armedbear/lisp/jvm.lisp

@@ -35 +35 @@
           derive-compiler-type))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (require "LOOP")
-  (require "FORMAT")
-  (require "CLOS")
-  (require "PRINT-OBJECT")
-  (require "COMPILER-TYPES")
-  (require "COMPILER-ERROR")
-  (require "KNOWN-FUNCTIONS")
-  (require "DUMP-FORM")
-  (require "JVM-INSTRUCTIONS")
-  (require "JVM-CLASS-FILE")
-  (require "KNOWN-SYMBOLS")
-  (require "JAVA")
-  (require "COMPILER-PASS1")
-  (require "COMPILER-PASS2"))
+(require "JVM-CLASS-FILE")
 
 (defvar *closure-variables* nil)