0.pre7.50:

[sbcl.git] / src / code / debug.lisp

diff --git a/src/code/debug.lisp b/src/code/debug.lisp
index ba1c054..e181a73 100644 (file)
--- a/src/code/debug.lisp
+++ b/src/code/debug.lisp
@@ -194,7 +194,7 @@ Function and macro commands:
        (setf next-list (next-code-locations (first next-list))))
       next-list)))
 
-;;; Returns a list of code-locations of the possible breakpoints of the
+;;; Return a list of code-locations of the possible breakpoints of the
 ;;; debug-function passed.
 (defun possible-breakpoints (debug-function)
   (let ((possible-breakpoints nil))
@@ -208,7 +208,7 @@ Function and macro commands:
                (push code-location possible-breakpoints))))))
     (nreverse possible-breakpoints)))
 
-;;; Searches the info-list for the item passed (code-location,
+;;; Search the info-list for the item passed (code-location,
 ;;; debug-function, or breakpoint-info). If the item passed is a debug
 ;;; function then kind will be compared if it was specified. The kind
 ;;; if also compared if a breakpoint-info is passed since it's in the
@@ -439,7 +439,7 @@ Function and macro commands:
                            (*standard-output* *debug-io*))
   #!+sb-doc
   "Show a listing of the call stack going down from the current frame. In the
-   debugger, the current frame is indicated by the prompt. Count is how many
+   debugger, the current frame is indicated by the prompt. COUNT is how many
    frames to show."
   (fresh-line *standard-output*)
   (do ((frame (if *in-the-debugger* *current-frame* (sb!di:top-frame))
@@ -801,32 +801,12 @@ reset to ~S."
                                 (t
                                  (funcall cmd-fun)))))))))))))))
 
-;;; FIXME: As far as I know, the CMU CL X86 codebase has never
-;;; supported access to the environment of the debugged function. It
-;;; would be really, really nice to make that work! (Until then,
-;;; non-NIL *AUTO-EVAL-IN-FRAME* seems to be useless, and as of
-;;; sbcl-0.6.10 it even seemed to be actively harmful, since the
-;;; debugger gets confused when trying to unwind the frames which
-;;; arise in SIGINT interrupts. So it's set to NIL.)
-(defvar *auto-eval-in-frame* nil
-  #!+sb-doc
-  "When set, evaluations in the debugger's command loop occur relative
-   to the current frame's environment without the need of debugger
-   forms that explicitly control this kind of evaluation. In an ideal
-   world, the default would be T, but since unfortunately the X86
-   debugger support isn't good enough to make this useful, the
-   default is NIL instead.")
-
 ;;; FIXME: We could probably use INTERACTIVE-EVAL for much of this logic.
 (defun debug-eval-print (expr)
   (/noshow "entering DEBUG-EVAL-PRINT" expr)
   (/noshow (fboundp 'compile))
-  (/noshow (and (fboundp 'compile) *auto-eval-in-frame*))
   (setq +++ ++ ++ + + - - expr)
-  (let* ((values (multiple-value-list
-                 (if (and (fboundp 'compile) *auto-eval-in-frame*)
-                     (sb!di:eval-in-frame *current-frame* -)
-                     (eval -))))
+  (let* ((values (multiple-value-list (eval -)))
         (*standard-output* *debug-io*))
     (/noshow "done with EVAL in DEBUG-EVAL-PRINT")
     (fresh-line)
@@ -993,7 +973,7 @@ argument")
 
 (defun arg (n)
   #!+sb-doc
-  "Returns the N'th argument's value if possible. Argument zero is the first
+  "Return the N'th argument's value if possible. Argument zero is the first
    argument in a frame's default printed representation. Count keyword/value
    pairs as separate arguments."
   (multiple-value-bind (var lambda-var-p)