[m-dev.] for review: line numbers in the debugger

Zoltan Somogyi zs at cs.mu.OZ.AU
Wed Nov 10 15:50:37 AEDT 1999


Here are the diffs for the tests; mostly quite boring.

I will produce diffs for the .exp2 files after Fergus commits his outstanding
change for using --trace minimum in the library.

Zoltan.

cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
Index: tests/debugger/breakpoints.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/breakpoints.exp,v
retrieving revision 1.1
diff -u -b -r1.1 breakpoints.exp
--- breakpoints.exp	1999/10/07 09:31:29	1.1
+++ breakpoints.exp	1999/11/09 13:43:37
@@ -1,11 +1,11 @@
-       1:      1  1 CALL pred breakpoints:main/2-0 (cc_multi) 
+       1:      1  1 CALL pred breakpoints:main/2-0 (cc_multi) breakpoints.m:17
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
 mdb> break data
  0: + stop  interface pred breakpoints:data/1-0 (det)
 mdb> continue
-       2:      2  2 CALL pred breakpoints:data/1-0 (det) 
+       2:      2  2 CALL pred breakpoints:data/1-0 (det) breakpoints.m:39 (breakpoints.m:15)
 mdb> disable 0
  0: - stop  interface pred breakpoints:data/1-0 (det)
 mdb> break info
@@ -36,20 +36,20 @@
 mdb> break nodiag
  0: + stop  interface pred breakpoints:nodiag/3-0 (semidet)
 mdb> continue
-       5:      4  3 CALL pred breakpoints:qperm/2-0 (nondet) 
+       5:      4  3 CALL pred breakpoints:qperm/2-0 (nondet) breakpoints.m:45 (breakpoints.m:42)
 mdb> continue
-       6:      4  3 SWTC pred breakpoints:qperm/2-0 (nondet) s1;
+       6:      4  3 SWTC pred breakpoints:qperm/2-0 (nondet) s1; breakpoints.m:47
 mdb> finish -N
-      10:      6  4 CALL pred breakpoints:qperm/2-0 (nondet) 
+      10:      6  4 CALL pred breakpoints:qperm/2-0 (nondet) breakpoints.m:45 (breakpoints.m:49)
 mdb> finish -n
-      36:      6  4 EXIT pred breakpoints:qperm/2-0 (nondet) 
+      36:      6  4 EXIT pred breakpoints:qperm/2-0 (nondet) breakpoints.m:45 (breakpoints.m:49)
 mdb> continue
-      37:      4  3 EXIT pred breakpoints:qperm/2-0 (nondet) 
+      37:      4  3 EXIT pred breakpoints:qperm/2-0 (nondet) breakpoints.m:45 (breakpoints.m:42)
 mdb> continue
-      38:     15  3 CALL pred breakpoints:safe/1-0 (semidet) 
+      38:     15  3 CALL pred breakpoints:safe/1-0 (semidet) breakpoints.m:55 (breakpoints.m:43)
 mdb> finish
-      40:     16  4 CALL pred breakpoints:nodiag/3-0 (semidet) 
-      44:     15  3 FAIL pred breakpoints:safe/1-0 (semidet) 
+      40:     16  4 CALL pred breakpoints:nodiag/3-0 (semidet) breakpoints.m:60 (breakpoints.m:57)
+      44:     15  3 FAIL pred breakpoints:safe/1-0 (semidet) breakpoints.m:55
 mdb> delete *
  0: E stop  interface pred breakpoints:nodiag/3-0 (semidet)
  1: E stop  interface pred breakpoints:qperm/2-0 (nondet)
Index: tests/debugger/browser_test.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/browser_test.exp,v
retrieving revision 1.3
diff -u -b -r1.3 browser_test.exp
--- browser_test.exp	1999/06/30 15:50:59	1.3
+++ browser_test.exp	1999/11/09 13:43:51
@@ -1,8 +1,8 @@
-       1:      1  1 CALL pred browser_test:main/2-0 (det) 
+       1:      1  1 CALL pred browser_test:main/2-0 (det) browser_test.m:12
 mdb> echo on
 Command echo enabled.
 mdb> goto 3
-       3:      2  2 EXIT pred browser_test:big_data/1-0 (det) 
+       3:      2  2 EXIT pred browser_test:big_data/1-0 (det) browser_test.m:19 (browser_test.m:12)
 mdb> print *
        HeadVar__1             	big(big(big(small, 1, small), 2, small), 3, big(big(small, 4, big/3), 6, small))
 mdb> browse 1
@@ -80,8 +80,8 @@
 
 browser> quit
 mdb> retry
-       2:      2  2 CALL pred browser_test:big_data/1-0 (det) 
+       2:      2  2 CALL pred browser_test:big_data/1-0 (det) browser_test.m:19 (browser_test.m:12)
 mdb> continue -a
-       3:      2  2 EXIT pred browser_test:big_data/1-0 (det) 
+       3:      2  2 EXIT pred browser_test:big_data/1-0 (det) browser_test.m:19 (browser_test.m:12)
 big(big(big(small, 1, small), 2, small), 3, big(big(small, 4, big(small, 5, small)), 6, small)).
-       4:      1  1 EXIT pred browser_test:main/2-0 (det) 
+       4:      1  1 EXIT pred browser_test:main/2-0 (det) browser_test.m:14
Index: tests/debugger/debugger_regs.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/debugger_regs.exp,v
retrieving revision 1.9
diff -u -b -r1.9 debugger_regs.exp
--- debugger_regs.exp	1999/07/23 04:23:55	1.9
+++ debugger_regs.exp	1999/11/09 13:44:07
@@ -1,10 +1,10 @@
-       1:      1  1 CALL pred debugger_regs:main/2-0 (det) 
+       1:      1  1 CALL pred debugger_regs:main/2-0 (det) debugger_regs.m:32
 mdb> echo on
 Command echo enabled.
 mdb> 
