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

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Thu Aug  9 11:40:46 2012
New Revision: 14068

Log:
Follow up to r14066: expand place in the precompiler environment, which
is what the replaced expand-macro call did do correctly.

Modified:
   trunk/abcl/src/org/armedbear/lisp/precompiler.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/precompiler.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/precompiler.lisp	Thu Aug  9 02:19:40 2012	(r14067)
+++ trunk/abcl/src/org/armedbear/lisp/precompiler.lisp	Thu Aug  9 11:40:46 2012	(r14068)
@@ -495,7 +495,7 @@
                ;; Expand once in case the form expands
                ;; into something that needs special
                ;; SETF treatment
-               (macroexpand-1 place)
+               (macroexpand-1 place *precompile-env*)
              (if expanded
                  (precompile1 (list* 'SETF expansion
                                      (cddr form)))
@@ -517,7 +517,7 @@
               ;; Expand once in case the form expands
               ;; into something that needs special
               ;; SETF treatment
-              (macroexpand-1 sym)
+              (macroexpand-1 sym *precompile-env*)
             (if expanded
                 (precompile1 (list 'SETF expansion val))
                 (list 'SETQ sym (precompile1 val)))))