[armedbear-cvs] r12761 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Mon Jun 21 16:42:53 2010
New Revision: 12761

Log:
Fix compilation of toplevel MACROLET forms.

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

Modified: trunk/abcl/src/org/armedbear/lisp/compile-file.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	Mon Jun 21 16:42:53 2010
@@ -176,7 +176,7 @@
                                             (push e internal-compiler-errors)
                                             (continue))))
                                     (report-error
-                                     (jvm:compile-defun name expr nil
+                                     (jvm:compile-defun name expr *compile-file-environment*
                                                         classfile f nil)))))
                         (compiled-function (if (not internal-compiler-errors)
                                                (verify-load classfile)
@@ -253,7 +253,8 @@
 		      :element-type '(unsigned-byte 8)
 		      :if-exists :supersede)
 		 (ignore-errors
-		   (jvm:compile-defun nil expr nil classfile f nil)))
+		   (jvm:compile-defun nil expr *compile-file-environment*
+                                      classfile f nil)))
                (if (null (verify-load classfile))
                    ;; FIXME error or warning
                    (format *error-output* "; Unable to compile macro ~A~%" name)
@@ -396,7 +397,9 @@
 			 :element-type '(unsigned-byte 8)
 			 :if-exists :supersede)
 		    (report-error
-		     (jvm:compile-defun nil lambda-expression nil classfile f nil))))
+		     (jvm:compile-defun nil lambda-expression
+                                        *compile-file-environment*
+                                        classfile f nil))))
                  (compiled-function (verify-load classfile)))
 	    (declare (ignore result))
             (cond (compiled-function
@@ -443,8 +446,8 @@
 		 :direction :output
 		 :element-type '(unsigned-byte 8)
 		 :if-exists :supersede)
-	    (report-error (jvm:compile-defun nil expr nil classfile
-                                             f declare-inline))))
+	    (report-error (jvm:compile-defun nil expr *compile-file-environment*
+                                             classfile f declare-inline))))
          (compiled-function (verify-load classfile)))
     (declare (ignore result))
     (setf form
@@ -703,7 +706,7 @@
 		   :direction :output
 		   :element-type '(unsigned-byte 8)
 		   :if-exists :supersede)
-	      (jvm:compile-defun nil expr nil
+	      (jvm:compile-defun nil expr *compile-file-environment*
 				 classfile f nil))))))
 
 (defun compile-file-if-needed (input-file &rest allargs &key force-compile