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

[Erik Huelsmann]

Author: ehuelsmann
Date: Sat Jan  1 09:53:38 2011
New Revision: 13116

Log:
Remove layering violation from compiler-pass2::p2-setq;
there should be no macroexpansion or precompiler calls: that's pass1.


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

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Sat Jan  1 09:53:38 2011
@@ -6075,13 +6075,7 @@
 (defknown p2-setq (t t t) t)
 (defun p2-setq (form target representation)
   (unless (= (length form) 3)
-    (return-from p2-setq (compile-form (precompiler:precompile-form form t
-                                                        *compile-file-environment*)
-                                       target representation)))
-  (let ((expansion (macroexpand (%cadr form) *compile-file-environment*)))
-    (unless (eq expansion (%cadr form))
-      (compile-form (list 'SETF expansion (%caddr form)) target representation)
-      (return-from p2-setq)))
+    (assert (not "p2-setq should receive exactly 2 arguments!")))
   (let* ((name (%cadr form))
          (variable (find-visible-variable name))
          (value-form (%caddr form)))