X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fearly-setf.lisp;h=4ee0528164ab343dce74e2d92e230b78422c0330;hb=86210c4e406c1b2ff10cc3bac0e71435867db48b;hp=e532da630405d1f31ec49bb9bf433b0cee49d239;hpb=74a48d09e08aead6f67204878bdf9be4f448e1e8;p=sbcl.git diff --git a/src/code/early-setf.lisp b/src/code/early-setf.lisp index e532da6..4ee0528 100644 --- 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))))