X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Flate-format.lisp;h=27d2b3ab87b4566be66314ec92d11f71949ad583;hb=1bfc464c657a8f4ad24ef612f76a38d8f6f1bbad;hp=c24384f36d78e72f5f560314a5313414494e5540;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git

diff --git a/src/code/late-format.lisp b/src/code/late-format.lisp
index c24384f..27d2b3a 100644
--- a/src/code/late-format.lisp
+++ b/src/code/late-format.lisp
@@ -263,7 +263,7 @@
 			     (error
 			      'format-error
 			      :complaint
-			      "too many parameters, expected no more than ~D"
+			      "too many parameters, expected no more than ~W"
 			      :arguments (list ,(length specs))
 			      :offset (caar ,params)))
 		       ,,@body)))
@@ -460,6 +460,7 @@
 			  :complaint "no previous argument"))
 		 (caar *simple-args*))
 		(t
+		 (/show0 "THROWing NEED-ORIG-ARGS from tilde-P")
 		 (throw 'need-orig-args nil)))))
       (if atsignp
 	  `(write-string (if (eql ,arg 1) "y" "ies") stream)
@@ -611,17 +612,19 @@
 		 "both colon and atsign modifiers used simultaneously")
 	  (expand-bind-defaults ((posn 0)) params
 	    (unless *orig-args-available*
+	      (/show0 "THROWing NEED-ORIG-ARGS from tilde-@*")
 	      (throw 'need-orig-args nil))
 	    `(if (<= 0 ,posn (length orig-args))
 		 (setf args (nthcdr ,posn orig-args))
 		 (error 'format-error
-			:complaint "Index ~D out of bounds. Should have been ~
-				    between 0 and ~D."
+			:complaint "Index ~W out of bounds. Should have been ~
+				    between 0 and ~W."
 			:arguments (list ,posn (length orig-args))
 			:offset ,(1- end)))))
       (if colonp
 	  (expand-bind-defaults ((n 1)) params
 	    (unless *orig-args-available*
+	      (/show0 "THROWing NEED-ORIG-ARGS from tilde-:*")
 	      (throw 'need-orig-args nil))
 	    `(do ((cur-posn 0 (1+ cur-posn))
 		  (arg-ptr orig-args (cdr arg-ptr)))
@@ -631,8 +634,8 @@
 			(setf args (nthcdr new-posn orig-args))
 			(error 'format-error
 			       :complaint
-			       "Index ~D is out of bounds; should have been ~
-				between 0 and ~D."
+			       "Index ~W is out of bounds; should have been ~
+				between 0 and ~W."
 			       :arguments
 			       (list new-posn (length orig-args))
 			       :offset ,(1- end)))))))