X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsetf-funs.lisp;h=741fb61dff3d5e4888f0d744e10dce75fbc022fe;hb=54da325f13fb41669869aea688ae195426c0e231;hp=4073fc89f0876b692d0243840053da83399fdc75;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git

diff --git a/src/code/setf-funs.lisp b/src/code/setf-funs.lisp
index 4073fc8..741fb61 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 lambda-list-keywords))
+     ((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,23 @@
   (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))))
-	    (assert (consp type))
-	    #!-sb-fluid (res `(declaim (inline (setf ,sym))))
-	    (res (compute-one-setter sym type))))))
-    `(progn ,@(res))))
+        (when (and (fboundp sym)
+                   (eq (info :function :kind sym) :function)
+                   (or (info :setf :inverse sym)
+                       (info :setf :expander sym))
+                   (not (member sym ignore)))
+          (res sym))))
+    `(progn
+      ,@(mapcan
+         (lambda (sym)
+           (let ((type (type-specifier (info :function :type sym))))
+             (aver (consp type))
+             (list
+              #!-sb-fluid `(declaim (inline (setf ,sym)))
+              (compute-one-setter sym type))))
+         (sort (res) #'string<)))))
 
-); eval-when (compile eval)
+) ; EVAL-WHEN
 
 (define-setters ("COMMON-LISP")
   ;; Semantically silly...