-       2:      2  2 CALL pred debugger_regs:data/41-0 (det) 
+       2:      2  2 CALL pred debugger_regs:data/41-0 (det) debugger_regs.m:88 (debugger_regs.m:28)
 mdb> 
-       3:      2  2 EXIT pred debugger_regs:data/41-0 (det) 
+       3:      2  2 EXIT pred debugger_regs:data/41-0 (det) debugger_regs.m:88 (debugger_regs.m:28)
 mdb> print NoSuchVar
 mdb: there is no such variable.
 mdb> print *
Index: tests/debugger/existential_type_classes.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/existential_type_classes.exp,v
retrieving revision 1.7
diff -u -b -r1.7 existential_type_classes.exp
--- existential_type_classes.exp	1999/05/27 01:01:27	1.7
+++ existential_type_classes.exp	1999/11/10 03:56:52
@@ -1,142 +1,201 @@
-       1:      1  1 CALL pred existential_type_classes:main/2-0 (det) 
+       1:      1  1 CALL pred existential_type_classes:main/2-0 (det) existential_type_classes.m:57
 mdb> echo on
 Command echo enabled.
 mdb> alias P print *
 P      =>    print *
 mdb> register --quiet
+mdb> context prevline
+Contexts will be printed on the previous line.
 mdb> break -i do_foo
  0: + stop  interface pred existential_type_classes:do_foo/2-0 (det)
 mdb> continue -a
-       2:      2  2 CALL pred existential_type_classes:do_foo/2-0 (det) 
+       2:      2  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:51)
+                         pred existential_type_classes:do_foo/2-0 (det)
 mdb> P
        HeadVar__1             	42
 mdb> 
-       3:      3  3 CALL pred existential_type_classes:foo/2-0 (det) 
+       3:      3  3 CALL (from existential_type_classes.m:68)
+                         pred existential_type_classes:foo/2-0 (det)
 mdb> P
        HeadVar__1             	42
 mdb> 
-       4:      4  4 CALL pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det) 
+       4:      4  4 CALL existential_type_classes.m:21
+                         pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	42
 mdb> continue -a
-       5:      5  5 CALL pred existential_type_classes:int_foo/2-0 (det) 
-       6:      5  5 EXIT pred existential_type_classes:int_foo/2-0 (det) 
-       7:      4  4 EXIT pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det) 
-       8:      3  3 EXIT pred existential_type_classes:foo/2-0 (det) 
-       9:      2  2 EXIT pred existential_type_classes:do_foo/2-0 (det) 
+       5:      5  5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
+                         pred existential_type_classes:int_foo/2-0 (det)
+       6:      5  5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
+                         pred existential_type_classes:int_foo/2-0 (det)
+       7:      4  4 EXIT existential_type_classes.m:21
+                         pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det)
+       8:      3  3 EXIT (from existential_type_classes.m:68)
+                         pred existential_type_classes:foo/2-0 (det)
+       9:      2  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:51)
+                         pred existential_type_classes:do_foo/2-0 (det)
 mdb> P
        HeadVar__1             	42
        HeadVar__2             	84
 mdb> continue -a
-      10:      6  2 CALL pred existential_type_classes:do_foo/2-0 (det) 
+      10:      6  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:52)
+                         pred existential_type_classes:do_foo/2-0 (det)
 mdb> P
        HeadVar__1             	"blah"
 mdb> 
-      11:      7  3 CALL pred existential_type_classes:foo/2-0 (det) 
+      11:      7  3 CALL (from existential_type_classes.m:68)
+                         pred existential_type_classes:foo/2-0 (det)
 mdb> P
        HeadVar__1             	"blah"
 mdb> 
-      12:      8  4 CALL pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__string__arity0______existential_type_classes__foo_2/2-0 (det) 
+      12:      8  4 CALL existential_type_classes.m:25
+                         pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__string__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	"blah"
 mdb> continue -a
-      13:      9  5 CALL pred existential_type_classes:string_foo/2-0 (det) 
-      14:      9  5 EXIT pred existential_type_classes:string_foo/2-0 (det) 
-      15:      8  4 EXIT pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__string__arity0______existential_type_classes__foo_2/2-0 (det) 
-      16:      7  3 EXIT pred existential_type_classes:foo/2-0 (det) 
-      17:      6  2 EXIT pred existential_type_classes:do_foo/2-0 (det) 
+      13:      9  5 CALL existential_type_classes.m:47 (from existential_type_classes.m:25)
+                         pred existential_type_classes:string_foo/2-0 (det)
+      14:      9  5 EXIT existential_type_classes.m:47 (from existential_type_classes.m:25)
+                         pred existential_type_classes:string_foo/2-0 (det)
+      15:      8  4 EXIT existential_type_classes.m:25
+                         pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__string__arity0______existential_type_classes__foo_2/2-0 (det)
+      16:      7  3 EXIT (from existential_type_classes.m:68)
+                         pred existential_type_classes:foo/2-0 (det)
+      17:      6  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:52)
+                         pred existential_type_classes:do_foo/2-0 (det)
 mdb> P
        HeadVar__1             	"blah"
        HeadVar__2             	4
 mdb> continue -a
