X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcas.lisp;h=72e5800803fa983974c9235723a66427c8e0752d;hb=a92a8d84d5b97d7504437bdcb04917162609a66c;hp=63ff0d96cbf7015801bf20fa9f9dfd223e3c1bc9;hpb=126b9cfb25799ca41210c1a1658de30e1ff372e7;p=sbcl.git

diff --git a/src/code/cas.lisp b/src/code/cas.lisp
index 63ff0d9..72e5800 100644
--- a/src/code/cas.lisp
+++ b/src/code/cas.lisp
@@ -80,9 +80,9 @@ Example:
           ,new))))
 
 EXPERIMENTAL: Interface subject to change."
-  (flet ((invalid-place ()
-           (error "Invalid place to CAS: ~S" place)))
     (let ((expanded (sb!xc:macroexpand place environment)))
+      (flet ((invalid-place ()
+           (error "Invalid place to CAS: ~S -> ~S" place expanded)))
       (unless (consp expanded)
         ;; FIXME: Allow (CAS *FOO* <OLD> <NEW>), maybe?
         (invalid-place))
@@ -93,7 +93,7 @@ EXPERIMENTAL: Interface subject to change."
           (cond
             ;; CAS expander.
             (info
-             (funcall info place environment))
+             (funcall info expanded environment))
 
             ;; Structure accessor
             ((setf info (info :function :structure-accessor name))