0.pre7.125:

[sbcl.git] / src / code / late-format.lisp

diff --git a/src/code/late-format.lisp b/src/code/late-format.lisp
index db53996..998468b 100644 (file)
--- 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)))
@@ -617,8 +617,8 @@
            `(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
@@ -634,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)))))))
@@ -655,14 +655,14 @@
   (expand-bind-defaults () params
     `(handler-bind
         ((format-error
-          #'(lambda (condition)
-              (error 'format-error
-                     :complaint
-                     "~A~%while processing indirect format string:"
-                     :arguments (list condition)
-                     :print-banner nil
-                     :control-string ,string
-                     :offset ,(1- end)))))
+          (lambda (condition)
+            (error 'format-error
+                   :complaint
+                   "~A~%while processing indirect format string:"
+                   :arguments (list condition)
+                   :print-banner nil
+                   :control-string ,string
+                   :offset ,(1- end)))))
        ,(if atsignp
            (if *orig-args-available*
                `(setf args (%format stream ,(expand-next-arg) orig-args args))
@@ -867,14 +867,14 @@
                 (if *orig-args-available*
                     `((handler-bind
                           ((format-error
-                            #'(lambda (condition)
-                                (error 'format-error
-                                       :complaint
-                       "~A~%while processing indirect format string:"
-                                       :arguments (list condition)
-                                       :print-banner nil
-                                       :control-string ,string
-                                       :offset ,(1- end)))))
+                            (lambda (condition)
+                              (error 'format-error
+                                     :complaint
+                             "~A~%while processing indirect format string:"
+                                     :arguments (list condition)
+                                     :print-banner nil
+                                     :control-string ,string
+                                     :offset ,(1- end)))))
                         (setf args
                               (%format stream inside-string orig-args args))))
                     (throw 'need-orig-args nil))
@@ -1104,10 +1104,10 @@
                       (line-len '(or (sb!impl::line-length stream) 72)))
                      (format-directive-params first-semi)
                    `(setf extra-space ,extra line-len ,line-len))))
-          ,@(mapcar #'(lambda (segment)
-                        `(push (with-output-to-string (stream)
-                                 ,@(expand-directive-list segment))
-                               segments))
+          ,@(mapcar (lambda (segment)
+                      `(push (with-output-to-string (stream)
+                               ,@(expand-directive-list segment))
+                             segments))
                     segments))
         (format-justification stream
                               ,@(if newline-segment-p