-      18:     10  2 CALL func existential_type_classes:my_exist_t/1-0 (det) 
-      19:     10  2 EXIT func existential_type_classes:my_exist_t/1-0 (det) 
-      20:     11  2 CALL pred existential_type_classes:do_foo/2-0 (det) 
+      18:     10  2 CALL existential_type_classes.m:74 (from existential_type_classes.m:53)
+                         func existential_type_classes:my_exist_t/1-0 (det)
+      19:     10  2 EXIT existential_type_classes.m:74 (from existential_type_classes.m:53)
+                         func existential_type_classes:my_exist_t/1-0 (det)
+      20:     11  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:53)
+                         pred existential_type_classes:do_foo/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> 
-      21:     12  3 CALL pred existential_type_classes:foo/2-0 (det) 
+      21:     12  3 CALL (from existential_type_classes.m:68)
+                         pred existential_type_classes:foo/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> 
-      22:     13  4 CALL pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det) 
+      22:     13  4 CALL existential_type_classes.m:21
+                         pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> continue -a
-      23:     14  5 CALL pred existential_type_classes:int_foo/2-0 (det) 
-      24:     14  5 EXIT pred existential_type_classes:int_foo/2-0 (det) 
-      25:     13  4 EXIT pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det) 
-      26:     12  3 EXIT pred existential_type_classes:foo/2-0 (det) 
-      27:     11  2 EXIT pred existential_type_classes:do_foo/2-0 (det) 
+      23:     14  5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
+                         pred existential_type_classes:int_foo/2-0 (det)
+      24:     14  5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
+                         pred existential_type_classes:int_foo/2-0 (det)
+      25:     13  4 EXIT existential_type_classes.m:21
+                         pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det)
+      26:     12  3 EXIT (from existential_type_classes.m:68)
+                         pred existential_type_classes:foo/2-0 (det)
+      27:     11  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:53)
+                         pred existential_type_classes:do_foo/2-0 (det)
 mdb> P
        HeadVar__1             	43
        HeadVar__2             	86
 mdb> continue -a
-      28:     15  2 CALL func existential_type_classes:call_my_exist_t/1-0 (det) 
-      29:     16  3 CALL func existential_type_classes:my_exist_t/1-0 (det) 
-      30:     16  3 EXIT func existential_type_classes:my_exist_t/1-0 (det) 
-      31:     15  2 EXIT func existential_type_classes:call_my_exist_t/1-0 (det) 
-      32:     17  2 CALL pred existential_type_classes:do_foo/2-0 (det) 
+      28:     15  2 CALL existential_type_classes.m:70 (from existential_type_classes.m:54)
+                         func existential_type_classes:call_my_exist_t/1-0 (det)
+      29:     16  3 CALL existential_type_classes.m:74 (from existential_type_classes.m:70)
+                         func existential_type_classes:my_exist_t/1-0 (det)
+      30:     16  3 EXIT existential_type_classes.m:74 (from existential_type_classes.m:70)
+                         func existential_type_classes:my_exist_t/1-0 (det)
+      31:     15  2 EXIT existential_type_classes.m:70 (from existential_type_classes.m:54)
+                         func existential_type_classes:call_my_exist_t/1-0 (det)
+      32:     17  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:54)
+                         pred existential_type_classes:do_foo/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> 
-      33:     18  3 CALL pred existential_type_classes:foo/2-0 (det) 
+      33:     18  3 CALL (from existential_type_classes.m:68)
+                         pred existential_type_classes:foo/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> 
-      34:     19  4 CALL pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det) 
+      34:     19  4 CALL existential_type_classes.m:21
+                         pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> continue -a
-      35:     20  5 CALL pred existential_type_classes:int_foo/2-0 (det) 
-      36:     20  5 EXIT pred existential_type_classes:int_foo/2-0 (det) 
-      37:     19  4 EXIT pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det) 
-      38:     18  3 EXIT pred existential_type_classes:foo/2-0 (det) 
-      39:     17  2 EXIT pred existential_type_classes:do_foo/2-0 (det) 
+      35:     20  5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
+                         pred existential_type_classes:int_foo/2-0 (det)
+      36:     20  5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
+                         pred existential_type_classes:int_foo/2-0 (det)
+      37:     19  4 EXIT existential_type_classes.m:21
+                         pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det)
+      38:     18  3 EXIT (from existential_type_classes.m:68)
+                         pred existential_type_classes:foo/2-0 (det)
+      39:     17  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:54)
+                         pred existential_type_classes:do_foo/2-0 (det)
 mdb> P
        HeadVar__1             	43
        HeadVar__2             	86
 mdb> continue -a
-      40:     21  2 CALL func existential_type_classes:my_univ/2-0 (det) 
-      41:     21  2 EXIT func existential_type_classes:my_univ/2-0 (det) 
-      42:     22  2 CALL func existential_type_classes:my_univ_value/2-0 (det) 
-      43:     22  2 EXIT func existential_type_classes:my_univ_value/2-0 (det) 
-      44:     23  2 CALL pred existential_type_classes:do_foo/2-0 (det) 
+      40:     21  2 CALL existential_type_classes.m:82 (from existential_type_classes.m:55)
+                         func existential_type_classes:my_univ/2-0 (det)
+      41:     21  2 EXIT existential_type_classes.m:82 (from existential_type_classes.m:55)
+                         func existential_type_classes:my_univ/2-0 (det)
+      42:     22  2 CALL existential_type_classes.m:76 (from existential_type_classes.m:55)
+                         func existential_type_classes:my_univ_value/2-0 (det)
+      43:     22  2 EXIT existential_type_classes.m:76 (from existential_type_classes.m:55)
+                         func existential_type_classes:my_univ_value/2-0 (det)
+      44:     23  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:55)
+                         pred existential_type_classes:do_foo/2-0 (det)
 mdb> P
        HeadVar__1             	45
 mdb> 
