X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Finterr.lisp;h=231992db337a6072264581d362ab3e76708dc4d1;hb=e0814eee6f6dea52db010b45a330100f2fe65832;hp=b5e3b7cb3fa106aefe331e54141cd1a8d6fcc47e;hpb=718b3ccc610d1255f928fa75059f035638b57f94;p=sbcl.git

diff --git a/src/code/interr.lisp b/src/code/interr.lisp
index b5e3b7c..231992d 100644
--- a/src/code/interr.lisp
+++ b/src/code/interr.lisp
@@ -38,20 +38,20 @@
 	 ;; he ended up inside the system error-handling logic.
 	 (declare (ignorable name ,fp ,context ,sc-offsets))
 	 (let (,@(let ((offset -1))
-		   (mapcar #'(lambda (var)
-			       `(,var (sb!di::sub-access-debug-var-slot
-				       ,fp
-				       (nth ,(incf offset)
-					    ,sc-offsets)
-				       ,context)))
+		   (mapcar (lambda (var)
+			     `(,var (sb!di::sub-access-debug-var-slot
+				     ,fp
+				     (nth ,(incf offset)
+					  ,sc-offsets)
+				     ,context)))
 			   required))
 	       ,@(when rest-pos
 		   `((,(nth (1+ rest-pos) args)
-		      (mapcar #'(lambda (sc-offset)
-				  (sb!di::sub-access-debug-var-slot
-				   ,fp
-				   sc-offset
-				   ,context))
+		      (mapcar (lambda (sc-offset)
+				(sb!di::sub-access-debug-var-slot
+				 ,fp
+				 sc-offset
+				 ,context))
 			      (nthcdr ,rest-pos ,sc-offsets))))))
 	   ,@body))
        (setf (svref *internal-errors* ,(error-number-or-lose name))
@@ -257,7 +257,7 @@
 (deferr invalid-array-index-error (array bound index)
   (error 'simple-error
 	 :format-control
-	 "invalid array index ~D for ~S (should be nonnegative and <~D)"
+	 "invalid array index ~W for ~S (should be nonnegative and <~W)"
 	 :format-arguments (list index array bound)))
 
 (deferr object-not-simple-array-error (object)
@@ -458,25 +458,6 @@
        (/show0 "cold/low ARGUMENTS=..")
        (/hexstr arguments)
 
-       ;; REMOVEME
-       (/show0 "cold/low (LENGTH ARGUMENTS)=..")
-       (/hexstr (length arguments))
-       (dolist (argument arguments)
-	 (/show0 "cold/low ARGUMENT=..")
-	 (/hexstr argument)
-	 (if (symbolp argument)
-	     (progn
-	       (/show0 "Argument is a SYMBOL..")
-	       (/primitive-print (symbol-name argument)))
-	     (let ((argument-type (type-of argument)))
-	       (cond ((symbolp argument-type)
-		      (/show0 "Argument type is a SYMBOL..")
-		      (/primitive-print (symbol-name argument-type)))
-		     ((listp argument-type)
-		      (/primitive-print "Argument type is a LIST."))
-		     (t
-		      (/primitive-print "Argument type is not a SYMBOL or LIST."))))))
-
        (multiple-value-bind (name sb!debug:*stack-top-hint*)
 	   (find-interrupted-name)
 	 (/show0 "back from FIND-INTERRUPTED-NAME")
@@ -487,12 +468,12 @@
 	   (cond ((null handler)
 		  (error 'simple-error
 			 :format-control
-			 "unknown internal error, ~D? args=~S"
+			 "unknown internal error, ~D, args=~S"
 			 :format-arguments
 			 (list error-number
-			       (mapcar #'(lambda (sc-offset)
-					   (sb!di::sub-access-debug-var-slot
-					    fp sc-offset alien-context))
+			       (mapcar (lambda (sc-offset)
+					 (sb!di::sub-access-debug-var-slot
+					  fp sc-offset alien-context))
 				       arguments))))
 		 ((not (functionp handler))
 		  (error 'simple-error
@@ -500,9 +481,9 @@
 			 :format-arguments
 			 (list error-number
 			       handler
-			       (mapcar #'(lambda (sc-offset)
-					   (sb!di::sub-access-debug-var-slot
-					    fp sc-offset alien-context))
+			       (mapcar (lambda (sc-offset)
+					 (sb!di::sub-access-debug-var-slot
+					  fp sc-offset alien-context))
 				       arguments))))
 		 (t
 		  (funcall handler name fp alien-context arguments)))))))))