X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fearly-setf.lisp;h=ff87f9fbfcf2f2970a396f9acc6e1f6ae6f1ba52;hb=334af30b26555f0bf706f7157b399bdbd4fad548;hp=bd1c4737440047afaa2e2f33e14f4ebddd2d24d7;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git diff --git a/src/code/early-setf.lisp b/src/code/early-setf.lisp index bd1c473..ff87f9f 100644 --- a/src/code/early-setf.lisp +++ b/src/code/early-setf.lisp @@ -17,9 +17,6 @@ (in-package "SB!IMPL") -(file-comment - "$Header$") - ;;; The inverse for a generalized-variable reference function is stored in ;;; one of two ways: ;;; @@ -286,10 +283,10 @@ GET-SETF-EXPANSION directly." ((eq arg '&rest) (if (symbolp (cadr ll)) (setq rest-arg (cadr ll)) - (error "Non-symbol &REST arg in definition of ~S." name)) + (error "Non-symbol &REST argument in definition of ~S." name)) (if (null (cddr ll)) (return nil) - (error "Illegal stuff after &REST arg."))) + (error "Illegal stuff after &REST argument."))) ((memq arg '(&key &allow-other-keys &aux)) (error "~S not allowed in DEFINE-MODIFY-MACRO lambda list." arg)) ((symbolp arg) @@ -329,7 +326,7 @@ GET-SETF-EXPANSION directly." ;;;; DEFSETF (eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute) - ;;; Assign setf macro information for NAME, making all appropriate checks. + ;;; Assign SETF macro information for NAME, making all appropriate checks. (defun assign-setf-macro (name expander inverse doc) (cond ((gethash name sb!c:*setf-assumed-fboundp*) (warn @@ -344,7 +341,7 @@ GET-SETF-EXPANSION directly." (warn "defining SETF macro for DEFSTRUCT slot ~ accessor; redefining as a normal function: ~S" name) - (sb!c::proclaim-as-function-name name)) + (proclaim-as-function-name name)) ((not (eq (symbol-package name) (symbol-package 'aref))) (style-warn "defining setf macro for ~S when ~S is fbound" name `(setf ,name)))) @@ -518,10 +515,7 @@ GET-SETF-EXPANSION directly." (error "SETF of APPLY is only defined for function args like #'SYMBOL.")) (let ((function (second functionoid)) (new-var (gensym)) - (vars (mapcar #'(lambda (x) - (declare (ignore x)) - (gensym)) - args))) + (vars (make-gensym-list (length args)))) (values vars args (list new-var) `(apply #'(setf ,function) ,new-var ,@vars) `(apply #',function ,@vars))))