0.9.3.13:

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

diff --git a/src/code/error.lisp b/src/code/error.lisp
index a0b0c2b..522df87 100644 (file)
--- 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
-            "~@<invalid structure layout: ~
+             "~@<invalid structure layout: ~
               ~2I~_A test for class ~4I~_~S ~
               ~2I~_was passed the obsolete instance ~4I~_~S~:>"
-            (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)    ())
@@ -89,7 +89,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 +97,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 "~@<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
@@ -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."))))
 
+(define-condition memory-fault-error (error)
+  ()
+  (:report
+   (lambda (condition stream)
+     (declare (ignore condition))
+     (format stream "memory fault"))))
\ No newline at end of file