X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ferror.lisp;h=6827435c5a252f20be10bb43a11e37c46b317bd7;hb=54b330585ed41edeb93a289f0e59aec67fa9ded9;hp=a0b0c2b1a2d618efc3b5029b27a8300a9ad69d87;hpb=77d94d36bcfd3d5eea73ad51e6ee621a8938f995;p=sbcl.git diff --git a/src/code/error.lisp b/src/code/error.lisp index a0b0c2b..6827435 100644 --- a/src/code/error.lisp +++ b/src/code/error.lisp @@ -27,7 +27,7 @@ ;;; 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) - (when (and arguments (not (eq fun-name 'cerror))) + (when (and arguments (not (eq fun-name 'cerror))) (cerror "Ignore the additional arguments." 'simple-type-error :datum arguments @@ -35,30 +35,30 @@ :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))))) + 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) (format stream - "~@" - (classoid-proper-name (type-error-expected-type condition)) - (type-error-datum condition))))) + (classoid-proper-name (type-error-expected-type condition)) + (type-error-datum condition))))) (define-condition case-failure (type-error) ((name :reader case-failure-name :initarg :name) @@ -67,19 +67,30 @@ (lambda (condition stream) (format stream "~@<~S fell through ~S expression. ~ ~:_Wanted one of ~:S.~:>" - (type-error-datum condition) - (case-failure-name condition) - (case-failure-possibilities condition))))) + (type-error-datum condition) + (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.~%~ + (format stream "Execution of a form compiled with errors.~%~ Form:~% ~A~%~ - Compile-time-error:~% ~A" - (program-error-source condition) - (program-error-message condition))))) + Compile-time error:~% ~A" + (program-error-source condition) + (program-error-message condition))))) + +(define-condition interpreted-program-error + (program-error encapsulated-condition) + ;; Unlike COMPILED-PROGRAM-ERROR, we don't need to dump these, so + ;; storing the original condition and form is OK. + ((form :initarg :form :reader program-error-form)) + (:report (lambda (condition stream) + (format stream "~&Evaluation of~% ~S~%~ + caused error:~% ~A~%" + (program-error-form condition) + (encapsulated-condition condition))))) (define-condition simple-control-error (simple-condition control-error) ()) (define-condition simple-file-error (simple-condition file-error) ()) @@ -89,7 +100,7 @@ (define-condition character-coding-error (error) ()) (define-condition character-encoding-error (character-coding-error) - ((character :initarg :character :reader character-encoding-error-character))) + ((code :initarg :code :reader character-encoding-error-code))) (define-condition character-decoding-error (character-coding-error) ((octets :initarg :octets :reader character-decoding-error-octets))) (define-condition stream-encoding-error (stream-error character-encoding-error) @@ -97,11 +108,11 @@ (:report (lambda (c s) (let ((stream (stream-error-stream c)) - (character (character-encoding-error-character c))) + (code (character-encoding-error-code c))) (format s "~@" stream ':external-format (stream-external-format stream) - (char-code character)))))) + code))))) (define-condition stream-decoding-error (stream-error character-decoding-error) () (:report @@ -113,6 +124,24 @@ stream ':external-format (stream-external-format stream) octets))))) +(define-condition c-string-encoding-error (character-encoding-error) + ((external-format :initarg :external-format :reader c-string-encoding-error-external-format)) + (:report + (lambda (c s) + (format s "~@" + (c-string-encoding-error-external-format c) + (character-encoding-error-code c))))) + +(define-condition c-string-decoding-error (character-decoding-error) + ((external-format :initarg :external-format :reader c-string-decoding-error-external-format)) + (:report + (lambda (c s) + (format s "~@" + (c-string-decoding-error-external-format c) + (character-decoding-error-octets c))))) + (define-condition control-stack-exhausted (storage-condition) () (:report @@ -121,3 +150,24 @@ (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.")))) +(define-condition heap-exhausted-error (storage-condition) + () + (:report + (lambda (condition stream) + (declare (special *heap-exhausted-error-available-bytes* + *heap-exhausted-error-requested-bytes*)) + ;; See comments in interr.lisp -- there is a method to this madness. + (if (and (boundp '*heap-exhausted-error-available-bytes*) + (boundp '*heap-exhausted-error-requested-bytes*)) + (format stream + "Heap exhausted: ~D bytes available, ~D requested. PROCEED WITH CAUTION!" + *heap-exhausted-error-available-bytes* + *heap-exhausted-error-requested-bytes*) + (print-unreadable-object (condition stream)))))) + +(define-condition memory-fault-error (error) + () + (:report + (lambda (condition stream) + (declare (ignore condition)) + (format stream "memory fault"))))