X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fwalk.lisp;h=4f93a74730d89b69897a32d2325cf7c24113bf29;hb=ee5629ee974ee8ce7a1cb245a99e94f8943ffd90;hp=3f6d209120447bad06a3f5f53a92465fa6ddac94;hpb=cee152fc57eb64c73f6822a5b1ba8668f8aeb9b9;p=sbcl.git

diff --git a/src/pcl/walk.lisp b/src/pcl/walk.lisp
index 3f6d209..4f93a74 100644
--- a/src/pcl/walk.lisp
+++ b/src/pcl/walk.lisp
@@ -492,7 +492,7 @@
                 (multiple-value-bind (newnewform macrop)
                     (walker-environment-bind
                         (new-env env :walk-form newform)
-                      (sb-xc:macroexpand-1 newform new-env))
+                      (%macroexpand-1 newform new-env))
                   (cond
                    (macrop
                     (let ((newnewnewform (walk-form-internal newnewform
@@ -654,7 +654,7 @@
               (null (get-walker-template (car form) form))
               (progn
                 (multiple-value-setq (new-form macrop)
-                                     (sb-xc:macroexpand-1 form env))
+                                     (%macroexpand-1 form env))
                 macrop))
          ;; This form was a call to a macro. Maybe it expanded
          ;; into a declare?  Recurse to find out.
@@ -866,7 +866,7 @@
             (let* ((type (env-var-type var env))
                    (expanded (if (eq t type)
                                  `(setf ,(cddr symmac) ,val)
-                                 `(setf ,(cddr symmac) `(the ,type ,val))))
+                                 `(setf ,(cddr symmac) (the ,type ,val))))
                    (walked (walk-form-internal expanded context env)))
               (if (eq expanded walked)
                   form