X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ferror.lisp;h=daa38c7fc3aac491c2151a78f5364416fa6acf57;hb=fea8ea02847ddc0864546a02480fb3e97d6fa318;hp=78b73a15672db0f59b422cb3412c212002aadab4;hpb=2d195da5e29feadce7190ea1a68a2efa83a5e1c0;p=sbcl.git diff --git a/src/code/error.lisp b/src/code/error.lisp index 78b73a1..daa38c7 100644 --- a/src/code/error.lisp +++ b/src/code/error.lisp @@ -13,24 +13,50 @@ (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) ()) +;;; 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 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 + "~@" + (classoid-proper-name (type-error-expected-type condition)) (type-error-datum condition))))) (define-condition case-failure (type-error) @@ -38,17 +64,78 @@ (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 compiled-program-error (encapsulated-condition program-error) + ((source :initarg :source :reader program-error-source)) + (:report (lambda (condition stream) + (let ((source (program-error-source condition))) + ;; Source may be either a list or string, and + ;; string needs to be printed without escapes. + (format stream "Execution of a form compiled with errors.~%~ + Form:~% ~ + ~:[~S~;~A~]~%~ + Compile-time-error:~% " + (stringp source) source) + (print-object (encapsulated-condition condition) stream))))) + +(def!method make-load-form ((condition compiled-program-error) &optional env) + (let ((source (program-error-source condition))) + ;; Safe since the encapsulated condition shouldn't contain + ;; references back up to the main condition. The source needs to + ;; be converted to a string, since it may contain arbitrary + ;; unexternalizable objects. + `(make-condition 'compiled-program-error + :condition ,(make-condition-load-form + (encapsulated-condition condition) env) + :source ,(if (stringp source) + source + (write-to-string + source :pretty t :circle t :escape t :readably nil))))) + +(define-condition make-load-form-error (encapsulated-condition error) + ((object :initarg :object :reader make-load-form-error-object)) + (:report (lambda (condition stream) + (let ((object (make-load-form-error-object condition))) + ;; If the MAKE-LOAD-FORM-ERROR itself has been + ;; externalized, the object will only have it's string + ;; representation. + (format stream "~@~% " + (stringp object) + object + 'make-load-form) + (print-object (encapsulated-condition condition) stream))))) + +(def!method make-load-form ((condition make-load-form-error) &optional env) + (let ((object (make-load-form-error-object condition))) + ;; Safe, because neither the object nor the encapsulated condition + ;; should contain any references to the error itself. However, the + ;; object will need to be converted to its string representation, + ;; since the chances are that it's not externalizable. + `(make-condition 'make-load-form-error + :condition ,(make-condition-load-form + (encapsulated-condition condition) env) + :object ,(if (stringp object) + object + (write-to-string + object :pretty t :circle t :escape t :readably nil))))) -;;; 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 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) ()) + +(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."))))