merge from 1.8 branch

[bpt/guile.git] / ice-9 / debugger / commands.scm

diff --git a/ice-9/debugger/commands.scm b/ice-9/debugger/commands.scm
index b72e06e..1d716e2 100644 (file)
--- a/ice-9/debugger/commands.scm
+++ b/ice-9/debugger/commands.scm
@@ -1,6 +1,6 @@
 ;;;; (ice-9 debugger commands) -- debugger commands
 
-;;; Copyright (C) 2002 Free Software Foundation, Inc.
+;;; Copyright (C) 2002, 2006 Free Software Foundation, Inc.
 ;;;
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
@@ -14,14 +14,12 @@
 ;; 
 ;; You should have received a copy of the GNU Lesser General Public
 ;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 (define-module (ice-9 debugger commands)
   #:use-module (ice-9 debug)
   #:use-module (ice-9 debugger)
-  #:use-module (ice-9 debugger behaviour)
   #:use-module (ice-9 debugger state)
-  #:use-module (ice-9 debugger trap-hooks)
   #:use-module (ice-9 debugger utils)
   #:export (backtrace
            evaluate
@@ -30,13 +28,7 @@
            position
            up
            down
-           frame
-           continue
-           finish
-           trace-finish
-           next
-           step
-           debug-trap-hooks))
+           frame))
 
 (define (backtrace state n-frames)
   "Print backtrace of all stack frames, or innermost COUNT frames.
@@ -151,56 +143,4 @@ An argument specifies the frame to select; it must be a stack-frame number."
   (if n (set-stack-index! state (frame-number->index n (state-stack state))))
   (write-state-short state))
 
-(define (debug-trap-hooks state)
-  (debug-hook-membership)
-  state)
-
-;;;; Additional commands that make sense when debugging code that has
-;;;; stopped at a breakpoint.
-
-(define (assert-continuable state)
-  ;; Check that debugger is in a state where `continuing' makes sense.
-  ;; If not, signal an error.
-  (or (memq #:continuable (state-flags state))
-      (debugger-error "This debug session is not continuable.")))
-
-(define (continue state)
-  "Continue program execution."
-  (assert-continuable state)
-  (debugger-quit))
-
-(define (finish state)
-  "Continue until evaluation of the current frame is complete, and
-print the result obtained."
-  (assert-continuable state)
-  (with-reference-frame (stack-ref (state-stack state) (state-index state))
-    (at-exit (lambda ()
-              (trace-exit-value)
-              (debug-here))))
-  (continue state))
-
-(define (next state n)
-  "Continue until entry to @var{n}th next frame in same file."
-  (assert-continuable state)
-  (with-reference-frame (stack-ref (state-stack state) (state-index state))
-    (at-next (or n 1) debug-here))
-  (continue state))
-
-(define (step state n)
-  "Continue until entry to @var{n}th next frame."
-  (assert-continuable state)
-  (at-step (or n 1) debug-here)
-  ;; An alternative behaviour that might be interesting ...
-  ;; (with-reference-frame (stack-ref (state-stack state) (state-index state))
-  ;;   (at-exit (lambda () (at-step (or n 1) debug-here))))
-  (continue state))
-
-(define (trace-finish state)
-  "Trace until evaluation of the current frame is complete."
-  (assert-continuable state)
-  (with-reference-frame (stack-ref (state-stack state) (state-index state))
-    (trace-until-exit)
-    (at-exit debug-here))
-  (continue state))
-
 ;;; (ice-9 debugger commands) ends here.