Fix typo in `debug'. Change `command/return' so that the $ option

doesn't unsyntax and then resyntax the expression.

diff --git a/v7/src/runtime/dbgcmd.scm b/v7/src/runtime/dbgcmd.scm
index 7eb1228e4adc1720ab99724d49011f22029ccbb6..8821408c0ad8d4fb25cc0595d019ab90279136fb 100644 (file)
--- a/v7/src/runtime/dbgcmd.scm
+++ b/v7/src/runtime/dbgcmd.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/dbgcmd.scm,v 14.8 1990/09/11 20:43:52 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/dbgcmd.scm,v 14.9 1990/09/12 02:47:19 cph Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -132,7 +132,14 @@ MIT in each case. |#
       prompt))))
 
 (define (debug/eval expression environment)
-  (leaving-command-loop (lambda () (eval expression environment))))
+  (leaving-command-loop
+   (lambda ()
+     (eval expression environment))))
+
+(define (debug/scode-eval expression environment)
+  (leaving-command-loop
+   (lambda ()
+     (extended-scode-eval expression environment))))
 
 (define (debug/where environment)
   (leaving-command-loop

diff --git a/v7/src/runtime/debug.scm b/v7/src/runtime/debug.scm
index 0e658760c3a6b9adc096d0b89ece02b2ee07c796..513c8bc61c65ee387ad7c0e26f32cd0f7d201cea 100644 (file)
--- a/v7/src/runtime/debug.scm
+++ b/v7/src/runtime/debug.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/debug.scm,v 14.19 1990/09/11 20:44:13 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/debug.scm,v 14.20 1990/09/12 02:47:02 cph Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -61,8 +61,10 @@ MIT in each case. |#
             (write-string (if (= n 1) "is" "are"))
             (write-string " ")
             (if (> n debugger:count-subproblems-limit)
-                (write-string "more than "))
-            (write n)
+                (begin
+                  (write-string "more than ")
+                  (write debugger:count-subproblems-limit))
+                (write n))
             (write-string " subproblem")
             (if (not (= n 1))
                 (write-string "s")))
@@ -652,19 +654,18 @@ MIT in each case. |#
               (lambda (value)
                 ((stack-frame->continuation next) value))))
          (let ((value
-                (debug/eval
-                 (let ((expression
-                        (prompt-for-expression
-                         (string-append
-                          "Expression to EVALUATE and CONTINUE with"
-                          (if invalid-expression?
-                              ""
-                              " ($ to retry)")))))
-                   (if (and (not invalid-expression?)
-                            (eq? expression '$))
-                       (unsyntax (dstate/expression dstate))
-                       expression))
-                 environment)))
+                (let ((expression
+                       (prompt-for-expression
+                        (string-append
+                         "Expression to EVALUATE and CONTINUE with"
+                         (if invalid-expression?
+                             ""
+                             " ($ to retry)")))))
+                  (if (and (not invalid-expression?)
+                           (eq? expression '$))
+                      (debug/scode-eval (dstate/expression dstate)
+                                        environment)
+                      (debug/eval expression environment)))))
            (if debugger:print-return-values?
                (begin
                  (newline)