[m-dev.] diff: minor fixes to the debugger

[Zoltan Somogyi]

Estimated hours taken: 0.2

trace/mercury_trace_internal.c:
	Fix two errors. One is the same bug (wrong loop variable) in "enable *"
	that Simon fixed in "disable *" a while ago (I checked, but did not
	find any more copies of this bug). The second is that "break info"
	stopped interacting with the user.

tests/debugger/queens.{inp,exp}:
	Test the fixes of these bugs.

Zoltan.

cvs diff: Diffing .
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/aditi
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/exceptions
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing library
cvs diff: Diffing lp_solve
cvs diff: Diffing profiler
cvs diff: Diffing runtime
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing scripts
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
Index: tests/debugger/queens.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/queens.exp,v
retrieving revision 1.13
diff -u -b -r1.13 queens.exp
--- queens.exp	1999/06/30 17:13:29	1.13
+++ queens.exp	1999/08/15 08:59:01
@@ -144,6 +144,12 @@
       50:     14  8 REDO pred queens:qperm/2-0 (nondet) 
       51:     14  8 FAIL pred queens:qperm/2-0 (nondet) 
       52:     13  8 REDO pred queens:qdelete/3-0 (nondet) 
+mdb> break info
+ 0: + stop  interface pred queens:print_list/3-0 (det)
+ 1: + stop  interface pred queens:qdelete/3-0 (nondet)
+mdb> enable *
+ 0: + stop  interface pred queens:print_list/3-0 (det)
+ 1: + stop  interface pred queens:qdelete/3-0 (nondet)
 mdb> step -aS 5
       53:     13  8 DISJ pred queens:qdelete/3-0 (nondet) c2;d2;
       54:     17  9 CALL pred queens:qdelete/3-0 (nondet) 
Index: tests/debugger/queens.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/queens.inp,v
retrieving revision 1.7
diff -u -b -r1.7 queens.inp
--- queens.inp	1999/04/16 01:13:01	1.7
+++ queens.inp	1999/08/15 08:54:10
@@ -46,6 +46,8 @@
 break print_list
 break qdelete
 continue -a
+break info
+enable *
 step -aS 5
 disable 1
 continue -n
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
Index: trace/mercury_trace_internal.c
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_internal.c,v
retrieving revision 1.49
diff -u -b -r1.49 mercury_trace_internal.c
--- mercury_trace_internal.c	1999/08/09 08:28:52	1.49
+++ mercury_trace_internal.c	1999/08/15 08:54:31
@@ -870,7 +870,7 @@
 				MR_print_spy_point(i);
 			}
 
-			return STOP_INTERACTING;
+			return KEEP_INTERACTING;
 		}
 
 		when = MR_SPY_INTERFACE;
@@ -930,7 +930,7 @@
 			int i;
 			for (i = 0; i < MR_spy_point_next; i++) {
 				MR_spy_points[i]->spy_enabled = TRUE;
-				MR_print_spy_point(n);
+				MR_print_spy_point(i);
 			}
 
 			if (MR_spy_point_next == 0) {
cvs diff: Diffing trial
cvs diff: Diffing util
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------