0.6.12.49:

[sbcl.git] / src / code / early-target-error.lisp

diff --git a/src/code/early-target-error.lisp b/src/code/early-target-error.lisp
index 3b19746..216a9fe 100644 (file)
--- a/src/code/early-target-error.lisp
+++ b/src/code/early-target-error.lisp
@@ -10,10 +10,7 @@
 ;;;; provided with absolutely no warranty. See the COPYING and CREDITS
 ;;;; files for more information.
 
-(in-package "SB!CONDITIONS")
-
-(sb!int:file-comment
-  "$Header$")
+(in-package "SB!KERNEL")
 \f
 ;;;; restarts
 
@@ -46,7 +43,7 @@
            (res restart))))
       (res))))
 
-(defstruct restart
+(defstruct (restart (:copier nil))
   name
   function
   report-function
@@ -317,9 +314,10 @@
                                bindings))
                *handler-clusters*)))
      (multiple-value-prog1
-      ,@forms
-      ;; Wait for any float exceptions
-      #!+x86 (float-wait))))
+        (progn
+          ,@forms)
+       ;; Wait for any float exceptions.
+       #!+x86 (float-wait))))
 \f
 ;;;; HANDLER-CASE and IGNORE-ERRORS
 
@@ -391,7 +389,7 @@
 
 (defun assert-error (assertion places datum &rest arguments)
   (let ((cond (if datum
-               (sb!conditions::coerce-to-condition datum
+               (coerce-to-condition datum
                                                    arguments
                                                    'simple-error
                                                    'error)
@@ -445,7 +443,7 @@
 
 (defun case-body-error (name keyform keyform-value expected-type keys)
   (restart-case
-      (error 'sb!conditions::case-failure
+      (error 'case-failure
             :name name
             :datum keyform-value
             :expected-type expected-type