0.9.2.38: thread cleanup, paranoid

[sbcl.git] / src / code / error.lisp

diff --git a/src/code/error.lisp b/src/code/error.lisp
index a0b0c2b..9d8082b 100644 (file)
--- a/src/code/error.lisp
+++ b/src/code/error.lisp
@@ -89,7 +89,7 @@
 
 (define-condition character-coding-error (error) ())
 (define-condition character-encoding-error (character-coding-error)
 
 (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)
 (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 +97,11 @@
   (:report
    (lambda (c s)
      (let ((stream (stream-error-stream c))
   (:report
    (lambda (c s)
      (let ((stream (stream-error-stream c))

-           (character (character-encoding-error-character c)))
+           (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)
        (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)

-               (char-code character))))))
+               code)))))

 (define-condition stream-decoding-error (stream-error character-decoding-error)
   ()
   (:report
 (define-condition stream-decoding-error (stream-error character-decoding-error)
   ()
   (:report

@@ -121,3 +121,9 @@
       (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."))))
 
       (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 memory-fault-error (error)
+  ()
+  (:report
+   (lambda (condition stream)
+     (declare (ignore condition))
+     (format stream "memory fault"))))
\ No newline at end of file