-      45:     24  3 CALL pred existential_type_classes:foo/2-0 (det) 
+      45:     24  3 CALL (from existential_type_classes.m:68)
+                         pred existential_type_classes:foo/2-0 (det)
 mdb> P
        HeadVar__1             	45
 mdb> 
-      46:     25  4 CALL pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det) 
+      46:     25  4 CALL existential_type_classes.m:21
+                         pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	45
 mdb> continue -a
-      47:     26  5 CALL pred existential_type_classes:int_foo/2-0 (det) 
-      48:     26  5 EXIT pred existential_type_classes:int_foo/2-0 (det) 
-      49:     25  4 EXIT pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det) 
-      50:     24  3 EXIT pred existential_type_classes:foo/2-0 (det) 
-      51:     23  2 EXIT pred existential_type_classes:do_foo/2-0 (det) 
+      47:     26  5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
+                         pred existential_type_classes:int_foo/2-0 (det)
+      48:     26  5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
+                         pred existential_type_classes:int_foo/2-0 (det)
+      49:     25  4 EXIT existential_type_classes.m:21
+                         pred existential_type_classes:Introduced_pred_for_existential_type_classes__fooable__int__arity0______existential_type_classes__foo_2/2-0 (det)
+      50:     24  3 EXIT (from existential_type_classes.m:68)
+                         pred existential_type_classes:foo/2-0 (det)
+      51:     23  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:55)
+                         pred existential_type_classes:do_foo/2-0 (det)
 mdb> P
        HeadVar__1             	45
        HeadVar__2             	90
 mdb> 
-      52:     27  2 CALL func existential_type_classes:my_univ/2-0 (det) 
+      52:     27  2 CALL existential_type_classes.m:82 (from existential_type_classes.m:56)
+                         func existential_type_classes:my_univ/2-0 (det)
 mdb> 
-      53:     27  2 EXIT func existential_type_classes:my_univ/2-0 (det) 
+      53:     27  2 EXIT existential_type_classes.m:82 (from existential_type_classes.m:56)
+                         func existential_type_classes:my_univ/2-0 (det)
 mdb> 
-      54:     28  2 CALL func existential_type_classes:call_my_univ_value/2-0 (det) 
+      54:     28  2 CALL existential_type_classes.m:72 (from existential_type_classes.m:56)
+                         func existential_type_classes:call_my_univ_value/2-0 (det)
 mdb> P
        HeadVar__1             	my_univ('<<c_pointer>>')
 mdb> 
-      55:     29  3 CALL func existential_type_classes:my_univ_value/2-0 (det) 
+      55:     29  3 CALL existential_type_classes.m:76 (from existential_type_classes.m:72)
+                         func existential_type_classes:my_univ_value/2-0 (det)
 mdb> P
        Univ                   	my_univ('<<c_pointer>>')
 mdb> continue -a
-      56:     29  3 EXIT func existential_type_classes:my_univ_value/2-0 (det) 
-      57:     28  2 EXIT func existential_type_classes:call_my_univ_value/2-0 (det) 
-      58:     30  2 CALL pred existential_type_classes:do_foo/2-0 (det) 
+      56:     29  3 EXIT existential_type_classes.m:76 (from existential_type_classes.m:72)
+                         func existential_type_classes:my_univ_value/2-0 (det)
+      57:     28  2 EXIT existential_type_classes.m:72 (from existential_type_classes.m:56)
+                         func existential_type_classes:call_my_univ_value/2-0 (det)
+      58:     30  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:56)
+                         pred existential_type_classes:do_foo/2-0 (det)
 mdb> P
        HeadVar__1             	"something"
 mdb> continue -S
Index: tests/debugger/existential_type_classes.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/existential_type_classes.inp,v
retrieving revision 1.2
diff -u -b -r1.2 existential_type_classes.inp
--- existential_type_classes.inp	1998/10/29 10:14:05	1.2
+++ existential_type_classes.inp	1999/11/10 03:56:51
@@ -1,6 +1,7 @@
 echo on
 alias P print *
 register --quiet
+context prevline
 break -i do_foo
 continue -a
 P
Index: tests/debugger/implied_instance.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/implied_instance.exp,v
retrieving revision 1.5
diff -u -b -r1.5 implied_instance.exp
--- implied_instance.exp	1999/05/27 01:01:27	1.5
+++ implied_instance.exp	1999/11/10 03:55:24
@@ -1,7 +1,9 @@
-       1:      1  1 CALL pred implied_instance:main/2-0 (det) 
+       1:      1  1 CALL pred implied_instance:main/2-0 (det) implied_instance.m:26
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
+mdb> context none
+Contexts will not be printed.
 mdb> alias P print *
 P      =>    print *
 mdb> goto 2
Index: tests/debugger/implied_instance.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/implied_instance.inp,v
retrieving revision 1.1
diff -u -b -r1.1 implied_instance.inp
--- implied_instance.inp	1998/10/23 00:41:46	1.1
+++ implied_instance.inp	1999/11/10 03:55:21
@@ -1,5 +1,6 @@
 echo on
 register --quiet
+context none
 alias P print *
 goto 2
 P
Index: tests/debugger/interpreter.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/interpreter.exp,v
retrieving revision 1.10
diff -u -b -r1.10 interpreter.exp
--- interpreter.exp	1999/06/30 15:50:59	1.10
+++ interpreter.exp	1999/11/10 03:07:04
@@ -1,6 +1,8 @@
-       1:      1  1 CALL pred interpreter:main/2-0 (det) 
+       1:      1  1 CALL pred interpreter:main/2-0 (det) interpreter.m:35
 mdb> echo on
 Command echo enabled.
