0.pre8.34

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

diff --git a/src/code/error.lisp b/src/code/error.lisp
index 8a448f1..9a0e47d 100644 (file)
--- a/src/code/error.lisp
+++ b/src/code/error.lisp
@@ -23,7 +23,7 @@
        :format-control format-control
        :format-arguments format-arguments))
 
        :format-control format-control
        :format-arguments format-arguments))
 

-(define-condition sb!kernel:layout-invalid (type-error)
+(define-condition layout-invalid (type-error)

   ()
   (:report
    (lambda (condition stream)
   ()
   (:report
    (lambda (condition stream)

@@ -31,7 +31,7 @@
             "~@<invalid structure layout: ~
               ~2I~_A test for class ~4I~_~S ~
               ~2I~_was passed the obsolete instance ~4I~_~S~:>"
             "~@<invalid structure layout: ~
               ~2I~_A test for class ~4I~_~S ~
               ~2I~_was passed the obsolete instance ~4I~_~S~:>"

-            (sb!kernel:class-proper-name (type-error-expected-type condition))
+            (classoid-proper-name (type-error-expected-type condition))

             (type-error-datum condition)))))
 
 (define-condition case-failure (type-error)
             (type-error-datum condition)))))
 
 (define-condition case-failure (type-error)

@@ -60,6 +60,7 @@
   ()
   (:report
     (lambda (condition stream)
   ()
   (:report
     (lambda (condition stream)

+      (declare (ignore condition))

       (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."))))