Changeset 9582 for branches

Timestamp:

May 22, 2008, 4:47:10 PM (17 years ago)

Author:

gz

Message:

Add *show-restarts-on-break*

File:

• branches/working-0711/ccl/level-1/l1-readloop-lds.lisp (modified) (2 diffs)

branches/working-0711/ccl/level-1/l1-readloop-lds.lisp

@@ -545 +545 @@
 (defvar *break-frame* nil "frame-pointer arg to break-loop")
 (defvar *break-loop-when-uninterruptable* t)
+(defvar *show-restarts-on-break* #+ccl-0711 t #-ccl-0711 nil)
 
 (defvar *error-reentry-count* 0)
@@ -591 +592 @@
            (*backtrace-contexts* (cons context *backtrace-contexts*)))
       (with-toplevel-commands :break
-        (if *continuablep*
-          (let* ((*print-circle* *error-print-circle*)
-                 (*print-level* *backtrace-print-level*)
-                 (*print-length* *backtrace-print-length*)
+        (if *show-restarts-on-break*
+          (let ((*print-circle* *error-print-circle*)
+                (*print-level* *backtrace-print-level*)
+                (*print-length* *backtrace-print-length*)
                                         ;(*print-pretty* nil)
-                 (*print-array* nil))
-            (format t "~&> Type :GO to continue, :POP to abort, :R for a list of available restarts.")
-            (format t "~&> If continued: ~A~%" continue))
-          (format t "~&> Type :POP to abort, :R for a list of available restarts.~%"))
+                (*print-array* nil))
+            (format t "~&> Type :POP to abort, or :C <n> to invoke one of the following restarts:")
+            (let* ((r (apply #'vector (compute-restarts *break-condition*))))
+              (dotimes (i (length r) (terpri))
+                (format t "~&~d. ~a" i (svref r i)))))
+          (if *continuablep*
+            (let* ((*print-circle* *error-print-circle*)
+                   (*print-level* *backtrace-print-level*)
+                   (*print-length* *backtrace-print-length*)
+                                        ;(*print-pretty* nil)
+                   (*print-array* nil))
+              (format t "~&> Type :GO to continue, :POP to abort, :R for a list of available restarts.")
+              (format t "~&> If continued: ~A~%" continue))
+            (format t "~&> Type :POP to abort, :R for a list of available restarts.~%")))
         (format t "~&> Type :? for other options.")
         (terpri)