+mdb> context none
+Contexts will not be printed.
 mdb> register --quiet
 mdb> 10 step
 Pure Prolog Interpreter.
Index: tests/debugger/interpreter.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/interpreter.inp,v
retrieving revision 1.4
diff -u -b -r1.4 interpreter.inp
--- interpreter.inp	1999/04/08 16:03:53	1.4
+++ interpreter.inp	1999/11/10 03:06:45
@@ -1,4 +1,5 @@
 echo on
+context none
 register --quiet
 10 step
 vars
Index: tests/debugger/mdb_command_test.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/mdb_command_test.inp,v
retrieving revision 1.6
diff -u -b -r1.6 mdb_command_test.inp
--- mdb_command_test.inp	1999/10/07 09:31:31	1.6
+++ mdb_command_test.inp	1999/11/09 13:34:40
@@ -29,6 +29,7 @@
 printlevel           xyzzy xyzzy xyzzy xyzzy xyzzy
 echo                 xyzzy xyzzy xyzzy xyzzy xyzzy
 scroll               xyzzy xyzzy xyzzy xyzzy xyzzy
+context              xyzzy xyzzy xyzzy xyzzy xyzzy
 unalias              xyzzy xyzzy xyzzy xyzzy xyzzy
 histogram_all        xyzzy xyzzy xyzzy xyzzy xyzzy
 histogram_exp        xyzzy xyzzy xyzzy xyzzy xyzzy
Index: tests/debugger/multi_parameter.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/multi_parameter.exp,v
retrieving revision 1.6
diff -u -b -r1.6 multi_parameter.exp
--- multi_parameter.exp	1999/05/27 01:01:27	1.6
+++ multi_parameter.exp	1999/11/10 03:47:12
@@ -1,36 +1,45 @@
-       1:      1  1 CALL pred multi_parameter:main/2-0 (det) 
+       1:      1  1 CALL pred multi_parameter:main/2-0 (det) multi_parameter.m:24
 mdb> echo on
 Command echo enabled.
+mdb> context nextline
+Contexts will be printed on the next line.
 mdb> 
        2:      2  2 CALL pred multi_parameter:foo/2-0 (det) 
+                         multi_parameter.m:32 (from multi_parameter.m:24)
 mdb> print *
        HeadVar__1             	'z'
 mdb> 
        3:      3  3 CALL pred multi_parameter:a/2-0 (det) 
+                         (from multi_parameter.m:32)
 mdb> print *
        HeadVar__1             	'z'
 mdb> 
        4:      4  4 CALL pred multi_parameter:Introduced_pred_for_multi_parameter__m__character__arity0__int__arity0______multi_parameter__a_2/2-0 (det) 
+                         multi_parameter.m:20
 mdb> print *
        HeadVar__1             	'z'
 mdb> 
        5:      4  4 EXIT pred multi_parameter:Introduced_pred_for_multi_parameter__m__character__arity0__int__arity0______multi_parameter__a_2/2-0 (det) 
+                         multi_parameter.m:20
 mdb> print *
        HeadVar__1             	'z'
        HeadVar__2             	122
 mdb> 
        6:      3  3 EXIT pred multi_parameter:a/2-0 (det) 
+                         (from multi_parameter.m:32)
 mdb> print *
        HeadVar__1             	'z'
        HeadVar__2             	122
 mdb> 
        7:      2  2 EXIT pred multi_parameter:foo/2-0 (det) 
+                         multi_parameter.m:32 (from multi_parameter.m:24)
 mdb> print *
        HeadVar__1             	'z'
        HeadVar__2             	122
 mdb> 
 122
        8:      1  1 EXIT pred multi_parameter:main/2-0 (det) 
+                         multi_parameter.m:26
 mdb> print *
        HeadVar__2             	state('<<c_pointer>>')
 mdb> continue -S
Index: tests/debugger/multi_parameter.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/multi_parameter.inp,v
retrieving revision 1.1
diff -u -b -r1.1 multi_parameter.inp
--- multi_parameter.inp	1998/10/23 00:41:47	1.1
+++ multi_parameter.inp	1999/11/10 03:07:58
@@ -1,4 +1,5 @@
 echo on
+context nextline
 
 print *
 
Index: tests/debugger/queens.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/queens.exp,v
retrieving revision 1.15
diff -u -b -r1.15 queens.exp
--- queens.exp	1999/08/16 05:48:44	1.15
+++ queens.exp	1999/11/10 03:48:41
@@ -1,50 +1,75 @@
-       1:      1  1 CALL pred queens:main/2-0 (cc_multi) 
+       1:      1  1 CALL pred queens:main/2-0 (cc_multi) queens.m:17
 mdb> echo on
 Command echo enabled.
 mdb> print *
        HeadVar__1             	state('<<c_pointer>>')
 mdb> 
-       2:      2  2 CALL pred queens:data/1-0 (det) 
+       2:      2  2 CALL pred queens:data/1-0 (det) queens.m:39 (queens.m:15)
 mdb> print *
 mdb: there are no live variables.
 mdb> 
-       3:      2  2 EXIT pred queens:data/1-0 (det) 
+       3:      2  2 EXIT pred queens:data/1-0 (det) queens.m:39 (queens.m:15)
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> 
-       4:      3  2 CALL pred queens:queen/2-0 (nondet) 
+       4:      3  2 CALL pred queens:queen/2-0 (nondet) queens.m:42 (queens.m:15)
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> 
-       5:      4  3 CALL pred queens:qperm/2-0 (nondet) 
+       5:      4  3 CALL pred queens:qperm/2-0 (nondet) queens.m:45 (queens.m:42)
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> 
-       6:      4  3 SWTC pred queens:qperm/2-0 (nondet) s1;
+       6:      4  3 SWTC pred queens:qperm/2-0 (nondet) s1; queens.m:47
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> 
-       7:      5  4 CALL pred queens:qdelete/3-0 (nondet) 
+       7:      5  4 CALL pred queens:qdelete/3-0 (nondet) queens.m:51 (queens.m:47)
 mdb> print *
        HeadVar__2             	[1, 2, 3, 4, 5]
 mdb> 
