X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ferror.lisp;h=aae384bf1f1cccdc14d855dcfb0079f1aa4c1484;hb=89c5e67daff0215420fb0998b8e20915ddea1437;hp=daa38c7fc3aac491c2151a78f5364416fa6acf57;hpb=fea8ea02847ddc0864546a02480fb3e97d6fa318;p=sbcl.git diff --git a/src/code/error.lisp b/src/code/error.lisp index daa38c7..aae384b 100644 --- a/src/code/error.lisp +++ b/src/code/error.lisp @@ -17,23 +17,24 @@ (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)) + (with-sane-io-syntax + (warn 'simple-style-warning + :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))) + (when (and arguments (not (eq fun-name 'cerror))) + (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)) @@ -70,60 +71,15 @@ (case-failure-name condition) (case-failure-possibilities condition))))) -(define-condition compiled-program-error (encapsulated-condition program-error) - ((source :initarg :source :reader program-error-source)) +(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) - (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))))) + (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) ()) @@ -131,6 +87,32 @@ (define-condition simple-stream-error (simple-condition stream-error) ()) (define-condition simple-parse-error (simple-condition parse-error) ()) +(define-condition character-coding-error (error) ()) +(define-condition character-encoding-error (character-coding-error) + ((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) + () + (:report + (lambda (c s) + (let ((stream (stream-error-stream c)) + (code (character-encoding-error-code c))) + (format s "~@" + stream ':external-format (stream-external-format stream) + code))))) +(define-condition stream-decoding-error (stream-error character-decoding-error) + () + (:report + (lambda (c s) + (let ((stream (stream-error-stream c)) + (octets (character-decoding-error-octets c))) + (format s "~@" + stream ':external-format (stream-external-format stream) + octets))))) + (define-condition control-stack-exhausted (storage-condition) () (:report