X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsetf-funs.lisp;h=5899a243cbd85b5fa6239ae4ef33b415307df49a;hb=a160917364f85b38dc0826a5e3dcef87e3c4c62c;hp=cdeba891a3961ce9ece925829706d9aa0c9466d8;hpb=f4f18b9dcdaf1948947b1747f5bfa766a1a0ee4c;p=sbcl.git diff --git a/src/code/setf-funs.lisp b/src/code/setf-funs.lisp index cdeba89..5899a24 100644 --- a/src/code/setf-funs.lisp +++ b/src/code/setf-funs.lisp @@ -16,18 +16,18 @@ (defun compute-one-setter (name type) (let* ((args (second type)) - (res (type-specifier - (single-value-type - (values-specifier-type (third type))))) - (arglist (make-gensym-list (1+ (length args))))) + (res (type-specifier + (single-value-type + (values-specifier-type (third type))))) + (arglist (make-gensym-list (1+ (length args))))) (cond ((null (intersection args sb!xc:lambda-list-keywords)) `(defun (setf ,name) ,arglist - (declare ,@(mapcar #'(lambda (arg type) - `(type ,type ,arg)) - arglist - (cons res args))) - (setf (,name ,@(rest arglist)) ,(first arglist)))) + (declare ,@(mapcar (lambda (arg type) + `(type ,type ,arg)) + arglist + (cons res args))) + (setf (,name ,@(rest arglist)) ,(first arglist)))) (t (warn "hairy SETF expander for function ~S" name) nil)))) @@ -37,18 +37,18 @@ (collect ((res)) (dolist (pkg packages) (do-external-symbols (sym pkg) - (when (and (fboundp sym) - (eq (info :function :kind sym) :function) - (or (info :setf :inverse sym) - (info :setf :expander sym)) - (not (member sym ignore))) - (let ((type (type-specifier (info :function :type sym)))) - (aver (consp type)) - #!-sb-fluid (res `(declaim (inline (setf ,sym)))) - (res (compute-one-setter sym type)))))) + (when (and (fboundp sym) + (eq (info :function :kind sym) :function) + (or (info :setf :inverse sym) + (info :setf :expander sym)) + (not (member sym ignore))) + (let ((type (type-specifier (info :function :type sym)))) + (aver (consp type)) + #!-sb-fluid (res `(declaim (inline (setf ,sym)))) + (res (compute-one-setter sym type)))))) `(progn ,@(res)))) -); eval-when (compile eval) +) ; EVAL-WHEN (define-setters ("COMMON-LISP") ;; Semantically silly...