0.pre7.136:

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

diff --git a/src/code/late-format.lisp b/src/code/late-format.lisp
index db53996..3aefd3d 100644 (file)
--- a/src/code/late-format.lisp
+++ b/src/code/late-format.lisp
@@ -11,7 +11,7 @@
 \f
 (define-condition format-error (error)
   ((complaint :reader format-error-complaint :initarg :complaint)
-   (arguments :reader format-error-arguments :initarg :arguments :initform nil)
+   (args :reader format-error-args :initarg :args :initform nil)
    (control-string :reader format-error-control-string
                   :initarg :control-string
                   :initform *default-format-error-control-string*)
@@ -27,7 +27,7 @@
                 ~?~@[~%  ~A~%  ~V@T^~]"
          (format-error-print-banner condition)
          (format-error-complaint condition)
-         (format-error-arguments condition)
+         (format-error-args condition)
          (format-error-control-string condition)
          (format-error-offset condition)))
 \f
@@ -263,8 +263,8 @@
                             (error
                              'format-error
                              :complaint
-                             "too many parameters, expected no more than ~D"
-                             :arguments (list ,(length specs))
+                             "too many parameters, expected no more than ~W"
+                             :args (list ,(length specs))
                              :offset (caar ,params)))
                       ,,@body)))
        `(progn
@@ -617,9 +617,9 @@
            `(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."
-                       :arguments (list ,posn (length orig-args))
+                       :complaint "Index ~W out of bounds. Should have been ~
+                                   between 0 and ~W."
+                       :args (list ,posn (length orig-args))
                        :offset ,(1- end)))))
       (if colonp
          (expand-bind-defaults ((n 1)) params
@@ -634,10 +634,9 @@
                        (setf args (nthcdr new-posn orig-args))
                        (error 'format-error
                               :complaint
-                              "Index ~D is out of bounds; should have been ~
-                               between 0 and ~D."
-                              :arguments
-                              (list new-posn (length orig-args))
+                              "Index ~W is out of bounds; should have been ~
+                               between 0 and ~W."
+                              :args (list new-posn (length orig-args))
                               :offset ,(1- end)))))))
          (if params
              (expand-bind-defaults ((n 1)) params
@@ -655,14 +654,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:"
+                   :args (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 +866,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:"
+                                     :args (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))
@@ -970,7 +969,7 @@
                              :complaint
                              "cannot include format directives inside the ~
                               ~:[suffix~;prefix~] segment of ~~<...~~:>"
-                             :arguments (list prefix-p)
+                             :args (list prefix-p)
                              :offset (1- (format-directive-end directive)))
                       (apply #'concatenate 'string list)))))
        (case (length segments)
@@ -1104,10 +1103,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
@@ -1156,7 +1155,7 @@
        ;; FIND-UNDELETED-PACKAGE-OR-LOSE?
        (error 'format-error
               :complaint "no package named ~S"
-              :arguments (list package-name)))
+              :args (list package-name)))
       (intern (if first-colon
                  (subseq name (1+ first-colon))
                  name)