(I seem to've screwed up during the checkin of 0.pre7.131 before, so

[sbcl.git] / src / code / early-setf.lisp

diff --git a/src/code/early-setf.lisp b/src/code/early-setf.lisp
index 8a21d7a..4ee0528 100644 (file)
--- a/src/code/early-setf.lisp
+++ b/src/code/early-setf.lisp
@@ -47,7 +47,7 @@
          ;; Local functions inhibit global SETF methods.
          ((and environment
                (let ((name (car form)))
-                 (dolist (x (sb!c::lexenv-functions environment))
+                 (dolist (x (sb!c::lexenv-funs environment))
                    (when (and (eq (car x) name)
                               (not (sb!c::defined-fun-p (cdr x))))
                      (return t)))))
@@ -101,7 +101,7 @@ GET-SETF-EXPANSION directly."
                                 `(funcall #'(setf ,(car form)))
                                 t))))
 
-(defun get-setf-method-inverse (form inverse setf-function)
+(defun get-setf-method-inverse (form inverse setf-fun)
   (let ((new-var (gensym))
        (vars nil)
        (vals nil))
@@ -110,7 +110,7 @@ GET-SETF-EXPANSION directly."
       (push x vals))
     (setq vals (nreverse vals))
     (values vars vals (list new-var)
-           (if setf-function
+           (if setf-fun
                `(,@inverse ,new-var ,@vars)
                `(,@inverse ,@vars ,new-var))
            `(,(car form) ,@vars))))
@@ -174,8 +174,8 @@ GET-SETF-EXPANSION directly."
         `(let* ,(nreverse bindlist) ,@(nreverse storelist) ,resultvar))
       (multiple-value-bind (sm1 sm2 sm3 sm4 sm5)
          (get-setf-method (first arglist) env)
-       (mapc #'(lambda (var val)
-                 (push `(,var ,val) bindlist))
+       (mapc (lambda (var val)
+               (push `(,var ,val) bindlist))
              sm1
              sm2)
        (push `(,lastvar ,sm5) bindlist)
@@ -378,13 +378,13 @@ GET-SETF-EXPANSION directly."
               `(eval-when (:compile-toplevel :load-toplevel :execute)
                  (assign-setf-macro
                   ',access-fn
-                  #'(lambda (,access-form-var ,env-var)
-                      (declare (ignore ,env-var))
-                      (%defsetf ,access-form-var ,(length store-variables)
-                                #'(lambda (,arglist-var)
-                                    ,@local-decs
-                                    (block ,access-fn
-                                      ,body))))
+                  (lambda (,access-form-var ,env-var)
+                    (declare (ignore ,env-var))
+                    (%defsetf ,access-form-var ,(length store-variables)
+                              (lambda (,arglist-var)
+                                ,@local-decs
+                                (block ,access-fn
+                                  ,body))))
                   nil
                   ',doc))))))
        (t
@@ -432,9 +432,9 @@ GET-SETF-EXPANSION directly."
                        :environment environment)
       `(eval-when (:compile-toplevel :load-toplevel :execute)
         (assign-setf-macro ',access-fn
-                           #'(lambda (,whole ,environment)
-                               ,@local-decs
-                               (block ,access-fn ,body))
+                           (lambda (,whole ,environment)
+                             ,@local-decs
+                             (block ,access-fn ,body))
                            nil
                            ',doc)))))