0.pre7.122:

[sbcl.git] / src / code / condition.lisp

diff --git a/src/code/condition.lisp b/src/code/condition.lisp
index 935a2a6..d7517ae 100644 (file)
--- a/src/code/condition.lisp
+++ b/src/code/condition.lisp
@@ -90,7 +90,7 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (/show0 "condition.lisp 103")
   (let ((condition-class (locally
-                          ;; KLUDGE: There's a FIND-CLASS DEFTRANSFORM for
+                          ;; KLUDGE: There's a DEFTRANSFORM FIND-CLASS for
                           ;; constant class names which creates fast but
                           ;; non-cold-loadable, non-compact code. In this
                           ;; context, we'd rather have compact, cold-loadable
@@ -102,15 +102,15 @@
   (/show0 "condition.lisp 103"))
 
 (setf (condition-class-report (locally
-                               ;; KLUDGE: There's a FIND-CLASS DEFTRANSFORM
+                               ;; KLUDGE: There's a DEFTRANSFORM FIND-CLASS 
                                ;; for constant class names which creates fast
                                ;; but non-cold-loadable, non-compact code. In
                                ;; this context, we'd rather have compact,
                                ;; cold-loadable code. -- WHN 19990928
                                (declare (notinline sb!xc:find-class))
                                (find-class 'condition)))
-      #'(lambda (cond stream)
-         (format stream "Condition ~S was signalled." (type-of cond))))
+      (lambda (cond stream)
+       (format stream "Condition ~S was signalled." (type-of cond))))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 
@@ -118,9 +118,9 @@
   (let* ((cpl (remove-duplicates
               (reverse
                (reduce #'append
-                       (mapcar #'(lambda (x)
-                                   (condition-class-cpl
-                                    (sb!xc:find-class x)))
+                       (mapcar (lambda (x)
+                                 (condition-class-cpl
+                                  (sb!xc:find-class x)))
                                parent-types)))))
         (cond-layout (info :type :compiler-layout 'condition))
         (olayout (info :type :compiler-layout name))
@@ -361,12 +361,12 @@
       (let ((name (condition-slot-name slot)))
        (dolist (reader (condition-slot-readers slot))
          (setf (fdefinition reader)
-               #'(lambda (condition)
-                   (condition-reader-function condition name))))
+               (lambda (condition)
+                 (condition-reader-function condition name))))
        (dolist (writer (condition-slot-writers slot))
          (setf (fdefinition writer)
-               #'(lambda (new-value condition)
-                   (condition-writer-function condition new-value name))))))
+               (lambda (new-value condition)
+                 (condition-writer-function condition new-value name))))))
 
     ;; Compute effective slots and set up the class and hairy slots
     ;; (subsets of the effective slots.)
@@ -482,10 +482,10 @@
             (setq report
                   (if (stringp arg)
                       `#'(lambda (condition stream)
-                           (declare (ignore condition))
-                           (write-string ,arg stream))
+                         (declare (ignore condition))
+                         (write-string ,arg stream))
                       `#'(lambda (condition stream)
-                           (funcall #',arg condition stream))))))
+                         (funcall #',arg condition stream))))))
          (:default-initargs
           (do ((initargs (rest option) (cddr initargs)))
               ((endp initargs))
@@ -659,7 +659,7 @@
   (:report
    (lambda (condition stream)
      (let ((error-stream (stream-error-stream condition)))
-       (format stream "READER-ERROR ~@[at ~D ~]on ~S:~%~?"
+       (format stream "READER-ERROR ~@[at ~W ~]on ~S:~%~?"
               (file-position error-stream) error-stream
               (reader-error-format-control condition)
               (reader-error-format-arguments condition))))))