X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ferror.lisp;h=522df874c1b46dedd31d602eeadc95a80926d4c1;hb=48ec282d877900caf5ea4ab42e9d87e566ce6b43;hp=9d8082ba67cd58fae0fb070000b89f963b2ea043;hpb=1f23c9f7828d8aebeda92c8c1126114e10461ffa;p=sbcl.git diff --git a/src/code/error.lisp b/src/code/error.lisp index 9d8082b..522df87 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,19 @@ (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))))) + (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) ())