X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdebug.lisp;h=87d5377bd686baf8996fef651954f663a25182c6;hb=5bf4a6a677c80a71dfa31b5c9c374f986594392f;hp=c582585726e3acb09bb0f260707df338720656b1;hpb=4217a388a178099c43202df208c78ca81e0d9d1f;p=sbcl.git

diff --git a/src/code/debug.lisp b/src/code/debug.lisp
index c582585..87d5377 100644
--- a/src/code/debug.lisp
+++ b/src/code/debug.lisp
@@ -78,9 +78,9 @@
 	  *debug-command-level*))
   
 (defparameter *debug-help-string*
-"The prompt is square brackets, with number(s) indicating the current control
-  stack level and, if you've entered the debugger recursively, how deeply
-  recursed you are.
+"The debug prompt is square brackets, with number(s) indicating the current
+  control stack level and, if you've entered the debugger recursively, how
+  deeply recursed you are.
 Any command -- including the name of a restart -- may be uniquely abbreviated.
 The debugger rebinds various special variables for controlling i/o, sometimes
   to defaults (much like WITH-STANDARD-IO-SYNTAX does) and sometimes to 
@@ -94,8 +94,8 @@ Getting in and out of the debugger:
   RESTART  invokes restart numbered as shown (prompt if not given).
   ERROR    prints the error condition and restart cases.
   The number of any restart, or its name, or a unique abbreviation for its
-    name, is a valid command, and is the same as using RESTART to invoke that
-    restart.
+    name, is a valid command, and is the same as using RESTART to invoke
+    that restart.
 
 Changing frames:
   U      up frame     D    down frame
@@ -557,19 +557,17 @@ Other commands:
 	  (nreverse reversed-result))
       (sb!di:lambda-list-unavailable
        ()
-       :lambda-list-unavailable))))
+       (make-unprintable-object "unavailable lambda list")))))
 
 ;;; Print FRAME with verbosity level 1. If we hit a &REST arg, then
 ;;; print as many of the values as possible, punting the loop over
 ;;; lambda-list variables since any other arguments will be in the
 ;;; &REST arg's list of values.
 (defun print-frame-call-1 (frame)
-  (let ((debug-fun (sb!di:frame-debug-fun frame))
-	(loc (sb!di:frame-code-location frame)))
+  (let ((debug-fun (sb!di:frame-debug-fun frame)))
 
     (pprint-logical-block (*standard-output* nil :prefix "(" :suffix ")")
-      (let ((args (mapcar #'ensure-printable-object
-			  (frame-args-as-list frame))))
+      (let ((args (ensure-printable-object (frame-args-as-list frame))))
 	;; Since we go to some trouble to make nice informative function
 	;; names like (PRINT-OBJECT :AROUND (CLOWN T)), let's make sure
 	;; that they aren't truncated by *PRINT-LENGTH* and *PRINT-LEVEL*.
@@ -577,7 +575,9 @@ Other commands:
 	      (*print-level* nil))
 	  (prin1 (ensure-printable-object (sb!di:debug-fun-name debug-fun))))
 	;; For the function arguments, we can just print normally.
-	(format t "~{ ~_~S~}" args)))
+        (if (listp args)
+            (format t "~{ ~_~S~}" args)
+            (format t " ~S" args))))
 
     (when (sb!di:debug-fun-kind debug-fun)
       (write-char #\[)
@@ -855,7 +855,7 @@ reset to ~S."
 	    (let ((level *debug-command-level*)
 		  (restart-commands (make-restart-commands)))
 	      (with-simple-restart (abort
-				   "Reduce debugger level (to debug level ~W)."
+				   "~@<Reduce debugger level (to debug level ~W).~@:>"
 				    level)
 		(debug-prompt *debug-io*)
 		(force-output *debug-io*)
@@ -1239,9 +1239,8 @@ reset to ~S."
 ;;;  (throw 'sb!impl::toplevel-catcher nil))
 
 ;;; CMU CL supported this GO debug command, but SBCL doesn't -- in
-;;; SBCL you just type the CONTINUE restart name instead (or "RESTART
-;;; CONTINUE", that's OK too).
-
+;;; SBCL you just type the CONTINUE restart name instead (or "C" or
+;;; "RESTART CONTINUE", that's OK too).
 ;;;(!def-debug-command "GO" ()
 ;;;  (continue *debug-condition*)
 ;;;  (error "There is no restart named CONTINUE."))