0.pre7.136:

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

diff --git a/src/code/condition.lisp b/src/code/condition.lisp
index b0430b4..f3449e4 100644 (file)
--- a/src/code/condition.lisp
+++ b/src/code/condition.lisp
@@ -109,7 +109,7 @@
                                ;; cold-loadable code. -- WHN 19990928
                                (declare (notinline sb!xc:find-class))
                                (find-class 'condition)))
-      #'(lambda (cond stream)
+      (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,11 +361,11 @@
       (let ((name (condition-slot-name slot)))
        (dolist (reader (condition-slot-readers slot))
          (setf (fdefinition reader)
-               #'(lambda (condition)
+               (lambda (condition)
                  (condition-reader-function condition name))))
        (dolist (writer (condition-slot-writers slot))
          (setf (fdefinition writer)
-               #'(lambda (new-value condition)
+               (lambda (new-value condition)
                  (condition-writer-function condition new-value name))))))
 
     ;; Compute effective slots and set up the class and hairy slots
@@ -715,8 +715,7 @@
 
 (define-condition namestring-parse-error (parse-error)
   ((complaint :reader namestring-parse-error-complaint :initarg :complaint)
-   (arguments :reader namestring-parse-error-arguments :initarg :arguments
-             :initform nil)
+   (args :reader namestring-parse-error-args :initarg :args :initform nil)
    (namestring :reader namestring-parse-error-namestring :initarg :namestring)
    (offset :reader namestring-parse-error-offset :initarg :offset))
   (:report
@@ -724,7 +723,7 @@
      (format stream
             "parse error in namestring: ~?~%  ~A~%  ~V@T^"
             (namestring-parse-error-complaint condition)
-            (namestring-parse-error-arguments condition)
+            (namestring-parse-error-args condition)
             (namestring-parse-error-namestring condition)
             (namestring-parse-error-offset condition)))))