Changeset 11810

Timestamp:

05/01/09 20:40:07 (14 years ago)

Author:

ehuelsmann

Message:

Fix file compilation with :output-file parameter
compiling code which uses a :compile-toplevel EVAL-WHEN
condition.

Found by: Stas Boukarev (stassats at gmail)

File:

• trunk/abcl/src/org/armedbear/lisp/compile-file.lisp (modified) (1 diff)

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

@@ -314 +314 @@
 ;;                      (setf form (precompile-form form nil))
                      (note-toplevel-form form)
-                     (setf form (convert-toplevel-form form))
+                     (let ((new-form (convert-toplevel-form form)))
+                       (when (consp new-form)
+                         (dump-form new-form stream)
+                         (%stream-terpri stream)))
+                     (when compile-time-too
+                       (eval form))
+                     (return-from process-toplevel-form)
                      )))))))
   (when (consp form)