0.8.16.6:

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

diff --git a/src/code/error.lisp b/src/code/error.lisp
index bb3b024..51acf0e 100644 (file)
--- 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,6 +21,33 @@
        :format-control format-control
        :format-arguments format-arguments))
 
+;;; 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
@@ -45,6 +70,16 @@
              (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) ())