X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fearly-extensions.lisp;h=9e528e86cdeced0711da66693074dcd68a27daef;hb=5edd74f6911093805a009a152b32216b3dba59f7;hp=6ebac2483054a1ece91e37c1f203c0196cd3f09d;hpb=90ca09b75fbc3b63b2f7d09c67b04b866dd783f6;p=sbcl.git

diff --git a/src/code/early-extensions.lisp b/src/code/early-extensions.lisp
index 6ebac24..9e528e8 100644
--- a/src/code/early-extensions.lisp
+++ b/src/code/early-extensions.lisp
@@ -462,8 +462,8 @@
 		  (,n-cache ,var-name))
 	      (declare (type fixnum ,n-index))
 	      ,@(sets)
-	      ,@(mapcar #'(lambda (i val)
-			    `(setf (svref ,n-cache ,i) ,val))
+	      ,@(mapcar (lambda (i val)
+			  `(setf (svref ,n-cache ,i) ,val))
 			(values-indices)
 			(values-names))
 	      (values)))))
@@ -479,8 +479,8 @@
 		  (dotimes (i nargs)
 		    (arg-sets `(setf (svref ,n-cache (+ ,n-index ,i)) nil)))
 		  (arg-sets))
-	      ,@(mapcar #'(lambda (i val)
-			    `(setf (svref ,n-cache ,i) ,val))
+	      ,@(mapcar (lambda (i val)
+			  `(setf (svref ,n-cache ,i) ,val))
 			(values-indices)
 			default-values))
 	    (values)))
@@ -711,16 +711,15 @@
 ;;; guts of complex systems anyway, I replaced it too.)
 (defmacro aver (expr)
   `(unless ,expr
-     (%failed-aver ,(let ((*package* (find-package :keyword)))
-		      (format nil "~S" expr)))))
+     (%failed-aver ,(format nil "~A" expr))))
 (defun %failed-aver (expr-as-string)
-  (error "~@<internal error, failed AVER: ~2I~_~S~:>" expr-as-string))
+  (bug "~@<failed AVER: ~2I~_~S~:>" expr-as-string))
 (defmacro enforce-type (value type)
   (once-only ((value value))
     `(unless (typep ,value ',type)
        (%failed-enforce-type ,value ',type))))
 (defun %failed-enforce-type (value type)
-  (error 'simple-type-error
+  (error 'simple-type-error ; maybe should be TYPE-BUG, subclass of BUG?
 	 :value value
 	 :expected-type type
 	 :format-string "~@<~S ~_is not a ~_~S~:>"