X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ferror.lisp;h=8197a273c03e14484e28b18ed92bfb09393fd86d;hb=4cf50b1896b25f5337e7c258b0b560da00d47993;hp=78b73a15672db0f59b422cb3412c212002aadab4;hpb=2d195da5e29feadce7190ea1a68a2efa83a5e1c0;p=sbcl.git diff --git a/src/code/error.lisp b/src/code/error.lisp index 78b73a1..8197a27 100644 --- a/src/code/error.lisp +++ b/src/code/error.lisp @@ -27,9 +27,10 @@ () (: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 + "~@" (sb!kernel:class-proper-name (type-error-expected-type condition)) (type-error-datum condition))))) @@ -38,14 +39,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.