0.pre7.33:

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

diff --git a/src/code/error.lisp b/src/code/error.lisp
index 78b73a1..cd7a39d 100644 (file)
--- a/src/code/error.lisp
+++ b/src/code/error.lisp
@@ -21,15 +21,14 @@
        :format-control format-control
        :format-arguments format-arguments))
 
-(define-condition simple-type-error (simple-condition type-error) ())
-
 (define-condition sb!kernel:layout-invalid (type-error)
   ()
   (:report
    (lambda (condition stream)
-     (format stream "Layout-invalid error in ~S:~@
-                    Type test of class ~S was passed obsolete instance:~%  ~S"
-            (condition-function-name condition)
+     (format stream
+            "~@<invalid structure layout: ~
+              ~2I~_A test for class ~4I~_~S ~
+              ~2I~_was passed the obsolete instance ~4I~_~S~:>"
             (sb!kernel:class-proper-name (type-error-expected-type condition))
             (type-error-datum condition)))))
 
@@ -38,14 +37,16 @@
    (possibilities :reader case-failure-possibilities :initarg :possibilities))
   (:report
     (lambda (condition stream)
-      (format stream "~@<~S fell through ~S expression. ~:_Wanted one of ~:S.~:>"
+      (format stream "~@<~S fell through ~S expression. ~
+                      ~:_Wanted one of ~:S.~:>"
              (type-error-datum condition)
              (case-failure-name condition)
              (case-failure-possibilities condition)))))
 
-(define-condition simple-file-error    (simple-condition file-error)())
-(define-condition simple-program-error (simple-condition program-error)())
-(define-condition simple-control-error (simple-condition control-error)())
+(define-condition simple-control-error (simple-condition control-error) ())
+(define-condition simple-file-error    (simple-condition file-error)    ())
+(define-condition simple-program-error (simple-condition program-error) ())
+(define-condition simple-stream-error  (simple-condition stream-error)  ())
 
 ;;; This condition is signalled whenever we make a UNKNOWN-TYPE so that
 ;;; compiler warnings can be emitted as appropriate.