0.7.8.45:

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

diff --git a/src/code/condition.lisp b/src/code/condition.lisp
index bd9c545..1e5c7c7 100644 (file)
--- a/src/code/condition.lisp
+++ b/src/code/condition.lisp
@@ -582,15 +582,7 @@
   ((pathname :reader file-error-pathname :initarg :pathname))
   (:report
    (lambda (condition stream)
-     (format stream
-            "~@<error on file ~_~S: ~2I~:_~?~:>"
-            (file-error-pathname condition)
-            ;; FIXME: ANSI's FILE-ERROR doesn't have FORMAT-CONTROL and 
-            ;; FORMAT-ARGUMENTS, and the inheritance here doesn't seem
-            ;; to give us FORMAT-CONTROL or FORMAT-ARGUMENTS either.
-            ;; So how does this work?
-            (serious-condition-format-control condition)
-            (serious-condition-format-arguments condition)))))
+     (format stream "error on file ~S" (file-error-pathname condition)))))
 
 (define-condition package-error (error)
   ((package :reader package-error-package :initarg :package)))
@@ -743,6 +735,17 @@
             "unexpected end of file on ~S ~A"
             (stream-error-stream condition)
             (reader-eof-error-context condition)))))
+
+(define-condition reader-impossible-number-error (reader-error)
+  ((error :reader reader-impossible-number-error-error :initarg :error))
+  (:report
+   (lambda (condition stream)
+     (let ((error-stream (stream-error-stream condition)))
+       (format stream "READER-ERROR ~@[at ~W ~]on ~S:~%~?~%Original error: ~A"
+              (file-position error-stream) error-stream
+              (reader-error-format-control condition)
+              (reader-error-format-arguments condition)
+              (reader-impossible-number-error-error condition))))))
 \f
 ;;;; special SBCL extension conditions