Changeset 13532 for trunk/abcl/src

Timestamp:

08/23/11 10:43:03 (11 years ago)

Author:

Mark Evenson

Message:

Fix compiler for compile-time toplevel defstruct with print-object.

Fixes some problems which arose in compiling SBCL.

File:

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

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

@@ -272 +272 @@
 
 
+    (when compile-time-too
+      (let* ((copy-form (copy-tree form))
+             ;; ### Ideally, the precompiler would leave the forms alone
+             ;;  and copy them where required, instead of forcing us to
+             ;;  do a deep copy in advance
+             (precompiled-form (precompiler:precompile-form copy-form nil
+                                                            *compile-file-environment*)))
+        (eval precompiled-form)))
     (convert-ensure-method form :function)
     (convert-ensure-method form :fast-function))
-  (let ((form (precompiler:precompile-form form nil
-                                           *compile-file-environment*)))
-    (when compile-time-too
-      (eval form))
-    form))
+  (precompiler:precompile-form form nil *compile-file-environment*))
 
 (declaim (ftype (function (t t t) t) process-toplevel-defvar/defparameter))