X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ferror.lisp;h=085264c3834dfea00ae6b849b621f16c5d72270a;hb=8eee0d3a30bf39d9f201acff28c92059fe6c3e4e;hp=e8869725340f439fb9df911ab6e2d66db0532ae2;hpb=451d6e4af62dc8bbad57219c403d4395db84a4d6;p=sbcl.git

diff --git a/src/code/error.lisp b/src/code/error.lisp
index e886972..085264c 100644
--- a/src/code/error.lisp
+++ b/src/code/error.lisp
@@ -104,7 +104,8 @@
 (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-coding-error (error)
+  ((external-format :initarg :external-format :reader character-coding-error-external-format)))
 (define-condition character-encoding-error (character-coding-error)
   ((code :initarg :code :reader character-encoding-error-code)))
 (define-condition character-decoding-error (character-coding-error)
@@ -117,7 +118,8 @@
            (code (character-encoding-error-code c)))
        (format s "~@<encoding error on stream ~S (~S ~S): ~2I~_~
                   the character with code ~D cannot be encoded.~@:>"
-               stream ':external-format (stream-external-format stream)
+               stream ':external-format
+               (character-coding-error-external-format c)
                code)))))
 (define-condition stream-decoding-error (stream-error character-decoding-error)
   ()
@@ -127,25 +129,26 @@
            (octets (character-decoding-error-octets c)))
        (format s "~@<decoding error on stream ~S (~S ~S): ~2I~_~
                   the octet sequence ~S cannot be decoded.~@:>"
-               stream ':external-format (stream-external-format stream)
+               stream ':external-format
+               (character-coding-error-external-format c)
                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 ~S): ~2I~_~
                   the character with code ~D cannot be encoded.~@:>"
-               (c-string-encoding-error-external-format c)
+               (character-coding-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 ~S): ~2I~_~
                   the octet sequence ~S cannot be decoded.~@:>"
-             (c-string-decoding-error-external-format c)
+             (character-coding-error-external-format c)
              (character-decoding-error-octets c)))))
 
 (define-condition control-stack-exhausted (storage-condition)