X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ferror.lisp;h=9a0e47dcb1cce0592a071cf339b4af3d940916aa;hb=2f2fad31a662b5387376003fab7ef328b4ac9063;hp=27be4e5bb18cee62fb3fb1eb6c41107e6916a2c0;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/code/error.lisp b/src/code/error.lisp
index 27be4e5..9a0e47d 100644
--- a/src/code/error.lisp
+++ b/src/code/error.lisp
@@ -11,29 +11,27 @@
 ;;;; provided with absolutely no warranty. See the COPYING and CREDITS
 ;;;; files for more information.
 
-(in-package "SB!CONDITIONS")
-
-(sb!int:file-comment
-  "$Header$")
+(in-package "SB!KERNEL")
 
 (define-condition simple-style-warning (simple-condition style-warning) ())
 
 ;;; not sure this is the right place, but where else?
 (defun style-warn (format-control &rest format-arguments)
+  (/show0 "entering STYLE-WARN")
+  (/show format-control format-arguments)
   (warn 'simple-style-warning
 	: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)
+(define-condition 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)
-	     (sb!kernel:class-proper-name (type-error-expected-type condition))
+     (format stream
+	     "~@<invalid structure layout: ~
+              ~2I~_A test for class ~4I~_~S ~
+              ~2I~_was passed the obsolete instance ~4I~_~S~:>"
+	     (classoid-proper-name (type-error-expected-type condition))
 	     (type-error-datum condition)))))
 
 (define-condition case-failure (type-error)
@@ -41,17 +39,28 @@
    (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)  ())
+(define-condition simple-parse-error   (simple-condition parse-error)   ())
 
 ;;; This condition is signalled whenever we make a UNKNOWN-TYPE so that
 ;;; compiler warnings can be emitted as appropriate.
 (define-condition parse-unknown-type (condition)
   ((specifier :reader parse-unknown-type-specifier :initarg :specifier)))
 
+(define-condition control-stack-exhausted (storage-condition)
+  ()
+  (:report
+    (lambda (condition stream)
+      (declare (ignore condition))
+      (format stream
+             "Control stack exhausted (no more space for function call frames).  This is probably due to heavily nested or infinitely recursive function calls, or a tail call that SBCL cannot or has not optimized away."))))
+