X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ferror.lisp;h=b80994e56d87a48c1ac5db9b1011f9130259524b;hb=15d6e7c9a2c3234f95dfe278046fa2fee1b0c007;hp=1239eb44a33fa0ceed367982eba767d6277a3ba8;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git

diff --git a/src/code/error.lisp b/src/code/error.lisp
index 1239eb4..b80994e 100644
--- a/src/code/error.lisp
+++ b/src/code/error.lisp
@@ -13,8 +13,6 @@
 
 (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")
@@ -23,7 +21,34 @@
 	:format-control format-control
 	:format-arguments format-arguments))
 
-(define-condition sb!kernel:layout-invalid (type-error)
+;;; a utility for SIGNAL, ERROR, CERROR, WARN, COMPILER-NOTIFY and
+;;; INVOKE-DEBUGGER: Parse the hairy argument conventions into a
+;;; single argument that's directly usable by all the other routines.
+(defun coerce-to-condition (datum arguments default-type fun-name)
+  (cond ((typep datum 'condition)
+	 (if arguments
+	     (cerror "Ignore the additional arguments."
+		     'simple-type-error
+		     :datum arguments
+		     :expected-type 'null
+		     :format-control "You may not supply additional arguments ~
+				     when giving ~S to ~S."
+		     :format-arguments (list datum fun-name)))
+	 datum)
+	((symbolp datum) ; roughly, (SUBTYPEP DATUM 'CONDITION)
+	 (apply #'make-condition datum arguments))
+	((or (stringp datum) (functionp datum))
+	 (make-condition default-type
+			 :format-control datum
+			 :format-arguments arguments))
+	(t
+	 (error 'simple-type-error
+		:datum datum
+		:expected-type '(or symbol string)
+		:format-control "bad argument to ~S: ~S"
+		:format-arguments (list fun-name datum)))))
+
+(define-condition layout-invalid (type-error)
   ()
   (:report
    (lambda (condition stream)
@@ -31,7 +56,7 @@
 	     "~@<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))
+	     (classoid-proper-name (type-error-expected-type condition))
 	     (type-error-datum condition)))))
 
 (define-condition case-failure (type-error)
@@ -45,13 +70,27 @@
 	      (case-failure-name condition)
 	      (case-failure-possibilities condition)))))
 
+(define-condition compiled-program-error (program-error)
+  ((message :initarg :message :reader program-error-message)
+   (source :initarg :source :reader program-error-source))
+  (:report (lambda (condition stream)
+	     (format stream "Execution of a form compiled with errors.~%~
+                            Form:~%  ~A~%~
+                            Compile-time-error:~%  ~A"
+		       (program-error-source condition)
+		       (program-error-message condition)))))
+
 (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."))))