0.pre7.124:

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

diff --git a/src/code/setf-funs.lisp b/src/code/setf-funs.lisp
index 4073fc8..16c0878 100644 (file)
--- a/src/code/setf-funs.lisp
+++ b/src/code/setf-funs.lisp
@@ -21,10 +21,10 @@
                (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))
+        (declare ,@(mapcar (lambda (arg type)
+                             `(type ,type ,arg))
                            arglist
                            (cons res args)))
         (setf (,name ,@(rest arglist)) ,(first arglist))))
@@ -43,7 +43,7 @@
                       (info :setf :expander sym))
                   (not (member sym ignore)))
          (let ((type (type-specifier (info :function :type sym))))
-           (assert (consp type))
+           (aver (consp type))
            #!-sb-fluid (res `(declaim (inline (setf ,sym))))
            (res (compute-one-setter sym type))))))
     `(progn ,@(res))))