X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ferror.lisp;h=9086a9416d37acd7a7da466cc314999d5d34afa2;hb=7a2ee8c1aff0bdd286cf5d43ab40bff7fed86bea;hp=f989aef7f7ecf6a60f5c5377d76ce7418b364bc8;hpb=5d04a95274c9ddaebbcd6ddffc5d646e2c25598c;p=sbcl.git

diff --git a/src/code/error.lisp b/src/code/error.lisp
index f989aef..9086a94 100644
--- a/src/code/error.lisp
+++ b/src/code/error.lisp
@@ -16,7 +16,7 @@
 ;;; not sure this is the right place, but where else?
 (defun style-warn (datum &rest arguments)
   (/show0 "entering STYLE-WARN")
-  (/show format-control format-arguments)
+  (/show datum arguments)
   (if (stringp datum)
       (with-sane-io-syntax
         (warn 'simple-style-warning
@@ -51,9 +51,10 @@
         (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)))))
+                :expected-type '(or symbol string function)
+                :format-control "Condition designator ~s is not of type ~s."
+                :format-arguments (list datum
+                                        '(or symbol string function))))))
 
 (define-condition layout-invalid (type-error)
   ()
@@ -104,7 +105,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)
@@ -115,9 +117,10 @@
    (lambda (c s)
      (let ((stream (stream-error-stream c))
            (code (character-encoding-error-code c)))
-       (format s "~@<encoding error on stream ~S (~S ~S): ~2I~_~
+       (format s "~@<~S stream encoding error on ~S: ~2I~_~
                   the character with code ~D cannot be encoded.~@:>"
-               stream ':external-format (stream-external-format stream)
+               (character-coding-error-external-format c)
+               stream
                code)))))
 (define-condition stream-decoding-error (stream-error character-decoding-error)
   ()
@@ -125,27 +128,28 @@
    (lambda (c s)
      (let ((stream (stream-error-stream c))
            (octets (character-decoding-error-octets c)))
-       (format s "~@<decoding error on stream ~S (~S ~S): ~2I~_~
+       (format s "~@<~S stream decoding error on ~S: ~2I~_~
                   the octet sequence ~S cannot be decoded.~@:>"
-               stream ':external-format (stream-external-format stream)
+               (character-coding-error-external-format c)
+               stream
                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~_~
+     (format s "~@<~S c-string encoding error: ~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~_~
+     (format s "~@<~S c-string decoding error: ~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)
@@ -161,6 +165,28 @@ calls, or a tail call that SBCL cannot or has not optimized away.
 
 PROCEED WITH CAUTION."))))
 
+(define-condition binding-stack-exhausted (storage-condition)
+  ()
+  (:report
+    (lambda (condition stream)
+      (declare (ignore condition))
+      (format stream
+              ;; no pretty-printing, because that would use a lot of stack.
+              "Binding stack exhausted.
+
+PROCEED WITH CAUTION."))))
+
+(define-condition alien-stack-exhausted (storage-condition)
+  ()
+  (:report
+    (lambda (condition stream)
+      (declare (ignore condition))
+      (format stream
+              ;; no pretty-printing, because that would use a lot of stack.
+              "Alien stack exhausted.
+
+PROCEED WITH CAUTION."))))
+
 (define-condition heap-exhausted-error (storage-condition)
   ()
   (:report