[m-rev.] diff: fix debugger test case expected outputs
Zoltan Somogyi
zs at cs.mu.OZ.AU
Thu Sep 12 14:29:58 AEST 2002
Fix (most of) the expected outputs of the debugger test cases after my recent
changes. In some cases, this involved modifying the input scripts to make tests
less dependent on event numbers.
tests/debugger/Mmakefile:
Use MDB_STD instead of MDB for more test cases than before.
Disable the output_term_dep test case, since it doesn't actually test
anything that the other test cases don't test, and it prints so many
events that its .exp files depend on event numbers far too much.
tests/debugger/*.exp*:
tests/debugger/*.inp:
Update expected outputs, and in some cases, the inputs.
cvs diff: Diffing .
cvs diff: Diffing bench
cvs diff: Diffing bench/progs
cvs diff: Diffing bench/progs/compress
cvs diff: Diffing bench/progs/icfp2000
cvs diff: Diffing bench/progs/icfp2001
cvs diff: Diffing bench/progs/nuc
cvs diff: Diffing bench/progs/ray
cvs diff: Diffing bench/progs/tree234
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/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
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/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
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/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/stream
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing java
cvs diff: Diffing java/library
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing profiler
cvs diff: Diffing robdd
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 samples/solutions
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
Index: tests/debugger/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/Mmakefile,v
retrieving revision 1.85
diff -u -r1.85 Mmakefile
--- tests/debugger/Mmakefile 11 Sep 2002 07:20:29 -0000 1.85
+++ tests/debugger/Mmakefile 11 Sep 2002 15:54:20 -0000
@@ -32,13 +32,15 @@
lval_desc_array \
multi_parameter \
nondet_stack \
- output_term_dep \
polymorphic_output \
print_goal \
queens_rep \
resume_typeinfos \
type_desc_test
+# This test is currently not useful.
+# output_term_dep
+
SHALLOW_PROGS = \
shallow
@@ -271,18 +273,18 @@
# avoid spurious inconsistencies in the output, we filter out its name even
# when known.
nondet_stack.out: nondet_stack nondet_stack.inp
- $(MDB) ./nondet_stack < nondet_stack.inp 2>&1 | \
+ $(MDB_STD) ./nondet_stack < nondet_stack.inp 2>&1 | \
sed 's/nondet_stack.m:[0-9]*/nondet_stack.m:NNNN/g' | \
sed 's/entry label MR_do_trace_redo_fail_deep/label UNKNOWN/g' \
> nondet_stack.out 2>&1
resume_typeinfos.out: resume_typeinfos resume_typeinfos.inp
- $(MDB) ./resume_typeinfos < resume_typeinfos.inp 2>&1 | \
+ $(MDB_STD) ./resume_typeinfos < resume_typeinfos.inp 2>&1 | \
sed 's/resume_typeinfos.m:[0-9]*/resume_typeinfos.m:NNNN/g' \
> resume_typeinfos.out 2>&1
retry.out: retry retry.inp
- $(MDB) ./retry < retry.inp > retry.out 2>&1
+ $(MDB_STD) ./retry < retry.inp > retry.out 2>&1
shallow.out: shallow shallow.inp
$(MDB) ./shallow < shallow.inp > shallow.out 2>&1
Index: tests/debugger/completion.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/completion.exp,v
retrieving revision 1.7
diff -u -r1.7 completion.exp
--- tests/debugger/completion.exp 5 Jun 2002 16:41:21 -0000 1.7
+++ tests/debugger/completion.exp 11 Sep 2002 12:19:40 -0000
@@ -15,11 +15,11 @@
context forward printlevel step
continue g proc_body table_io
current goto proc_stats unalias
-d h procedures up
-dd help query v
-dd_dd ignore quit vars
-delete io_query r view
-disable label_stats register
+d h procedures unhide_events
+dd help query up
+dd_dd ignore quit v
+delete io_query r vars
+disable label_stats register view
document level retry
h help
vars view
Index: tests/debugger/completion.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/completion.inp,v
retrieving revision 1.4
diff -u -r1.4 completion.inp
--- tests/debugger/completion.inp 5 Jun 2002 16:41:21 -0000 1.4
+++ tests/debugger/completion.inp 11 Sep 2002 09:46:22 -0000
@@ -5,7 +5,7 @@
sta@ @
proc at e@complet@:@1
set --f at fo@p@
-un at ex@
+una at ex@
b za@
b func*complet at z@
b complet at s@1 at 1
Index: tests/debugger/interpreter.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/interpreter.exp,v
retrieving revision 1.16
diff -u -r1.16 interpreter.exp
--- tests/debugger/interpreter.exp 11 Sep 2002 07:20:30 -0000 1.16
+++ tests/debugger/interpreter.exp 11 Sep 2002 12:20:26 -0000
@@ -4,7 +4,7 @@
mdb> context none
Contexts will not be printed.
mdb> register --quiet
-mdb> 10 step
+mdb> 12 step
Pure Prolog Interpreter.
Consulting file `interpreter.m'...
@@ -17,27 +17,28 @@
HeadVar__1 term(varset(var_supply(0), empty, empty), functor(atom(":-"), [|](functor/3, []), context("interpreter.m", 22)))
HeadVar__2 []
DCG_0 (arg 4) state('<<c_pointer>>')
-mdb> goto 30
+mdb> goto 35
E3: C3 12 CALL pred interpreter:database_assert_clause/4-0 (det)
mdb> print *
Database (arg 1) [|](clause(varset(var_supply/1, empty, empty), functor(atom/1, [|]/2, context/2), functor(atom/1, [], context/2)), [|](clause(varset/3, functor/3, functor/3), [|](clause/3, [])))
VarSet (arg 2) varset(var_supply(0), empty, empty)
Term (arg 3) functor(atom(":-"), [|](functor(atom/1, [|]/2, context/2), []), context("interpreter.m", 26))
mdb> finish -a
- E4: C3 12 ELSE pred interpreter:database_assert_clause/4-0 (det) e;
- E5: C3 12 EXIT pred interpreter:database_assert_clause/4-0 (det)
+ E4: C3 12 COND pred interpreter:database_assert_clause/4-0 (det) ?;
+ E5: C3 12 ELSE pred interpreter:database_assert_clause/4-0 (det) e;
+ E6: C3 12 EXIT pred interpreter:database_assert_clause/4-0 (det)
mdb> print *
Database (arg 1) [|](clause(varset(var_supply/1, empty, empty), functor(atom/1, [|]/2, context/2), functor(atom/1, [], context/2)), [|](clause(varset/3, functor/3, functor/3), [|](clause/3, [])))
VarSet (arg 2) varset(var_supply(0), empty, empty)
Term (arg 3) functor(atom(":-"), [|](functor(atom/1, [|]/2, context/2), []), context("interpreter.m", 26))
HeadVar__4 [|](clause(varset(var_supply/1, empty, empty), functor(atom/1, [|]/2, context/2), functor(atom/1, [], context/2)), [|](clause(varset/3, functor/3, functor/3), [|](clause/3, [|]/2)))
mdb>
- E6: C4 12 CALL pred interpreter:consult_until_eof/4-0 (det)
+ E7: C4 12 CALL pred interpreter:consult_until_eof/4-0 (det)
mdb> finish -n
- E7: C4 12 EXIT pred interpreter:consult_until_eof/4-0 (det)
+ E8: C4 12 EXIT pred interpreter:consult_until_eof/4-0 (det)
mdb>
- E8: C5 11 EXIT pred interpreter:consult_until_eof_2/5-0 (det)
+ E9: C5 11 EXIT pred interpreter:consult_until_eof_2/5-0 (det)
mdb>
- E9: C6 10 EXIT pred interpreter:consult_until_eof/4-0 (det)
+ E10: C6 10 EXIT pred interpreter:consult_until_eof/4-0 (det)
mdb> continue
?-
Index: tests/debugger/interpreter.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/interpreter.exp2,v
retrieving revision 1.14
diff -u -r1.14 interpreter.exp2
--- tests/debugger/interpreter.exp2 11 Sep 2002 07:20:30 -0000 1.14
+++ tests/debugger/interpreter.exp2 12 Sep 2002 01:08:40 -0000
@@ -4,10 +4,14 @@
mdb> context none
Contexts will not be printed.
mdb> register --quiet
-mdb> 10 step
+mdb> b consult
+ 0: + stop interface pred interpreter:consult/5-0 (det)
+mdb> c
Pure Prolog Interpreter.
E2: C2 3 CALL pred interpreter:consult/5-0 (det)
+mdb> delete 0
+ 0: E stop interface pred interpreter:consult/5-0 (det)
mdb> vars
1 File (arg 1)
2 Database0 (arg 2)
@@ -16,9 +20,15 @@
File (arg 1) "interpreter.m"
Database0 (arg 2) []
DCG_0 (arg 4) state('<<c_pointer>>')
-mdb> goto 30
+mdb> b database_assert_clause
+ 0: + stop interface pred interpreter:database_assert_clause/4-0 (det)
+mdb> c
Consulting file `interpreter.m'...
- E3: C3 6 EXIT pred interpreter:database_assert_clause/4-0 (det)
+ E3: C3 6 CALL pred interpreter:database_assert_clause/4-0 (det)
+mdb> delete 0
+ 0: E stop interface pred interpreter:database_assert_clause/4-0 (det)
+mdb> finish
+ E4: C3 6 EXIT pred interpreter:database_assert_clause/4-0 (det)
mdb> print *
Database (arg 1) []
VarSet (arg 2) varset(var_supply(0), empty, empty)
@@ -32,12 +42,12 @@
Term (arg 3) functor(atom(":-"), [|](functor(atom/1, [|]/2, context/2), []), context("interpreter.m", 22))
HeadVar__4 [|](clause(varset(var_supply/1, empty, empty), functor(atom/1, [|]/2, context/2), functor(atom/1, [], context/2)), [])
mdb>
- E4: C4 6 CALL pred interpreter:consult_until_eof/4-0 (det)
+ E5: C4 6 CALL pred interpreter:consult_until_eof/4-0 (det)
mdb> finish -n
- E5: C4 6 EXIT pred interpreter:consult_until_eof/4-0 (det)
+ E6: C4 6 EXIT pred interpreter:consult_until_eof/4-0 (det)
mdb>
- E6: C5 5 EXIT pred interpreter:consult_until_eof_2/5-0 (det)
+ E7: C5 5 EXIT pred interpreter:consult_until_eof_2/5-0 (det)
mdb>
- E7: C6 4 EXIT pred interpreter:consult_until_eof/4-0 (det)
+ E8: C6 4 EXIT pred interpreter:consult_until_eof/4-0 (det)
mdb> continue
?-
Index: tests/debugger/interpreter.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/interpreter.inp,v
retrieving revision 1.5
diff -u -r1.5 interpreter.inp
--- tests/debugger/interpreter.inp 15 Nov 1999 00:43:46 -0000 1.5
+++ tests/debugger/interpreter.inp 12 Sep 2002 01:07:55 -0000
@@ -1,10 +1,15 @@
echo on
context none
register --quiet
-10 step
+b consult
+c
+delete 0
vars
print *
-goto 30
+b database_assert_clause
+c
+delete 0
+finish
print *
finish -a
print *
Index: tests/debugger/loopcheck.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/loopcheck.exp,v
retrieving revision 1.6
diff -u -r1.6 loopcheck.exp
--- tests/debugger/loopcheck.exp 25 Jul 2002 16:20:53 -0000 1.6
+++ tests/debugger/loopcheck.exp 11 Sep 2002 06:27:09 -0000
@@ -6,23 +6,15 @@
mdb> continue -a
2: 2 2 CALL pred loopcheck:loop/1-0 (erroneous)
loopcheck.m:21 (from loopcheck.m:14)
- 3: 2 2 ELSE pred loopcheck:loop/1-0 (erroneous) c2;e;
- loopcheck.m:21
- 4: 2 2 ELSE pred loopcheck:loop/1-0 (erroneous) c2;e;e;
- loopcheck.m:21
- 5: 3 3 CALL pred loopcheck:loop/1-0 (erroneous)
+ 3: 3 3 CALL pred loopcheck:loop/1-0 (erroneous)
loopcheck.m:21 (from loopcheck.m:21)
- 6: 3 3 ELSE pred loopcheck:loop/1-0 (erroneous) c2;e;
- loopcheck.m:21
- 7: 3 3 THEN pred loopcheck:loop/1-0 (erroneous) c2;e;t;
- loopcheck.m:21
- 8: 3 3 EXCP pred loopcheck:loop/1-0 (erroneous)
+ 4: 3 3 EXCP pred loopcheck:loop/1-0 (erroneous)
loopcheck.m:21 (from loopcheck.m:21)
- 9: 2 2 EXCP pred loopcheck:loop/1-0 (erroneous)
+ 5: 2 2 EXCP pred loopcheck:loop/1-0 (erroneous)
loopcheck.m:21 (from loopcheck.m:14)
- 10: 1 1 EXCP pred loopcheck:main/2-0 (det)
+ 6: 1 1 EXCP pred loopcheck:main/2-0 (det)
loopcheck.m:14
Uncaught Mercury exception:
Software Error: detected infinite recursion in pred loopcheck:loop/1
-Last trace event was event #10.
-Last trace event before the unhandled exception was event #7.
+Last trace event was event #6.
+Last trace event before the unhandled exception was event #3.
Index: tests/debugger/loopcheck.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/loopcheck.exp2,v
retrieving revision 1.8
diff -u -r1.8 loopcheck.exp2
--- tests/debugger/loopcheck.exp2 25 Jul 2002 16:20:53 -0000 1.8
+++ tests/debugger/loopcheck.exp2 11 Sep 2002 19:24:29 -0000
@@ -6,27 +6,19 @@
mdb> continue -a
2: 2 2 CALL pred loopcheck:loop/1-0 (erroneous)
loopcheck.m:21 (from loopcheck.m:14)
- 3: 2 2 ELSE pred loopcheck:loop/1-0 (erroneous) c2;e;
- loopcheck.m:21
- 4: 2 2 ELSE pred loopcheck:loop/1-0 (erroneous) c2;e;e;
- loopcheck.m:21
- 5: 3 3 CALL pred loopcheck:loop/1-0 (erroneous)
+ 3: 3 3 CALL pred loopcheck:loop/1-0 (erroneous)
loopcheck.m:21 (from loopcheck.m:21)
- 6: 3 3 ELSE pred loopcheck:loop/1-0 (erroneous) c2;e;
- loopcheck.m:21
- 7: 3 3 THEN pred loopcheck:loop/1-0 (erroneous) c2;e;t;
- loopcheck.m:21
- 8: 4 4 CALL pred require:error/1-0 (erroneous)
+ 4: 4 4 CALL pred require:error/1-0 (erroneous)
require.m:NNNN (from loopcheck.m:21)
- 9: 4 4 EXCP pred require:error/1-0 (erroneous)
+ 5: 4 4 EXCP pred require:error/1-0 (erroneous)
require.m:NNNN (from loopcheck.m:21)
- 10: 3 3 EXCP pred loopcheck:loop/1-0 (erroneous)
+ 6: 3 3 EXCP pred loopcheck:loop/1-0 (erroneous)
loopcheck.m:21 (from loopcheck.m:21)
- 11: 2 2 EXCP pred loopcheck:loop/1-0 (erroneous)
+ 7: 2 2 EXCP pred loopcheck:loop/1-0 (erroneous)
loopcheck.m:21 (from loopcheck.m:14)
- 12: 1 1 EXCP pred loopcheck:main/2-0 (det)
+ 8: 1 1 EXCP pred loopcheck:main/2-0 (det)
loopcheck.m:14
Uncaught Mercury exception:
Software Error: detected infinite recursion in pred loopcheck:loop/1
-Last trace event was event #12.
-Last trace event before the unhandled exception was event #8.
+Last trace event was event #8.
+Last trace event before the unhandled exception was event #4.
Index: tests/debugger/nondet_stack.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/nondet_stack.exp,v
retrieving revision 1.4
diff -u -r1.4 nondet_stack.exp
--- tests/debugger/nondet_stack.exp 5 Jun 2002 16:41:22 -0000 1.4
+++ tests/debugger/nondet_stack.exp 11 Sep 2002 12:34:34 -0000
@@ -1,11 +1,11 @@
- 1: 1 1 CALL pred nondet_stack:main/2-0 (cc_multi) nondet_stack.m:NNNN
+ E1: C1 1 CALL pred nondet_stack:main/2-0 (cc_multi) nondet_stack.m:NNNN
mdb> echo on
Command echo enabled.
mdb> context none
Contexts will not be printed.
mdb> register --quiet
-mdb> goto 21
- 21: 10 6 SWTC pred nondet_stack:qperm/2-0 (nondet) s2;
+mdb> goto 22
+ E2: C2 6 SWTC pred nondet_stack:qperm/2-0 (nondet) s2;
mdb> nondet_stack
non 135: ordinary, 13 words
redoip: unnamed label
@@ -176,8 +176,8 @@
redofr: non 10
succip: label wrapper_not_reached
succfr: non 4
-mdb> goto 38
- 38: 15 3 CALL pred nondet_stack:safe/1-0 (semidet)
+mdb> goto 39
+ E3: C3 3 CALL pred nondet_stack:safe/1-0 (semidet)
mdb> nondet_stack
non 217: temp
redoip: label UNKNOWN
@@ -466,7 +466,7 @@
mdb> break nondet_stack__test
0: + stop interface pred nondet_stack:test/2-0 (nondet)
mdb> continue
- 674: 141 2 CALL pred nondet_stack:test/2-0 (nondet)
+ E4: C4 2 CALL pred nondet_stack:test/2-0 (nondet)
mdb> nondet_stack
non 284: ordinary, 12 words
redoip: unnamed label
Index: tests/debugger/nondet_stack.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/nondet_stack.exp2,v
retrieving revision 1.4
diff -u -r1.4 nondet_stack.exp2
--- tests/debugger/nondet_stack.exp2 5 Jun 2002 16:41:22 -0000 1.4
+++ tests/debugger/nondet_stack.exp2 11 Sep 2002 19:24:50 -0000
@@ -1,11 +1,11 @@
- 1: 1 1 CALL pred nondet_stack:main/2-0 (cc_multi) nondet_stack.m:NNNN
+ E1: C1 1 CALL pred nondet_stack:main/2-0 (cc_multi) nondet_stack.m:NNNN
mdb> echo on
Command echo enabled.
mdb> context none
Contexts will not be printed.
mdb> register --quiet
-mdb> goto 21
- 21: 10 6 SWTC pred nondet_stack:qperm/2-0 (nondet) s2;
+mdb> goto 22
+ E2: C2 6 SWTC pred nondet_stack:qperm/2-0 (nondet) s2;
mdb> nondet_stack
non 154: ordinary, 15 words
redoip: unnamed label
@@ -176,8 +176,8 @@
redofr: non 10
succip: label wrapper_not_reached
succfr: non 4
-mdb> goto 38
- 38: 15 3 CALL pred nondet_stack:safe/1-0 (semidet)
+mdb> goto 39
+ E3: C3 3 CALL pred nondet_stack:safe/1-0 (semidet)
mdb> nondet_stack
non 246: temp
redoip: label UNKNOWN
@@ -466,7 +466,7 @@
mdb> break nondet_stack__test
0: + stop interface pred nondet_stack:test/2-0 (nondet)
mdb> continue
- 674: 141 2 CALL pred nondet_stack:test/2-0 (nondet)
+ E4: C4 2 CALL pred nondet_stack:test/2-0 (nondet)
mdb> nondet_stack
non 325: ordinary, 15 words
redoip: unnamed label
Index: tests/debugger/nondet_stack.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/nondet_stack.inp,v
retrieving revision 1.1
diff -u -r1.1 nondet_stack.inp
--- tests/debugger/nondet_stack.inp 4 Dec 2001 00:44:38 -0000 1.1
+++ tests/debugger/nondet_stack.inp 11 Sep 2002 09:56:28 -0000
@@ -1,11 +1,11 @@
echo on
context none
register --quiet
-goto 21
+goto 22
nondet_stack
stack_regs
nondet_stack -d
-goto 38
+goto 39
nondet_stack
stack_regs
nondet_stack -d
Index: tests/debugger/queens.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/queens.exp,v
retrieving revision 1.23
diff -u -r1.23 queens.exp
--- tests/debugger/queens.exp 11 Sep 2002 07:20:30 -0000 1.23
+++ tests/debugger/queens.exp 11 Sep 2002 16:09:50 -0000
@@ -1,12 +1,17 @@
E1: C1 1 CALL pred queens:main/2-0 (cc_multi) queens.m:17
mdb> echo on
Command echo enabled.
+mdb> register --quiet
mdb> retry 1
not that many ancestors
mdb> print *
DCG_0 (arg 1) state('<<c_pointer>>')
-mdb>
+mdb> b data
+ 0: + stop interface pred queens:data/1-0 (det)
+mdb> continue
E2: C2 2 CALL pred queens:data/1-0 (det) queens.m:39 (queens.m:15)
+mdb> delete 0
+ 0: E stop interface pred queens:data/1-0 (det)
mdb> print *
mdb: there are no live variables.
mdb>
@@ -22,12 +27,10 @@
mdb> print *
HeadVar__1 [1, 2, 3, 4, 5]
mdb> print_optionals on
-optional values are being printed
mdb> print *
HeadVar__1 [1, 2, 3, 4, 5]
TypeInfo_for_T int
mdb> print_optionals off
-optional values are not being printed
mdb> print *
HeadVar__1 [1, 2, 3, 4, 5]
mdb>
@@ -118,7 +121,7 @@
mdb>
E15: C8 5 CALL queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
-mdb> goto -a 20
+mdb> goto -a 21
E16: C8 5 SWTC queens.m:46
pred queens:qperm/2-0 (nondet) s2;
E17: C9 6 CALL queens.m:51 (from queens.m:47)
@@ -199,27 +202,29 @@
pred queens:nodiag/3-0 (semidet)
E41: C16 4 SWTC queens.m:61
pred queens:nodiag/3-0 (semidet) s2;
- E42: C16 4 THEN queens.m:65
+ E42: C16 4 COND queens.m:64
+ pred queens:nodiag/3-0 (semidet) s2;c6;?;
+ E43: C16 4 THEN queens.m:65
pred queens:nodiag/3-0 (semidet) s2;c6;t;
- E43: C16 4 FAIL queens.m:60 (from queens.m:57)
+ E44: C16 4 FAIL queens.m:60 (from queens.m:57)
pred queens:nodiag/3-0 (semidet)
- E44: C15 3 FAIL queens.m:55 (from queens.m:43)
+ E45: C15 3 FAIL queens.m:55 (from queens.m:43)
pred queens:safe/1-0 (semidet)
- E45: C4 3 REDO queens.m:45 (from queens.m:42)
+ E46: C4 3 REDO queens.m:45 (from queens.m:42)
pred queens:qperm/2-0 (nondet)
- E46: C6 4 REDO queens.m:45 (from queens.m:49)
+ E47: C6 4 REDO queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- E47: C8 5 REDO queens.m:45 (from queens.m:49)
+ E48: C8 5 REDO queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- E48: C10 6 REDO queens.m:45 (from queens.m:49)
+ E49: C10 6 REDO queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- E49: C12 7 REDO queens.m:45 (from queens.m:49)
+ E50: C12 7 REDO queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- E50: C14 8 REDO queens.m:45 (from queens.m:49)
+ E51: C14 8 REDO queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- E51: C14 8 FAIL queens.m:45 (from queens.m:49)
+ E52: C14 8 FAIL queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- E52: C13 8 REDO queens.m:51 (from queens.m:47)
+ E53: C13 8 REDO queens.m:51 (from queens.m:47)
pred queens:qdelete/3-0 (nondet)
mdb> break info
0: + stop interface pred queens:print_list/3-0 (det)
@@ -228,15 +233,15 @@
0: + stop interface pred queens:print_list/3-0 (det)
1: + stop interface pred queens:qdelete/3-0 (nondet)
mdb> step -aS 5
- E53: C13 8 DISJ queens.m:52
+ E54: C13 8 DISJ queens.m:52
pred queens:qdelete/3-0 (nondet) c2;d2;
- E54: C17 9 CALL queens.m:51 (from queens.m:53)
+ E55: C17 9 CALL queens.m:51 (from queens.m:53)
pred queens:qdelete/3-0 (nondet)
- E55: C17 9 FAIL queens.m:51 (from queens.m:53)
+ E56: C17 9 FAIL queens.m:51 (from queens.m:53)
pred queens:qdelete/3-0 (nondet)
- E56: C13 8 FAIL queens.m:51 (from queens.m:47)
+ E57: C13 8 FAIL queens.m:51 (from queens.m:47)
pred queens:qdelete/3-0 (nondet)
- E57: C12 7 FAIL queens.m:45 (from queens.m:49)
+ E58: C12 7 FAIL queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
mdb> disable 1
1: - stop interface pred queens:qdelete/3-0 (nondet)
@@ -275,27 +280,27 @@
E38: C15 3 CALL queens.m:55 (from queens.m:43)
pred queens:safe/1-0 (semidet)
mdb> continue -n
- E46: C6 4 REDO queens.m:45 (from queens.m:49)
+ E47: C6 4 REDO queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
mdb> continue -n
- E47: C8 5 REDO queens.m:45 (from queens.m:49)
+ E48: C8 5 REDO queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
mdb> forward
- E48: C10 6 REDO queens.m:45 (from queens.m:49)
+ E49: C10 6 REDO queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- E49: C12 7 REDO queens.m:45 (from queens.m:49)
+ E50: C12 7 REDO queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- E50: C14 8 REDO queens.m:45 (from queens.m:49)
+ E51: C14 8 REDO queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- E51: C14 8 FAIL queens.m:45 (from queens.m:49)
+ E52: C14 8 FAIL queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
- E53: C13 8 DISJ queens.m:52
+ E54: C13 8 DISJ queens.m:52
pred queens:qdelete/3-0 (nondet) c2;d2;
mdb> continue -n
- E57: C12 7 FAIL queens.m:45 (from queens.m:49)
+ E58: C12 7 FAIL queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
mdb> continue -n
- E58: C18 7 CALL queens.m:45 (from queens.m:49)
+ E59: C18 7 CALL queens.m:45 (from queens.m:49)
pred queens:qperm/2-0 (nondet)
mdb> delete *
0: E stop interface pred queens:print_list/3-0 (det)
@@ -305,7 +310,7 @@
0: + stop interface pred queens:main/2-0 (cc_multi)
mdb> continue -n
[1, 3, 5, 2, 4]
- E59: C1 1 EXIT queens.m:17
+ E60: C1 1 EXIT queens.m:17
pred queens:main/2-0 (cc_multi)
mdb> retry
Retry across I/O operations is not always safe.
Index: tests/debugger/queens.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/queens.inp,v
retrieving revision 1.11
diff -u -r1.11 queens.inp
--- tests/debugger/queens.inp 12 Mar 2002 03:40:41 -0000 1.11
+++ tests/debugger/queens.inp 11 Sep 2002 16:09:30 -0000
@@ -1,7 +1,10 @@
echo on
+register --quiet
retry 1
print *
-
+b data
+continue
+delete 0
print *
print *
@@ -46,7 +49,7 @@
print *
-goto -a 20
+goto -a 21
stack
stack -d
print *
Index: tests/debugger/resume_typeinfos.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/resume_typeinfos.exp,v
retrieving revision 1.2
diff -u -r1.2 resume_typeinfos.exp
--- tests/debugger/resume_typeinfos.exp 5 Jun 2002 16:41:23 -0000 1.2
+++ tests/debugger/resume_typeinfos.exp 11 Sep 2002 10:29:31 -0000
@@ -1,16 +1,16 @@
- 1: 1 1 CALL pred resume_typeinfos:main/2-0 (det) resume_typeinfos.m:NNNN
+ E1: C1 1 CALL pred resume_typeinfos:main/2-0 (det) resume_typeinfos.m:NNNN
mdb> echo on
Command echo enabled.
mdb> context none
Contexts will not be printed.
-mdb> goto 3
- 3: 3 3 CALL pred resume_typeinfos:introduce_new_typeinfo/2-0 (det)
+mdb> goto 4
+ E2: C2 3 CALL pred resume_typeinfos:introduce_new_typeinfo/2-0 (det)
mdb> print *
HeadVar__1 [1, 2]
-mdb> goto 5
- 5: 2 2 ELSE pred resume_typeinfos:test/2-0 (semidet) c2;e;
+mdb> goto 6
+ E3: C3 2 COND pred resume_typeinfos:test/2-0 (semidet) c2;?;
mdb> finish
- 6: 2 2 FAIL pred resume_typeinfos:test/2-0 (semidet)
+ E4: C3 2 FAIL pred resume_typeinfos:test/2-0 (semidet)
mdb> print *
TestList (arg 1) [1, 2]
mdb> continue
Index: tests/debugger/resume_typeinfos.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/resume_typeinfos.inp,v
retrieving revision 1.1
diff -u -r1.1 resume_typeinfos.inp
--- tests/debugger/resume_typeinfos.inp 22 Jul 2000 11:35:19 -0000 1.1
+++ tests/debugger/resume_typeinfos.inp 11 Sep 2002 10:27:34 -0000
@@ -1,8 +1,8 @@
echo on
context none
-goto 3
+goto 4
print *
-goto 5
+goto 6
finish
print *
continue
Index: tests/debugger/retry.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/retry.exp,v
retrieving revision 1.3
diff -u -r1.3 retry.exp
--- tests/debugger/retry.exp 5 Jun 2002 16:41:23 -0000 1.3
+++ tests/debugger/retry.exp 11 Sep 2002 15:57:10 -0000
@@ -1,4 +1,4 @@
- 1: 1 1 CALL pred retry:main/2-0 (det) retry.m:25
+ E1: C1 1 CALL pred retry:main/2-0 (det) retry.m:25
mdb> echo on
Command echo enabled.
mdb> register --quiet
@@ -9,8 +9,8 @@
mdb> break det_without_cut_1
0: + stop interface pred retry:det_without_cut_1/2-0 (det)
mdb> continue -a
- 2: 2 2 CALL pred retry:det_without_cut/2-0 (det)
- 3: 3 3 CALL pred retry:det_without_cut_1/2-0 (det)
+ E2: C2 2 CALL pred retry:det_without_cut/2-0 (det)
+ E3: C3 3 CALL pred retry:det_without_cut_1/2-0 (det)
mdb> disable 0
0: - stop interface pred retry:det_without_cut_1/2-0 (det)
mdb> retry
@@ -20,72 +20,74 @@
1 pred retry:det_without_cut/2-0 (det)
2 pred retry:main/2-0 (det)
mdb> finish
- 6: 3 3 EXIT pred retry:det_without_cut_1/2-0 (det)
+ E4: C3 3 EXIT pred retry:det_without_cut_1/2-0 (det)
mdb> retry 1
- 2: 2 2 CALL pred retry:det_without_cut/2-0 (det)
+ E2: C2 2 CALL pred retry:det_without_cut/2-0 (det)
mdb> stack
0 pred retry:det_without_cut/2-0 (det)
1 pred retry:main/2-0 (det)
mdb> break det_without_cut_2
1: + stop interface pred retry:det_without_cut_2/2-0 (det)
mdb> continue -a
- 3: 3 3 CALL pred retry:det_without_cut_1/2-0 (det)
- 4: 4 4 CALL pred retry:det_without_cut_2/2-0 (det)
+ E3: C3 3 CALL pred retry:det_without_cut_1/2-0 (det)
+ E5: C4 4 CALL pred retry:det_without_cut_2/2-0 (det)
mdb> delete *
0: D stop interface pred retry:det_without_cut_1/2-0 (det)
1: E stop interface pred retry:det_without_cut_2/2-0 (det)
mdb> retry 2
- 2: 2 2 CALL pred retry:det_without_cut/2-0 (det)
+ E2: C2 2 CALL pred retry:det_without_cut/2-0 (det)
mdb> finish
- 7: 2 2 EXIT pred retry:det_without_cut/2-0 (det)
+ E6: C2 2 EXIT pred retry:det_without_cut/2-0 (det)
mdb> stack
0 pred retry:det_without_cut/2-0 (det)
1 pred retry:main/2-0 (det)
mdb> break det_with_cut_1
0: + stop interface pred retry:det_with_cut_1/2-0 (nondet)
mdb> continue -a
- 8: 5 2 CALL pred retry:det_with_cut/2-0 (det)
- 9: 6 3 CALL pred retry:det_with_cut_1/2-0 (nondet)
+ E7: C5 2 CALL pred retry:det_with_cut/2-0 (det)
+ E8: C5 2 COND pred retry:det_with_cut/2-0 (det) ?;
+ E9: C6 3 CALL pred retry:det_with_cut_1/2-0 (nondet)
mdb> delete *
0: E stop interface pred retry:det_with_cut_1/2-0 (nondet)
mdb> finish
- 13: 6 3 EXIT pred retry:det_with_cut_1/2-0 (nondet)
+ E10: C6 3 EXIT pred retry:det_with_cut_1/2-0 (nondet)
mdb> retry 1
- 8: 5 2 CALL pred retry:det_with_cut/2-0 (det)
+ E7: C5 2 CALL pred retry:det_with_cut/2-0 (det)
mdb> finish
- 15: 5 2 EXIT pred retry:det_with_cut/2-0 (det)
+ E11: C5 2 EXIT pred retry:det_with_cut/2-0 (det)
mdb> stack
0 pred retry:det_with_cut/2-0 (det)
1 pred retry:main/2-0 (det)
mdb> retry 1
- 1: 1 1 CALL pred retry:main/2-0 (det)
+ E1: C1 1 CALL pred retry:main/2-0 (det)
mdb> break det_with_cut_2
0: + stop interface pred retry:det_with_cut_2/2-0 (det)
mdb> continue -a
- 2: 2 2 CALL pred retry:det_without_cut/2-0 (det)
- 3: 3 3 CALL pred retry:det_without_cut_1/2-0 (det)
- 4: 4 4 CALL pred retry:det_without_cut_2/2-0 (det)
- 5: 4 4 EXIT pred retry:det_without_cut_2/2-0 (det)
- 6: 3 3 EXIT pred retry:det_without_cut_1/2-0 (det)
- 7: 2 2 EXIT pred retry:det_without_cut/2-0 (det)
- 8: 5 2 CALL pred retry:det_with_cut/2-0 (det)
- 9: 6 3 CALL pred retry:det_with_cut_1/2-0 (nondet)
- 10: 6 3 DISJ pred retry:det_with_cut_1/2-0 (nondet) c2;d1;
- 11: 7 4 CALL pred retry:det_with_cut_2/2-0 (det)
+ E2: C2 2 CALL pred retry:det_without_cut/2-0 (det)
+ E3: C3 3 CALL pred retry:det_without_cut_1/2-0 (det)
+ E5: C4 4 CALL pred retry:det_without_cut_2/2-0 (det)
+ E12: C4 4 EXIT pred retry:det_without_cut_2/2-0 (det)
+ E4: C3 3 EXIT pred retry:det_without_cut_1/2-0 (det)
+ E6: C2 2 EXIT pred retry:det_without_cut/2-0 (det)
+ E7: C5 2 CALL pred retry:det_with_cut/2-0 (det)
+ E8: C5 2 COND pred retry:det_with_cut/2-0 (det) ?;
+ E9: C6 3 CALL pred retry:det_with_cut_1/2-0 (nondet)
+ E13: C6 3 DISJ pred retry:det_with_cut_1/2-0 (nondet) c2;d1;
+ E14: C7 4 CALL pred retry:det_with_cut_2/2-0 (det)
mdb> delete *
0: E stop interface pred retry:det_with_cut_2/2-0 (det)
mdb> break nondet
0: + stop interface pred retry:nondet/2-0 (multi)
mdb> continue
- 21: 10 2 CALL pred retry:nondet/2-0 (multi)
+ E15: C8 2 CALL pred retry:nondet/2-0 (multi)
mdb> print *
X0 (arg 1) 4
mdb> break nondet_2
1: + stop interface pred retry:nondet_2/2-0 (det)
mdb> continue
- 25: 12 3 CALL pred retry:nondet_2/2-0 (det)
+ E16: C9 3 CALL pred retry:nondet_2/2-0 (det)
mdb> retry 1
- 21: 10 2 CALL pred retry:nondet/2-0 (multi)
+ E15: C8 2 CALL pred retry:nondet/2-0 (multi)
mdb> print *
X0 (arg 1) 4
mdb> delete *
@@ -99,84 +101,28 @@
9
40 41
50 51
- 89: 29 2 CALL pred retry:fib/2-0 (det)
+ E17: C10 2 CALL pred retry:fib/2-0 (det)
mdb> print *
N (arg 1) 15
mdb> continue
- 93: 30 3 CALL pred retry:fib/2-0 (det)
+ E18: C11 3 CALL pred retry:fib/2-0 (det)
mdb> print *
N (arg 1) 14
mdb> continue
- 97: 31 4 CALL pred retry:fib/2-0 (det)
+ E19: C12 4 CALL pred retry:fib/2-0 (det)
mdb> continue
- 101: 32 5 CALL pred retry:fib/2-0 (det)
+ E20: C13 5 CALL pred retry:fib/2-0 (det)
mdb> step
- 102: 32 5 ELSE pred retry:fib/2-0 (det) c2;e;
+ E21: C13 5 COND pred retry:fib/2-0 (det) c2;e;e;c2;?;
mdb> retry 2
- 93: 30 3 CALL pred retry:fib/2-0 (det)
+ E18: C11 3 CALL pred retry:fib/2-0 (det)
mdb> print *
N (arg 1) 14
mdb> next
- 94: 30 3 ELSE pred retry:fib/2-0 (det) c2;e;
+ E22: C11 3 COND pred retry:fib/2-0 (det) c2;e;e;c2;?;
mdb> retry 1
- 89: 29 2 CALL pred retry:fib/2-0 (det)
-mdb> finish
- 93: 30 3 CALL pred retry:fib/2-0 (det)
- 97: 31 4 CALL pred retry:fib/2-0 (det)
- 101: 32 5 CALL pred retry:fib/2-0 (det)
- 105: 33 6 CALL pred retry:fib/2-0 (det)
- 109: 34 7 CALL pred retry:fib/2-0 (det)
- 113: 35 8 CALL pred retry:fib/2-0 (det)
- 117: 36 9 CALL pred retry:fib/2-0 (det)
- 121: 37 10 CALL pred retry:fib/2-0 (det)
- 125: 38 11 CALL pred retry:fib/2-0 (det)
- 129: 39 12 CALL pred retry:fib/2-0 (det)
- 133: 40 13 CALL pred retry:fib/2-0 (det)
- 137: 41 14 CALL pred retry:fib/2-0 (det)
- 141: 42 15 CALL pred retry:fib/2-0 (det)
- 145: 43 16 CALL pred retry:fib/2-0 (det)
- 149: 43 16 EXIT pred retry:fib/2-0 (det)
- 150: 44 16 CALL pred retry:fib/2-0 (det)
- 154: 44 16 EXIT pred retry:fib/2-0 (det)
- 155: 42 15 EXIT pred retry:fib/2-0 (det)
- 156: 45 15 CALL pred retry:fib/2-0 (det)
- 158: 45 15 EXIT pred retry:fib/2-0 (det)
- 159: 41 14 EXIT pred retry:fib/2-0 (det)
- 160: 46 14 CALL pred retry:fib/2-0 (det)
- 162: 46 14 EXIT pred retry:fib/2-0 (det)
- 163: 40 13 EXIT pred retry:fib/2-0 (det)
- 164: 47 13 CALL pred retry:fib/2-0 (det)
- 166: 47 13 EXIT pred retry:fib/2-0 (det)
- 167: 39 12 EXIT pred retry:fib/2-0 (det)
- 168: 48 12 CALL pred retry:fib/2-0 (det)
- 170: 48 12 EXIT pred retry:fib/2-0 (det)
- 171: 38 11 EXIT pred retry:fib/2-0 (det)
- 172: 49 11 CALL pred retry:fib/2-0 (det)
- 174: 49 11 EXIT pred retry:fib/2-0 (det)
- 175: 37 10 EXIT pred retry:fib/2-0 (det)
- 176: 50 10 CALL pred retry:fib/2-0 (det)
- 178: 50 10 EXIT pred retry:fib/2-0 (det)
- 179: 36 9 EXIT pred retry:fib/2-0 (det)
- 180: 51 9 CALL pred retry:fib/2-0 (det)
- 182: 51 9 EXIT pred retry:fib/2-0 (det)
- 183: 35 8 EXIT pred retry:fib/2-0 (det)
- 184: 52 8 CALL pred retry:fib/2-0 (det)
- 186: 52 8 EXIT pred retry:fib/2-0 (det)
- 187: 34 7 EXIT pred retry:fib/2-0 (det)
- 188: 53 7 CALL pred retry:fib/2-0 (det)
- 190: 53 7 EXIT pred retry:fib/2-0 (det)
- 191: 33 6 EXIT pred retry:fib/2-0 (det)
- 192: 54 6 CALL pred retry:fib/2-0 (det)
- 194: 54 6 EXIT pred retry:fib/2-0 (det)
- 195: 32 5 EXIT pred retry:fib/2-0 (det)
- 196: 55 5 CALL pred retry:fib/2-0 (det)
- 198: 55 5 EXIT pred retry:fib/2-0 (det)
- 199: 31 4 EXIT pred retry:fib/2-0 (det)
- 200: 56 4 CALL pred retry:fib/2-0 (det)
- 202: 56 4 EXIT pred retry:fib/2-0 (det)
- 203: 30 3 EXIT pred retry:fib/2-0 (det)
- 204: 57 3 CALL pred retry:fib/2-0 (det)
- 206: 57 3 EXIT pred retry:fib/2-0 (det)
- 207: 29 2 EXIT pred retry:fib/2-0 (det)
-mdb> continue -S
+ E17: C10 2 CALL pred retry:fib/2-0 (det)
+mdb> finish -n
+ E23: C10 2 EXIT pred retry:fib/2-0 (det)
+mdb> continue -n -S
987
Index: tests/debugger/retry.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/retry.exp2,v
retrieving revision 1.3
diff -u -r1.3 retry.exp2
--- tests/debugger/retry.exp2 5 Jun 2002 16:41:23 -0000 1.3
+++ tests/debugger/retry.exp2 11 Sep 2002 19:25:50 -0000
@@ -1,4 +1,4 @@
- 1: 1 1 CALL pred retry:main/2-0 (det) retry.m:25
+ E1: C1 1 CALL pred retry:main/2-0 (det) retry.m:25
mdb> echo on
Command echo enabled.
mdb> register --quiet
@@ -9,8 +9,8 @@
mdb> break det_without_cut_1
0: + stop interface pred retry:det_without_cut_1/2-0 (det)
mdb> continue -a
- 2: 2 2 CALL pred retry:det_without_cut/2-0 (det)
- 3: 3 3 CALL pred retry:det_without_cut_1/2-0 (det)
+ E2: C2 2 CALL pred retry:det_without_cut/2-0 (det)
+ E3: C3 3 CALL pred retry:det_without_cut_1/2-0 (det)
mdb> disable 0
0: - stop interface pred retry:det_without_cut_1/2-0 (det)
mdb> retry
@@ -20,72 +20,74 @@
1 pred retry:det_without_cut/2-0 (det)
2 pred retry:main/2-0 (det)
mdb> finish
- 6: 3 3 EXIT pred retry:det_without_cut_1/2-0 (det)
+ E4: C3 3 EXIT pred retry:det_without_cut_1/2-0 (det)
mdb> retry 1
- 2: 2 2 CALL pred retry:det_without_cut/2-0 (det)
+ E2: C2 2 CALL pred retry:det_without_cut/2-0 (det)
mdb> stack
0 pred retry:det_without_cut/2-0 (det)
1 pred retry:main/2-0 (det)
mdb> break det_without_cut_2
1: + stop interface pred retry:det_without_cut_2/2-0 (det)
mdb> continue -a
- 3: 3 3 CALL pred retry:det_without_cut_1/2-0 (det)
- 4: 4 4 CALL pred retry:det_without_cut_2/2-0 (det)
+ E3: C3 3 CALL pred retry:det_without_cut_1/2-0 (det)
+ E5: C4 4 CALL pred retry:det_without_cut_2/2-0 (det)
mdb> delete *
0: D stop interface pred retry:det_without_cut_1/2-0 (det)
1: E stop interface pred retry:det_without_cut_2/2-0 (det)
mdb> retry 2
- 2: 2 2 CALL pred retry:det_without_cut/2-0 (det)
+ E2: C2 2 CALL pred retry:det_without_cut/2-0 (det)
mdb> finish
- 7: 2 2 EXIT pred retry:det_without_cut/2-0 (det)
+ E6: C2 2 EXIT pred retry:det_without_cut/2-0 (det)
mdb> stack
0 pred retry:det_without_cut/2-0 (det)
1 pred retry:main/2-0 (det)
mdb> break det_with_cut_1
0: + stop interface pred retry:det_with_cut_1/2-0 (nondet)
mdb> continue -a
- 8: 5 2 CALL pred retry:det_with_cut/2-0 (det)
- 9: 6 3 CALL pred retry:det_with_cut_1/2-0 (nondet)
+ E7: C5 2 CALL pred retry:det_with_cut/2-0 (det)
+ E8: C5 2 COND pred retry:det_with_cut/2-0 (det) ?;
+ E9: C6 3 CALL pred retry:det_with_cut_1/2-0 (nondet)
mdb> delete *
0: E stop interface pred retry:det_with_cut_1/2-0 (nondet)
mdb> finish
- 13: 6 3 EXIT pred retry:det_with_cut_1/2-0 (nondet)
+ E10: C6 3 EXIT pred retry:det_with_cut_1/2-0 (nondet)
mdb> retry 1
- 8: 5 2 CALL pred retry:det_with_cut/2-0 (det)
+ E7: C5 2 CALL pred retry:det_with_cut/2-0 (det)
mdb> finish
- 15: 5 2 EXIT pred retry:det_with_cut/2-0 (det)
+ E11: C5 2 EXIT pred retry:det_with_cut/2-0 (det)
mdb> stack
0 pred retry:det_with_cut/2-0 (det)
1 pred retry:main/2-0 (det)
mdb> retry 1
- 1: 1 1 CALL pred retry:main/2-0 (det)
+ E1: C1 1 CALL pred retry:main/2-0 (det)
mdb> break det_with_cut_2
0: + stop interface pred retry:det_with_cut_2/2-0 (det)
mdb> continue -a
- 2: 2 2 CALL pred retry:det_without_cut/2-0 (det)
- 3: 3 3 CALL pred retry:det_without_cut_1/2-0 (det)
- 4: 4 4 CALL pred retry:det_without_cut_2/2-0 (det)
- 5: 4 4 EXIT pred retry:det_without_cut_2/2-0 (det)
- 6: 3 3 EXIT pred retry:det_without_cut_1/2-0 (det)
- 7: 2 2 EXIT pred retry:det_without_cut/2-0 (det)
- 8: 5 2 CALL pred retry:det_with_cut/2-0 (det)
- 9: 6 3 CALL pred retry:det_with_cut_1/2-0 (nondet)
- 10: 6 3 DISJ pred retry:det_with_cut_1/2-0 (nondet) c2;d1;
- 11: 7 4 CALL pred retry:det_with_cut_2/2-0 (det)
+ E2: C2 2 CALL pred retry:det_without_cut/2-0 (det)
+ E3: C3 3 CALL pred retry:det_without_cut_1/2-0 (det)
+ E5: C4 4 CALL pred retry:det_without_cut_2/2-0 (det)
+ E12: C4 4 EXIT pred retry:det_without_cut_2/2-0 (det)
+ E4: C3 3 EXIT pred retry:det_without_cut_1/2-0 (det)
+ E6: C2 2 EXIT pred retry:det_without_cut/2-0 (det)
+ E7: C5 2 CALL pred retry:det_with_cut/2-0 (det)
+ E8: C5 2 COND pred retry:det_with_cut/2-0 (det) ?;
+ E9: C6 3 CALL pred retry:det_with_cut_1/2-0 (nondet)
+ E13: C6 3 DISJ pred retry:det_with_cut_1/2-0 (nondet) c2;d1;
+ E14: C7 4 CALL pred retry:det_with_cut_2/2-0 (det)
mdb> delete *
0: E stop interface pred retry:det_with_cut_2/2-0 (det)
mdb> break nondet
0: + stop interface pred retry:nondet/2-0 (multi)
mdb> continue
- 22: 11 3 CALL pred retry:nondet/2-0 (multi)
+ E15: C8 3 CALL pred retry:nondet/2-0 (multi)
mdb> print *
X0 (arg 1) 4
mdb> break nondet_2
1: + stop interface pred retry:nondet_2/2-0 (det)
mdb> continue
- 26: 13 4 CALL pred retry:nondet_2/2-0 (det)
+ E16: C9 4 CALL pred retry:nondet_2/2-0 (det)
mdb> retry 1
- 22: 11 3 CALL pred retry:nondet/2-0 (multi)
+ E15: C8 3 CALL pred retry:nondet/2-0 (multi)
mdb> print *
X0 (arg 1) 4
mdb> delete *
@@ -99,84 +101,28 @@
9
40 41
50 51
- 125: 47 2 CALL pred retry:fib/2-0 (det)
+ E17: C10 2 CALL pred retry:fib/2-0 (det)
mdb> print *
N (arg 1) 15
mdb> continue
- 129: 48 3 CALL pred retry:fib/2-0 (det)
+ E18: C11 3 CALL pred retry:fib/2-0 (det)
mdb> print *
N (arg 1) 14
mdb> continue
- 133: 49 4 CALL pred retry:fib/2-0 (det)
+ E19: C12 4 CALL pred retry:fib/2-0 (det)
mdb> continue
- 137: 50 5 CALL pred retry:fib/2-0 (det)
+ E20: C13 5 CALL pred retry:fib/2-0 (det)
mdb> step
- 138: 50 5 ELSE pred retry:fib/2-0 (det) c2;e;
+ E21: C13 5 COND pred retry:fib/2-0 (det) c2;e;e;c2;?;
mdb> retry 2
- 129: 48 3 CALL pred retry:fib/2-0 (det)
+ E18: C11 3 CALL pred retry:fib/2-0 (det)
mdb> print *
N (arg 1) 14
mdb> next
- 130: 48 3 ELSE pred retry:fib/2-0 (det) c2;e;
+ E22: C11 3 COND pred retry:fib/2-0 (det) c2;e;e;c2;?;
mdb> retry 1
- 125: 47 2 CALL pred retry:fib/2-0 (det)
-mdb> finish
- 129: 48 3 CALL pred retry:fib/2-0 (det)
- 133: 49 4 CALL pred retry:fib/2-0 (det)
- 137: 50 5 CALL pred retry:fib/2-0 (det)
- 141: 51 6 CALL pred retry:fib/2-0 (det)
- 145: 52 7 CALL pred retry:fib/2-0 (det)
- 149: 53 8 CALL pred retry:fib/2-0 (det)
- 153: 54 9 CALL pred retry:fib/2-0 (det)
- 157: 55 10 CALL pred retry:fib/2-0 (det)
- 161: 56 11 CALL pred retry:fib/2-0 (det)
- 165: 57 12 CALL pred retry:fib/2-0 (det)
- 169: 58 13 CALL pred retry:fib/2-0 (det)
- 173: 59 14 CALL pred retry:fib/2-0 (det)
- 177: 60 15 CALL pred retry:fib/2-0 (det)
- 181: 61 16 CALL pred retry:fib/2-0 (det)
- 185: 61 16 EXIT pred retry:fib/2-0 (det)
- 186: 62 16 CALL pred retry:fib/2-0 (det)
- 190: 62 16 EXIT pred retry:fib/2-0 (det)
- 191: 60 15 EXIT pred retry:fib/2-0 (det)
- 192: 63 15 CALL pred retry:fib/2-0 (det)
- 194: 63 15 EXIT pred retry:fib/2-0 (det)
- 195: 59 14 EXIT pred retry:fib/2-0 (det)
- 196: 64 14 CALL pred retry:fib/2-0 (det)
- 198: 64 14 EXIT pred retry:fib/2-0 (det)
- 199: 58 13 EXIT pred retry:fib/2-0 (det)
- 200: 65 13 CALL pred retry:fib/2-0 (det)
- 202: 65 13 EXIT pred retry:fib/2-0 (det)
- 203: 57 12 EXIT pred retry:fib/2-0 (det)
- 204: 66 12 CALL pred retry:fib/2-0 (det)
- 206: 66 12 EXIT pred retry:fib/2-0 (det)
- 207: 56 11 EXIT pred retry:fib/2-0 (det)
- 208: 67 11 CALL pred retry:fib/2-0 (det)
- 210: 67 11 EXIT pred retry:fib/2-0 (det)
- 211: 55 10 EXIT pred retry:fib/2-0 (det)
- 212: 68 10 CALL pred retry:fib/2-0 (det)
- 214: 68 10 EXIT pred retry:fib/2-0 (det)
- 215: 54 9 EXIT pred retry:fib/2-0 (det)
- 216: 69 9 CALL pred retry:fib/2-0 (det)
- 218: 69 9 EXIT pred retry:fib/2-0 (det)
- 219: 53 8 EXIT pred retry:fib/2-0 (det)
- 220: 70 8 CALL pred retry:fib/2-0 (det)
- 222: 70 8 EXIT pred retry:fib/2-0 (det)
- 223: 52 7 EXIT pred retry:fib/2-0 (det)
- 224: 71 7 CALL pred retry:fib/2-0 (det)
- 226: 71 7 EXIT pred retry:fib/2-0 (det)
- 227: 51 6 EXIT pred retry:fib/2-0 (det)
- 228: 72 6 CALL pred retry:fib/2-0 (det)
- 230: 72 6 EXIT pred retry:fib/2-0 (det)
- 231: 50 5 EXIT pred retry:fib/2-0 (det)
- 232: 73 5 CALL pred retry:fib/2-0 (det)
- 234: 73 5 EXIT pred retry:fib/2-0 (det)
- 235: 49 4 EXIT pred retry:fib/2-0 (det)
- 236: 74 4 CALL pred retry:fib/2-0 (det)
- 238: 74 4 EXIT pred retry:fib/2-0 (det)
- 239: 48 3 EXIT pred retry:fib/2-0 (det)
- 240: 75 3 CALL pred retry:fib/2-0 (det)
- 242: 75 3 EXIT pred retry:fib/2-0 (det)
- 243: 47 2 EXIT pred retry:fib/2-0 (det)
-mdb> continue -S
+ E17: C10 2 CALL pred retry:fib/2-0 (det)
+mdb> finish -n
+ E23: C10 2 EXIT pred retry:fib/2-0 (det)
+mdb> continue -n -S
987
Index: tests/debugger/retry.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/retry.inp,v
retrieving revision 1.1
diff -u -r1.1 retry.inp
--- tests/debugger/retry.inp 13 Oct 2000 04:06:40 -0000 1.1
+++ tests/debugger/retry.inp 11 Sep 2002 12:32:08 -0000
@@ -47,5 +47,5 @@
print *
next
retry 1
-finish
-continue -S
+finish -n
+continue -n -S
Index: tests/debugger/tabled_read_unitize.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/tabled_read_unitize.exp,v
retrieving revision 1.3
diff -u -r1.3 tabled_read_unitize.exp
--- tests/debugger/tabled_read_unitize.exp 11 Sep 2002 07:20:31 -0000 1.3
+++ tests/debugger/tabled_read_unitize.exp 11 Sep 2002 06:28:41 -0000
@@ -11,9 +11,7 @@
mdb> continue
E2: C2 2 CALL pred tabled_read_unitize:unitize/4-0 (det)
mdb> finish -a
- E3: C2 2 THEN pred tabled_read_unitize:unitize/4-0 (det) t;
- E4: C2 2 ELSE pred tabled_read_unitize:unitize/4-0 (det) t;c2;e;
- E5: C2 2 EXIT pred tabled_read_unitize:unitize/4-0 (det)
+ E3: C2 2 EXIT pred tabled_read_unitize:unitize/4-0 (det)
mdb> retry -f
E2: C2 2 CALL pred tabled_read_unitize:unitize/4-0 (det)
mdb> continue -S
cvs diff: Diffing tests/debugger/declarative
Index: tests/debugger/declarative/tabled_read_decl.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/tabled_read_decl.exp,v
retrieving revision 1.1
diff -u -r1.1 tabled_read_decl.exp
--- tests/debugger/declarative/tabled_read_decl.exp 15 May 2002 11:24:17 -0000 1.1
+++ tests/debugger/declarative/tabled_read_decl.exp 11 Sep 2002 12:24:15 -0000
@@ -9,9 +9,9 @@
mdb> break tabled_read_decl__test
0: + stop interface pred tabled_read_decl:test/4-0 (det)
mdb> continue
- 11: 4 3 CALL pred tabled_read_decl:test/4-0 (det)
+ 7: 4 3 CALL pred tabled_read_decl:test/4-0 (det)
mdb> finish -n
- 52: 4 3 EXIT pred tabled_read_decl:test/4-0 (det)
+ 32: 4 3 EXIT pred tabled_read_decl:test/4-0 (det)
mdb> print
test('<<c_pointer>>', 1123, '_', state('<<c_pointer>>'))
mdb> dd
@@ -50,7 +50,7 @@
read_char_code('<<c_pointer>>', 51)
read_char_code('<<c_pointer>>', 10)
Is this a bug? yes
- 52: 4 3 EXIT pred tabled_read_decl:test/4-0 (det)
+ 32: 4 3 EXIT pred tabled_read_decl:test/4-0 (det)
mdb> c -n -S
1123
1456
Index: tests/debugger/declarative/tabled_read_decl.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/tabled_read_decl.exp2,v
retrieving revision 1.1
diff -u -r1.1 tabled_read_decl.exp2
--- tests/debugger/declarative/tabled_read_decl.exp2 27 Jun 2002 12:30:21 -0000 1.1
+++ tests/debugger/declarative/tabled_read_decl.exp2 11 Sep 2002 19:29:07 -0000
@@ -9,9 +9,9 @@
mdb> break tabled_read_decl__test
0: + stop interface pred tabled_read_decl:test/4-0 (det)
mdb> continue
- 11: 4 3 CALL pred tabled_read_decl:test/4-0 (det)
+ 7: 4 3 CALL pred tabled_read_decl:test/4-0 (det)
mdb> finish -n
- 74: 4 3 EXIT pred tabled_read_decl:test/4-0 (det)
+ 54: 4 3 EXIT pred tabled_read_decl:test/4-0 (det)
mdb> print
test('<<c_pointer>>', 1123, '_', state('<<c_pointer>>'))
mdb> dd
@@ -50,7 +50,7 @@
read_char_code('<<c_pointer>>', 51)
read_char_code('<<c_pointer>>', 10)
Is this a bug? yes
- 74: 4 3 EXIT pred tabled_read_decl:test/4-0 (det)
+ 54: 4 3 EXIT pred tabled_read_decl:test/4-0 (det)
mdb> c -n -S
1123
1456
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/recompilation
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
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
post: mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------
More information about the reviews
mailing list