-       8:      5  4 DISJ pred queens:qdelete/3-0 (nondet) c2;d1;
+       8:      5  4 DISJ pred queens:qdelete/3-0 (nondet) c2;d1; queens.m:51
 mdb> print *
        HeadVar__2             	[1, 2, 3, 4, 5]
 mdb> level 1
+Ancestor level set to 1:
+   1  pred queens:qperm/2-0 (nondet) queens.m:47
+mdb> level -d 1
+Ancestor level set to 1:
+   1       5       4    3  pred queens:qperm/2-0 (nondet) queens.m:47
+mdb> context nextline
+Contexts will be printed on the next line.
+mdb> level 1
+Ancestor level set to 1:
+   1  pred queens:qperm/2-0 (nondet)
+      queens.m:47
+mdb> level -d 1
+Ancestor level set to 1:
    1       5       4    3 pred queens:qperm/2-0 (nondet) 
-Ancestor level set to 1.
+                           queens.m:47
+mdb> context prevline
+Contexts will be printed on the previous line.
+mdb> level 1
+Ancestor level set to 1:
+   1  queens.m:47
+      pred queens:qperm/2-0 (nondet)
+mdb> level -d 1
+Ancestor level set to 1:
+   1       5       4    3  queens.m:47
+                           pred queens:qperm/2-0 (nondet)
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> up 1
-   2       4       3    2 pred queens:queen/2-0 (nondet) 
-Ancestor level set to 2.
+Ancestor level set to 2:
+   2  queens.m:42
+      pred queens:queen/2-0 (nondet)
 mdb> vars
         1 HeadVar__1
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> 
-       9:      5  4 EXIT pred queens:qdelete/3-0 (nondet) 
+       9:      5  4 EXIT queens.m:51 (from queens.m:47)
+                         pred queens:qdelete/3-0 (nondet)
 mdb> print HeadVar__1
        HeadVar__1             	1
 mdb> print HeadVar__2
@@ -52,94 +77,140 @@
 mdb> print HeadVar__3
        HeadVar__3             	[2, 3, 4, 5]
 mdb> 
-      10:      6  4 CALL pred queens:qperm/2-0 (nondet) 
+      10:      6  4 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
 mdb> print *
        HeadVar__1             	[2, 3, 4, 5]
 mdb> 
-      11:      6  4 SWTC pred queens:qperm/2-0 (nondet) s1;
+      11:      6  4 SWTC queens.m:47
+                         pred queens:qperm/2-0 (nondet) s1;
 mdb> print *
        HeadVar__1             	[2, 3, 4, 5]
 mdb> 
-      12:      7  5 CALL pred queens:qdelete/3-0 (nondet) 
+      12:      7  5 CALL queens.m:51 (from queens.m:47)
+                         pred queens:qdelete/3-0 (nondet)
 mdb> print *
        HeadVar__2             	[2, 3, 4, 5]
 mdb> 
-      13:      7  5 DISJ pred queens:qdelete/3-0 (nondet) c2;d1;
+      13:      7  5 DISJ queens.m:51
+                         pred queens:qdelete/3-0 (nondet) c2;d1;
 mdb> print *
        HeadVar__2             	[2, 3, 4, 5]
 mdb> 
-      14:      7  5 EXIT pred queens:qdelete/3-0 (nondet) 
+      14:      7  5 EXIT queens.m:51 (from queens.m:47)
+                         pred queens:qdelete/3-0 (nondet)
 mdb> print *
        HeadVar__1             	2
        HeadVar__2             	[2, 3, 4, 5]
        HeadVar__3             	[3, 4, 5]
 mdb> 
-      15:      8  5 CALL pred queens:qperm/2-0 (nondet) 
+      15:      8  5 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
 mdb> goto -a 20
-      16:      8  5 SWTC pred queens:qperm/2-0 (nondet) s1;
-      17:      9  6 CALL pred queens:qdelete/3-0 (nondet) 
-      18:      9  6 DISJ pred queens:qdelete/3-0 (nondet) c2;d1;
-      19:      9  6 EXIT pred queens:qdelete/3-0 (nondet) 
-      20:     10  6 CALL pred queens:qperm/2-0 (nondet) 
+      16:      8  5 SWTC queens.m:47
+                         pred queens:qperm/2-0 (nondet) s1;
+      17:      9  6 CALL queens.m:51 (from queens.m:47)
+                         pred queens:qdelete/3-0 (nondet)
+      18:      9  6 DISJ queens.m:51
+                         pred queens:qdelete/3-0 (nondet) c2;d1;
+      19:      9  6 EXIT queens.m:51 (from queens.m:47)
+                         pred queens:qdelete/3-0 (nondet)
+      20:     10  6 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
 mdb> stack
-   0    4* pred queens:qperm/2-0 (nondet)
-   4       pred queens:queen/2-0 (nondet)
-   5       pred queens:main/2-0 (cc_multi)
+   0    4* pred queens:qperm/2-0 (nondet) (queens.m:45 and others)
+   4       pred queens:queen/2-0 (nondet) (queens.m:42)
+   5       pred queens:main/2-0 (cc_multi) (queens.m:15)
 mdb> stack -d
