X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-error.lisp;h=4c8eb83e06eac043c5b7beda7e8a4280f7186a1a;hb=c7de1989d006e0b3a4f26143b7a81c9bdb754101;hp=f4093cc4ce09d15f3f612a965c51fa4f3c41a187;hpb=d49c71bf00d858efc5796900ca4954fb76ce6402;p=sbcl.git

diff --git a/src/code/target-error.lisp b/src/code/target-error.lisp
index f4093cc..4c8eb83 100644
--- a/src/code/target-error.lisp
+++ b/src/code/target-error.lisp
@@ -82,21 +82,21 @@
                    (eq (restart-name x) name)))
              restarts)))
 
-(defun find-restart-or-lose (restart-designator)
-  (let ((real-restart (find-restart restart-designator)))
-    (unless real-restart
+;;; helper for the various functions which are ANSI-spec'ed to do
+;;; something with a restart or signal CONTROL-ERROR if there is none
+(defun find-restart-or-control-error (identifier &optional condition)
+  (or (find-restart identifier condition)
       (error 'simple-control-error
-	     :format-control "Restart ~S is not active."
-	     :format-arguments (list restart-designator)))
-    real-restart))
+	     :format-control "No restart ~S is active ~{for ~S~}."
+	     :format-arguments (list identifier condition))))
 
 (defun invoke-restart (restart &rest values)
   #!+sb-doc
   "Calls the function associated with the given restart, passing any given
    arguments. If the argument restart is not a restart or a currently active
-   non-nil restart name, then a control-error is signalled."
+   non-nil restart name, then a CONTROL-ERROR is signalled."
   (/show "entering INVOKE-RESTART" restart)
-  (let ((real-restart (find-restart-or-lose restart)))
+  (let ((real-restart (find-restart-or-control-error restart)))
     (apply (restart-function real-restart) values)))
 
 (defun interactive-restart-arguments (real-restart)
@@ -109,18 +109,11 @@
   #!+sb-doc
   "Calls the function associated with the given restart, prompting for any
    necessary arguments. If the argument restart is not a restart or a
-   currently active non-nil restart name, then a control-error is signalled."
-  (let* ((real-restart (find-restart-or-lose restart))
+   currently active non-NIL restart name, then a CONTROL-ERROR is signalled."
+  (let* ((real-restart (find-restart-or-control-error restart))
 	 (args (interactive-restart-arguments real-restart)))
     (apply (restart-function real-restart) args)))
 
-
-
-
-
-;;;; helper functions for restartable error handling which couldn't be
-;;;; defined 'til now 'cause they use the RESTART-CASE macro
-
 (defun assert-error (assertion places datum &rest arguments)
   (let ((cond (if datum
 		(coerce-to-condition datum