-   0      20      10    6 pred queens:qperm/2-0 (nondet)
-   1      15       8    5 pred queens:qperm/2-0 (nondet)
-   2      10       6    4 pred queens:qperm/2-0 (nondet)
-   3       5       4    3 pred queens:qperm/2-0 (nondet)
-   4       4       3    2 pred queens:queen/2-0 (nondet)
-   5       1       1    1 pred queens:main/2-0 (cc_multi)
+   0      20      10    6 pred queens:qperm/2-0 (nondet) (queens.m:45)
+   1      15       8    5 pred queens:qperm/2-0 (nondet) (queens.m:49)
+   2      10       6    4 pred queens:qperm/2-0 (nondet) (queens.m:49)
+   3       5       4    3 pred queens:qperm/2-0 (nondet) (queens.m:49)
+   4       4       3    2 pred queens:queen/2-0 (nondet) (queens.m:42)
+   5       1       1    1 pred queens:main/2-0 (cc_multi) (queens.m:15)
 mdb> print *
        HeadVar__1             	[4, 5]
 mdb> 
-      21:     10  6 SWTC pred queens:qperm/2-0 (nondet) s1;
+      21:     10  6 SWTC queens.m:47
+                         pred queens:qperm/2-0 (nondet) s1;
 mdb> retry
-      34:     10  6 EXIT pred queens:qperm/2-0 (nondet) 
-      20:     10  6 CALL pred queens:qperm/2-0 (nondet) 
+      34:     10  6 EXIT queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      20:     10  6 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
 mdb> print *
        HeadVar__1             	[4, 5]
 mdb> finish -a
-      21:     10  6 SWTC pred queens:qperm/2-0 (nondet) s1;
-      22:     11  7 CALL pred queens:qdelete/3-0 (nondet) 
-      23:     11  7 DISJ pred queens:qdelete/3-0 (nondet) c2;d1;
-      24:     11  7 EXIT pred queens:qdelete/3-0 (nondet) 
-      25:     12  7 CALL pred queens:qperm/2-0 (nondet) 
-      26:     12  7 SWTC pred queens:qperm/2-0 (nondet) s1;
-      27:     13  8 CALL pred queens:qdelete/3-0 (nondet) 
-      28:     13  8 DISJ pred queens:qdelete/3-0 (nondet) c2;d1;
-      29:     13  8 EXIT pred queens:qdelete/3-0 (nondet) 
-      30:     14  8 CALL pred queens:qperm/2-0 (nondet) 
-      31:     14  8 SWTC pred queens:qperm/2-0 (nondet) s2;
-      32:     14  8 EXIT pred queens:qperm/2-0 (nondet) 
-      33:     12  7 EXIT pred queens:qperm/2-0 (nondet) 
-      34:     10  6 EXIT pred queens:qperm/2-0 (nondet) 
+      21:     10  6 SWTC queens.m:47
+                         pred queens:qperm/2-0 (nondet) s1;
+      22:     11  7 CALL queens.m:51 (from queens.m:47)
+                         pred queens:qdelete/3-0 (nondet)
+      23:     11  7 DISJ queens.m:51
+                         pred queens:qdelete/3-0 (nondet) c2;d1;
+      24:     11  7 EXIT queens.m:51 (from queens.m:47)
+                         pred queens:qdelete/3-0 (nondet)
+      25:     12  7 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      26:     12  7 SWTC queens.m:47
+                         pred queens:qperm/2-0 (nondet) s1;
+      27:     13  8 CALL queens.m:51 (from queens.m:47)
+                         pred queens:qdelete/3-0 (nondet)
+      28:     13  8 DISJ queens.m:51
+                         pred queens:qdelete/3-0 (nondet) c2;d1;
+      29:     13  8 EXIT queens.m:51 (from queens.m:47)
+                         pred queens:qdelete/3-0 (nondet)
+      30:     14  8 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      31:     14  8 SWTC queens.m:45
+                         pred queens:qperm/2-0 (nondet) s2;
+      32:     14  8 EXIT queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      33:     12  7 EXIT queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      34:     10  6 EXIT queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
 mdb> register --quiet
 mdb> break print_list
  0: + stop  interface pred queens:print_list/3-0 (det)
 mdb> break qdelete
  1: + stop  interface pred queens:qdelete/3-0 (nondet)
 mdb> continue -a
-      35:      8  5 EXIT pred queens:qperm/2-0 (nondet) 
-      36:      6  4 EXIT pred queens:qperm/2-0 (nondet) 
-      37:      4  3 EXIT pred queens:qperm/2-0 (nondet) 
-      38:     15  3 CALL pred queens:safe/1-0 (semidet) 
-      39:     15  3 SWTC pred queens:safe/1-0 (semidet) s1;
-      40:     16  4 CALL pred queens:nodiag/3-0 (semidet) 
-      41:     16  4 SWTC pred queens:nodiag/3-0 (semidet) s1;
-      42:     16  4 THEN pred queens:nodiag/3-0 (semidet) s1;c4;t;
-      43:     16  4 FAIL pred queens:nodiag/3-0 (semidet) 
-      44:     15  3 FAIL pred queens:safe/1-0 (semidet) 
-      45:      4  3 REDO pred queens:qperm/2-0 (nondet) 
-      46:      6  4 REDO pred queens:qperm/2-0 (nondet) 
-      47:      8  5 REDO pred queens:qperm/2-0 (nondet) 
-      48:     10  6 REDO pred queens:qperm/2-0 (nondet) 
-      49:     12  7 REDO pred queens:qperm/2-0 (nondet) 
-      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) 
+      35:      8  5 EXIT queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      36:      6  4 EXIT queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      37:      4  3 EXIT queens.m:45 (from queens.m:42)
+                         pred queens:qperm/2-0 (nondet)
+      38:     15  3 CALL queens.m:55 (from queens.m:43)
+                         pred queens:safe/1-0 (semidet)
+      39:     15  3 SWTC queens.m:57
+                         pred queens:safe/1-0 (semidet) s1;
+      40:     16  4 CALL queens.m:60 (from queens.m:57)
+                         pred queens:nodiag/3-0 (semidet)
+      41:     16  4 SWTC queens.m:62
+                         pred queens:nodiag/3-0 (semidet) s1;
+      42:     16  4 THEN queens.m:65
+                         pred queens:nodiag/3-0 (semidet) s1;c4;t;
+      43:     16  4 FAIL queens.m:60
+                         pred queens:nodiag/3-0 (semidet)
+      44:     15  3 FAIL queens.m:55
+                         pred queens:safe/1-0 (semidet)
+      45:      4  3 REDO queens.m:45 (from queens.m:42)
+                         pred queens:qperm/2-0 (nondet)
+      46:      6  4 REDO queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      47:      8  5 REDO queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      48:     10  6 REDO queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      49:     12  7 REDO queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      50:     14  8 REDO queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      51:     14  8 FAIL queens.m:45
+                         pred queens:qperm/2-0 (nondet)
+      52:     13  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)
  1: + stop  interface pred queens:qdelete/3-0 (nondet)
@@ -147,14 +218,74 @@
  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) 
-      55:     17  9 FAIL pred queens:qdelete/3-0 (nondet) 
-      56:     13  8 FAIL pred queens:qdelete/3-0 (nondet) 
-      57:     12  7 FAIL pred queens:qperm/2-0 (nondet) 
+      53:     13  8 DISJ queens.m:53
+                         pred queens:qdelete/3-0 (nondet) c2;d2;
+      54:     17  9 CALL queens.m:51 (from queens.m:53)
+                         pred queens:qdelete/3-0 (nondet)
+      55:     17  9 FAIL queens.m:51
+                         pred queens:qdelete/3-0 (nondet)
+      56:     13  8 FAIL queens.m:51
+                         pred queens:qdelete/3-0 (nondet)
+      57:     12  7 FAIL queens.m:45
+                         pred queens:qperm/2-0 (nondet)
 mdb> disable 1
  1: - stop  interface pred queens:qdelete/3-0 (nondet)
+mdb> retry 4
+      76:      4  3 EXIT queens.m:45 (from queens.m:42)
+                         pred queens:qperm/2-0 (nondet)
+       5:      4  3 CALL queens.m:45 (from queens.m:42)
+                         pred queens:qperm/2-0 (nondet)
+mdb> break 49
+ 2: + stop  linenumber queens.m:49
+mdb> continue -n
+      10:      6  4 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+mdb> continue -n
+      15:      8  5 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+mdb> continue -n
+      20:     10  6 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+mdb> continue -n
+      25:     12  7 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+mdb> continue -n
+      30:     14  8 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+mdb> continue -n
+      32:     14  8 EXIT queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+mdb> return
+      33:     12  7 EXIT queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      34:     10  6 EXIT queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      35:      8  5 EXIT queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      36:      6  4 EXIT queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      38:     15  3 CALL queens.m:55 (from queens.m:43)
+                         pred queens:safe/1-0 (semidet)
+mdb> continue -n
+      46:      6  4 REDO queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+mdb> continue -n
+      47:      8  5 REDO queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+mdb> forward
+      48:     10  6 REDO queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      49:     12  7 REDO queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      50:     14  8 REDO queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
+      53:     13  8 DISJ queens.m:53
+                         pred queens:qdelete/3-0 (nondet) c2;d2;
+mdb> continue -n
+      64:     19  7 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
 mdb> continue -n
-     675:    141  2 CALL pred queens:print_list/3-0 (det) 
+      69:     21  8 CALL queens.m:45 (from queens.m:49)
+                         pred queens:qperm/2-0 (nondet)
 mdb> continue -n -S
 [1, 3, 5, 2, 4]
Index: tests/debugger/queens.inp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/queens.inp,v
retrieving revision 1.8
diff -u -b -r1.8 queens.inp
--- queens.inp	1999/08/16 05:35:09	1.8
+++ queens.inp	1999/11/09 08:04:31
@@ -15,6 +15,13 @@
 
 print *
 level 1
+level -d 1
+context nextline
+level 1
+level -d 1
+context prevline
+level 1
+level -d 1
 print *
 up 1
 vars
@@ -50,5 +57,18 @@
 enable *
 step -aS 5
 disable 1
+retry 4
+break 49
+continue -n
+continue -n
+continue -n
+continue -n
+continue -n
+continue -n
+return
+continue -n
+continue -n
+forward
+continue -n
 continue -n
 continue -n -S
Index: tests/debugger/shallow.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/shallow.exp,v
retrieving revision 1.2
diff -u -b -r1.2 shallow.exp
--- shallow.exp	1999/10/04 04:20:35	1.2
+++ shallow.exp	1999/11/09 13:45:52
@@ -1,6 +1,6 @@
-       1:      1  1 CALL pred shallow:main/2-0 (cc_multi) 
+       1:      1  1 CALL pred shallow:main/2-0 (cc_multi) shallow.m:17
 mdb> echo on
 Command echo enabled.
 mdb> c -a
 [1, 3, 5, 2, 4]
-       2:      1  1 EXIT pred shallow:main/2-0 (cc_multi) 
+       2:      1  1 EXIT pred shallow:main/2-0 (cc_multi) shallow.m:18
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/exceptions
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
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the developers mailing list