[m-rev.] For review: Remove call depth from standardized event printing.

Ian MacLarty maclarty at cs.mu.OZ.AU
Thu Nov 11 22:16:33 AEDT 2004


For review by anyone.

Estimated hours taken: 2
Branches: main

Remove call depth numbers from standardized event printing.  This will make 
maintaining the debugger test cases easier since a lot of the expected outputs
differ only in the call depth of their events, because of deep tracing of the
standard library in the decldebug grade.

Not all the debugger tests are run with standardized event printing, so
printing of call depths will still be exercised.

tests/debugger/breakpoints.exp
tests/debugger/breakpoints.exp2
tests/debugger/browser_test.exp
tests/debugger/exception_cmd.exp
tests/debugger/exception_cmd.exp2
tests/debugger/exception_cmd.exp3
tests/debugger/exception_value.exp
tests/debugger/exception_value.exp2
tests/debugger/exception_vars.exp
tests/debugger/existential_type_classes.exp
tests/debugger/existential_type_classes.exp2
tests/debugger/exported_eqv_type.exp
tests/debugger/higher_order.exp
tests/debugger/interpreter.exp2
tests/debugger/lambda_expr.exp
tests/debugger/loopcheck.exp3
tests/debugger/loopcheck.inp2
tests/debugger/nondet_stack.exp
tests/debugger/nondet_stack.exp2
tests/debugger/polymorphic_output.exp
tests/debugger/polymorphic_output.exp2
tests/debugger/polymorphic_output.exp3
tests/debugger/print_goal.exp
tests/debugger/print_table.exp
tests/debugger/queens.exp
tests/debugger/queens.exp2
tests/debugger/resume_typeinfos.exp
tests/debugger/retry.exp
tests/debugger/retry.exp2
tests/debugger/tabled_read.exp
tests/debugger/tabled_read_decl.exp
tests/debugger/tabled_read_unitize.exp
tests/debugger/type_desc_test.exp
tests/debugger/declarative/aadebug.exp
tests/debugger/declarative/app.exp
tests/debugger/declarative/args.exp
tests/debugger/declarative/big.exp
tests/debugger/declarative/filter.exp
tests/debugger/declarative/if_then_else.exp
tests/debugger/declarative/input_term_dep.exp
tests/debugger/declarative/io_stream_test.exp
tests/debugger/declarative/io_stream_test.exp2
tests/debugger/declarative/output_term_dep.exp
tests/debugger/declarative/propositional.exp
tests/debugger/declarative/remember_modes.exp
tests/debugger/declarative/special_term_dep.exp
tests/debugger/declarative/tabled_read_decl.exp
tests/debugger/declarative/trust.exp
	Remove call depth numbers from output run with standardized event
	printing.

trace/mercury_trace_internal.c
	Remove call depth from standardized event printing.

Index: tests/debugger/breakpoints.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/breakpoints.exp,v
retrieving revision 1.10
diff -u -r1.10 breakpoints.exp
--- tests/debugger/breakpoints.exp	21 Jan 2004 04:55:45 -0000	1.10
+++ tests/debugger/breakpoints.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred breakpoints.main/2-0 (cc_multi) breakpoints.m:31
+      E1:     C1 CALL pred breakpoints.main/2-0 (cc_multi) breakpoints.m:31
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -22,7 +22,7 @@
 Which do you want to put a breakpoint on (0-1 or *)? 0
  0: + stop  interface pred breakpoints.data/1-0 (det)
 mdb> continue
-      E2:     C2  3 CALL pred breakpoints.data/1-0 (det) breakpoints.m:58 (breakpoints.m:56)
+      E2:     C2 CALL pred breakpoints.data/1-0 (det) breakpoints.m:58 (breakpoints.m:56)
 mdb> disable 0
  0: - stop  interface pred breakpoints.data/1-0 (det)
 mdb> break info
@@ -91,21 +91,21 @@
 mdb> break nodiag
  0: + stop  interface pred breakpoints.nodiag/3-0 (semidet)
 mdb> continue
-      E3:     C3  3 CALL pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:61)
+      E3:     C3 CALL pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:61)
 mdb> continue
-      E4:     C3  3 SWTC pred breakpoints.qperm/2-0 (nondet) s2; breakpoints.m:65
+      E4:     C3 SWTC pred breakpoints.qperm/2-0 (nondet) s2; breakpoints.m:65
 mdb> finish -N
-      E5:     C4  4 CALL pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
+      E5:     C4 CALL pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
 mdb> finish -n
-      E6:     C4  4 EXIT pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
+      E6:     C4 EXIT pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
 mdb> continue
-      E7:     C3  3 EXIT pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:61)
+      E7:     C3 EXIT pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:61)
 mdb> continue
-      E8:     C5  3 CALL pred breakpoints.safe/1-0 (semidet) breakpoints.m:74 (breakpoints.m:62)
+      E8:     C5 CALL pred breakpoints.safe/1-0 (semidet) breakpoints.m:74 (breakpoints.m:62)
 mdb> finish
-      E9:     C6  4 CALL pred breakpoints.nodiag/3-0 (semidet) breakpoints.m:79 (breakpoints.m:76)
-     E10:     C6  4 FAIL pred breakpoints.nodiag/3-0 (semidet) breakpoints.m:79 (breakpoints.m:76)
-     E11:     C5  3 FAIL pred breakpoints.safe/1-0 (semidet) breakpoints.m:74 (breakpoints.m:62)
+      E9:     C6 CALL pred breakpoints.nodiag/3-0 (semidet) breakpoints.m:79 (breakpoints.m:76)
+     E10:     C6 FAIL pred breakpoints.nodiag/3-0 (semidet) breakpoints.m:79 (breakpoints.m:76)
+     E11:     C5 FAIL pred breakpoints.safe/1-0 (semidet) breakpoints.m:74 (breakpoints.m:62)
 mdb> delete *
  0: E stop  interface pred breakpoints.nodiag/3-0 (semidet)
  1: E stop  interface pred breakpoints.qperm/2-0 (nondet)
@@ -127,14 +127,14 @@
  0: + stop  interface pred breakpoints.qperm/2-0 (nondet)
             (ignore next 3 interface events)
 mdb> continue
-     E12:     C7  6 REDO pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
+     E12:     C7 REDO pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
 mdb> print *
        HeadVar__1             	[4, 5]
 mdb> ignore -E4 0
  0: + stop  interface pred breakpoints.qperm/2-0 (nondet)
             (ignore next 4 call events)
 mdb> continue
-     E13:     C8  8 CALL pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
+     E13:     C8 CALL pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
 mdb> print *
        HeadVar__1             	[]
 mdb> delete *
Index: tests/debugger/breakpoints.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/breakpoints.exp2,v
retrieving revision 1.6
diff -u -r1.6 breakpoints.exp2
--- tests/debugger/breakpoints.exp2	21 Jan 2004 04:55:45 -0000	1.6
+++ tests/debugger/breakpoints.exp2	11 Nov 2004 05:59:41 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred breakpoints.main/2-0 (cc_multi) breakpoints.m:31
+      E1:     C1 CALL pred breakpoints.main/2-0 (cc_multi) breakpoints.m:31
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -22,7 +22,7 @@
 Which do you want to put a breakpoint on (0-1 or *)? 0
  0: + stop  interface pred breakpoints.data/1-0 (det)
 mdb> continue
-      E2:     C2  3 CALL pred breakpoints.data/1-0 (det) breakpoints.m:58 (breakpoints.m:56)
+      E2:     C2 CALL pred breakpoints.data/1-0 (det) breakpoints.m:58 (breakpoints.m:56)
 mdb> disable 0
  0: - stop  interface pred breakpoints.data/1-0 (det)
 mdb> break info
@@ -99,21 +99,21 @@
 mdb> break nodiag
  0: + stop  interface pred breakpoints.nodiag/3-0 (semidet)
 mdb> continue
-      E3:     C3  3 CALL pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:61)
+      E3:     C3 CALL pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:61)
 mdb> continue
-      E4:     C3  3 SWTC pred breakpoints.qperm/2-0 (nondet) s2; breakpoints.m:65
+      E4:     C3 SWTC pred breakpoints.qperm/2-0 (nondet) s2; breakpoints.m:65
 mdb> finish -N
-      E5:     C4  4 CALL pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
+      E5:     C4 CALL pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
 mdb> finish -n
-      E6:     C4  4 EXIT pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
+      E6:     C4 EXIT pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
 mdb> continue
-      E7:     C3  3 EXIT pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:61)
+      E7:     C3 EXIT pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:61)
 mdb> continue
-      E8:     C5  3 CALL pred breakpoints.safe/1-0 (semidet) breakpoints.m:74 (breakpoints.m:62)
+      E8:     C5 CALL pred breakpoints.safe/1-0 (semidet) breakpoints.m:74 (breakpoints.m:62)
 mdb> finish
-      E9:     C6  4 CALL pred breakpoints.nodiag/3-0 (semidet) breakpoints.m:79 (breakpoints.m:76)
-     E10:     C6  4 FAIL pred breakpoints.nodiag/3-0 (semidet) breakpoints.m:79 (breakpoints.m:76)
-     E11:     C5  3 FAIL pred breakpoints.safe/1-0 (semidet) breakpoints.m:74 (breakpoints.m:62)
+      E9:     C6 CALL pred breakpoints.nodiag/3-0 (semidet) breakpoints.m:79 (breakpoints.m:76)
+     E10:     C6 FAIL pred breakpoints.nodiag/3-0 (semidet) breakpoints.m:79 (breakpoints.m:76)
+     E11:     C5 FAIL pred breakpoints.safe/1-0 (semidet) breakpoints.m:74 (breakpoints.m:62)
 mdb> delete *
  0: E stop  interface pred breakpoints.nodiag/3-0 (semidet)
  1: E stop  interface pred breakpoints.qperm/2-0 (nondet)
@@ -135,14 +135,14 @@
  0: + stop  interface pred breakpoints.qperm/2-0 (nondet)
             (ignore next 3 interface events)
 mdb> continue
-     E12:     C7  6 REDO pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
+     E12:     C7 REDO pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
 mdb> print *
        HeadVar__1             	[4, 5]
 mdb> ignore -E4 0
  0: + stop  interface pred breakpoints.qperm/2-0 (nondet)
             (ignore next 4 call events)
 mdb> continue
-     E13:     C8  8 CALL pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
+     E13:     C8 CALL pred breakpoints.qperm/2-0 (nondet) breakpoints.m:64 (breakpoints.m:68)
 mdb> print *
        HeadVar__1             	[]
 mdb> delete *
Index: tests/debugger/browser_test.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/browser_test.exp,v
retrieving revision 1.19
diff -u -r1.19 browser_test.exp
--- tests/debugger/browser_test.exp	5 Nov 2004 06:30:20 -0000	1.19
+++ tests/debugger/browser_test.exp	10 Nov 2004 23:24:25 -0000
@@ -1,13 +1,13 @@
-      E1:     C1  1 CALL pred browser_test.main/2-0 (det) browser_test.m:16
+      E1:     C1 CALL pred browser_test.main/2-0 (det) browser_test.m:16
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
 mdb> break big_data
  0: + stop  interface pred browser_test.big_data/1-0 (det)
 mdb> continue
-      E2:     C2  2 CALL pred browser_test.big_data/1-0 (det) browser_test.m:37 (browser_test.m:20)
+      E2:     C2 CALL pred browser_test.big_data/1-0 (det) browser_test.m:37 (browser_test.m:20)
 mdb> finish
-      E3:     C2  2 EXIT pred browser_test.big_data/1-0 (det) browser_test.m:37 (browser_test.m:20)
+      E3:     C2 EXIT pred browser_test.big_data/1-0 (det) browser_test.m:37 (browser_test.m:20)
 mdb> delete *
  0: E stop  interface pred browser_test.big_data/1-0 (det)
 mdb> save_to_file 1 browser_test.save.1
@@ -119,14 +119,14 @@
 mdb> print 1^1^2^3
 mdb: the path 3 does not exist.
 mdb> retry
-      E2:     C2  2 CALL pred browser_test.big_data/1-0 (det) browser_test.m:37 (browser_test.m:20)
+      E2:     C2 CALL pred browser_test.big_data/1-0 (det) browser_test.m:37 (browser_test.m:20)
 mdb> break list_data
  0: + stop  interface pred browser_test.list_data/1-0 (det)
 mdb> continue
 big(big(big(small, 1, small), 2, small), 3, big(big(small, 4, big(small, 5, small)), 6, small)).
-      E4:     C3  2 CALL pred browser_test.list_data/1-0 (det) browser_test.m:66 (browser_test.m:23)
+      E4:     C3 CALL pred browser_test.list_data/1-0 (det) browser_test.m:66 (browser_test.m:23)
 mdb> finish
-      E5:     C3  2 EXIT pred browser_test.list_data/1-0 (det) browser_test.m:66 (browser_test.m:23)
+      E5:     C3 EXIT pred browser_test.list_data/1-0 (det) browser_test.m:66 (browser_test.m:23)
 mdb> save_to_file Data browser_test.save.2
 mdb> break a_func
  1: + stop  interface func browser_test.a_func/1-0 (det)
@@ -186,9 +186,9 @@
  5
 )
 
-      E6:     C4  2 CALL func browser_test.a_func/1-0 (det) browser_test.m:112 (browser_test.m:31)
+      E6:     C4 CALL func browser_test.a_func/1-0 (det) browser_test.m:112 (browser_test.m:31)
 mdb> finish
-      E7:     C4  2 EXIT func browser_test.a_func/1-0 (det) browser_test.m:112 (browser_test.m:31)
+      E7:     C4 EXIT func browser_test.a_func/1-0 (det) browser_test.m:112 (browser_test.m:31)
 mdb> print -p
 a_func(big(big(...), ...)) = big(big(...), ...)
 mdb> print -r
Index: tests/debugger/exception_cmd.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_cmd.exp,v
retrieving revision 1.7
diff -u -r1.7 exception_cmd.exp
--- tests/debugger/exception_cmd.exp	17 Jan 2003 05:56:52 -0000	1.7
+++ tests/debugger/exception_cmd.exp	10 Nov 2004 23:24:25 -0000
@@ -1,8 +1,8 @@
-      E1:     C1  1 CALL pred exception_cmd.main/2-0 (det) exception_cmd.m:12
+      E1:     C1 CALL pred exception_cmd.main/2-0 (det) exception_cmd.m:12
 mdb> echo on
 Command echo enabled.
 mdb> exception
-      E2:     C2  2 EXCP pred exception_cmd.test/2-0 (det)
+      E2:     C2 EXCP pred exception_cmd.test/2-0 (det)
 mdb> print *
        X (arg 1)              	42
 mdb> continue
Index: tests/debugger/exception_cmd.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_cmd.exp2,v
retrieving revision 1.7
diff -u -r1.7 exception_cmd.exp2
--- tests/debugger/exception_cmd.exp2	17 Jan 2003 05:56:52 -0000	1.7
+++ tests/debugger/exception_cmd.exp2	11 Nov 2004 10:52:21 -0000
@@ -1,8 +1,8 @@
-      E1:     C1  1 CALL pred exception_cmd.main/2-0 (det) exception_cmd.m:12
+      E1:     C1 CALL pred exception_cmd.main/2-0 (det) exception_cmd.m:12
 mdb> echo on
 Command echo enabled.
 mdb> exception
-      E2:     C2  3 EXCP pred require.error/1-0 (erroneous)
+      E2:     C2 EXCP pred require.error/1-0 (erroneous)
 mdb> print *
        Message (arg 1)        	"oops"
 mdb> continue
Index: tests/debugger/exception_cmd.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_cmd.exp3,v
retrieving revision 1.1
diff -u -r1.1 exception_cmd.exp3
--- tests/debugger/exception_cmd.exp3	10 Nov 2004 02:21:40 -0000	1.1
+++ tests/debugger/exception_cmd.exp3	11 Nov 2004 06:00:12 -0000
@@ -1,8 +1,8 @@
-      E1:     C1  1 CALL pred exception_cmd.main/2-0 (det) exception_cmd.m:12
+      E1:     C1 CALL pred exception_cmd.main/2-0 (det) exception_cmd.m:12
 mdb> echo on
 Command echo enabled.
 mdb> exception
-      E2:     C2  5 EXCP pred exception.throw_impl/1-0 (erroneous)
+      E2:     C2 EXCP pred exception.throw_impl/1-0 (erroneous)
 mdb> print *
        Univ (arg 1)           	univ_cons(software_error("oops"))
 mdb> continue
Index: tests/debugger/exception_value.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_value.exp,v
retrieving revision 1.8
diff -u -r1.8 exception_value.exp
--- tests/debugger/exception_value.exp	13 Oct 2003 08:02:05 -0000	1.8
+++ tests/debugger/exception_value.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred exception_value.main/2-0 (cc_multi) exception_value.m:12
+      E1:     C1 CALL pred exception_value.main/2-0 (cc_multi) exception_value.m:12
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -7,9 +7,9 @@
 mdb> break q
  1: + stop  interface pred exception_value.q/1-0 (det)
 mdb> continue
-      E2:     C2  3 CALL pred exception_value.p/1-0 (det) exception_value.m:30
+      E2:     C2 CALL pred exception_value.p/1-0 (det) exception_value.m:30
 mdb> finish
-      E3:     C2  3 EXCP pred exception_value.p/1-0 (det)
+      E3:     C2 EXCP pred exception_value.p/1-0 (det)
 mdb> print exception
 	"p exception"
 mdb> continue
@@ -17,9 +17,9 @@
 This may result in some exception events
 being omitted from the trace.
 exception(univ_cons("p exception"))
-      E4:     C3  3 CALL pred exception_value.q/1-0 (det) exception_value.m:35
+      E4:     C3 CALL pred exception_value.q/1-0 (det) exception_value.m:35
 mdb> finish
-      E5:     C3  3 EXCP pred exception_value.q/1-0 (det)
+      E5:     C3 EXCP pred exception_value.q/1-0 (det)
 mdb> browse exception
 browser> set depth 9
 browser> set size 99
Index: tests/debugger/exception_value.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_value.exp2,v
retrieving revision 1.8
diff -u -r1.8 exception_value.exp2
--- tests/debugger/exception_value.exp2	16 Oct 2003 01:36:46 -0000	1.8
+++ tests/debugger/exception_value.exp2	11 Nov 2004 06:01:49 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred exception_value.main/2-0 (cc_multi) exception_value.m:12
+      E1:     C1 CALL pred exception_value.main/2-0 (cc_multi) exception_value.m:12
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -7,16 +7,16 @@
 mdb> break q
  1: + stop  interface pred exception_value.q/1-0 (det)
 mdb> continue
-      E2:     C2  4 CALL pred exception_value.p/1-0 (det) exception_value.m:30 (exception.m:NNNN)
+      E2:     C2 CALL pred exception_value.p/1-0 (det) exception_value.m:30 (exception.m:NNNN)
 mdb> finish
-      E3:     C2  4 EXCP pred exception_value.p/1-0 (det)
+      E3:     C2 EXCP pred exception_value.p/1-0 (det)
 mdb> print exception
 	"p exception"
 mdb> continue
 exception(univ_cons("p exception"))
-      E4:     C3  4 CALL pred exception_value.q/1-0 (det) exception_value.m:35 (exception.m:NNNN)
+      E4:     C3 CALL pred exception_value.q/1-0 (det) exception_value.m:35 (exception.m:NNNN)
 mdb> finish
-      E5:     C3  4 EXCP pred exception_value.q/1-0 (det)
+      E5:     C3 EXCP pred exception_value.q/1-0 (det)
 mdb> browse exception
 browser> set depth 9
 browser> set size 99
Index: tests/debugger/exception_vars.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exception_vars.exp,v
retrieving revision 1.10
diff -u -r1.10 exception_vars.exp
--- tests/debugger/exception_vars.exp	17 Jan 2003 05:56:52 -0000	1.10
+++ tests/debugger/exception_vars.exp	10 Nov 2004 23:24:25 -0000
@@ -1,10 +1,10 @@
-      E1:     C1  1 CALL pred exception_vars.main/2-0 (det) exception_vars.m:12
+      E1:     C1 CALL pred exception_vars.main/2-0 (det) exception_vars.m:12
 mdb> echo on
 Command echo enabled.
 mdb> goto 2
-      E2:     C2  2 CALL pred exception_vars.test/2-0 (det) exception_vars.m:19 (exception_vars.m:12)
+      E2:     C2 CALL pred exception_vars.test/2-0 (det) exception_vars.m:19 (exception_vars.m:12)
 mdb> finish
-      E3:     C2  2 EXCP pred exception_vars.test/2-0 (det)
+      E3:     C2 EXCP pred exception_vars.test/2-0 (det)
 mdb> print *
        X (arg 1)              	42
 mdb> continue
Index: tests/debugger/existential_type_classes.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/existential_type_classes.exp,v
retrieving revision 1.14
diff -u -r1.14 existential_type_classes.exp
--- tests/debugger/existential_type_classes.exp	17 Jan 2003 05:56:52 -0000	1.14
+++ tests/debugger/existential_type_classes.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred existential_type_classes.main/2-0 (det) existential_type_classes.m:49
+      E1:     C1 CALL pred existential_type_classes.main/2-0 (det) existential_type_classes.m:49
 mdb> echo on
 Command echo enabled.
 mdb> alias P print *
@@ -9,192 +9,192 @@
 mdb> break -i do_foo
  0: + stop  interface pred existential_type_classes.do_foo/2-0 (det)
 mdb> continue -a
-      E2:     C2  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:51)
+      E2:     C2 CALL existential_type_classes.m:68 (from existential_type_classes.m:51)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	42
 mdb> 
-      E3:     C3  3 CALL (from existential_type_classes.m:68)
+      E3:     C3 CALL (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
 mdb> P
        HeadVar__1             	42
 mdb> 
-      E4:     C4  4 CALL existential_type_classes.m:21
+      E4:     C4 CALL existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	42
 mdb> continue -a
-      E5:     C5  5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
+      E5:     C5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-      E6:     C5  5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
+      E6:     C5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-      E7:     C4  4 EXIT existential_type_classes.m:21
+      E7:     C4 EXIT existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
-      E8:     C3  3 EXIT (from existential_type_classes.m:68)
+      E8:     C3 EXIT (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
-      E9:     C2  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:51)
+      E9:     C2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:51)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	42
        N (arg 2)              	84
 mdb> continue -a
-     E10:     C6  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:52)
+     E10:     C6 CALL existential_type_classes.m:68 (from existential_type_classes.m:52)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	"blah"
 mdb> 
-     E11:     C7  3 CALL (from existential_type_classes.m:68)
+     E11:     C7 CALL (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
 mdb> P
        HeadVar__1             	"blah"
 mdb> 
-     E12:     C8  4 CALL existential_type_classes.m:25
+     E12:     C8 CALL existential_type_classes.m:25
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____string__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	"blah"
 mdb> continue -a
-     E13:     C9  5 CALL existential_type_classes.m:47 (from existential_type_classes.m:25)
+     E13:     C9 CALL existential_type_classes.m:47 (from existential_type_classes.m:25)
                          pred existential_type_classes.string_foo/2-0 (det)
-     E14:     C9  5 EXIT existential_type_classes.m:47 (from existential_type_classes.m:25)
+     E14:     C9 EXIT existential_type_classes.m:47 (from existential_type_classes.m:25)
                          pred existential_type_classes.string_foo/2-0 (det)
-     E15:     C8  4 EXIT existential_type_classes.m:25
+     E15:     C8 EXIT existential_type_classes.m:25
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____string__arity0______existential_type_classes__foo_2/2-0 (det)
-     E16:     C7  3 EXIT (from existential_type_classes.m:68)
+     E16:     C7 EXIT (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
-     E17:     C6  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:52)
+     E17:     C6 EXIT existential_type_classes.m:68 (from existential_type_classes.m:52)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	"blah"
        N (arg 2)              	4
 mdb> continue -a
-     E18:    C10  2 CALL existential_type_classes.m:74 (from existential_type_classes.m:53)
+     E18:    C10 CALL existential_type_classes.m:74 (from existential_type_classes.m:53)
                          func existential_type_classes.my_exist_t/0-0 (det)
-     E19:    C10  2 EXIT existential_type_classes.m:74 (from existential_type_classes.m:53)
+     E19:    C10 EXIT existential_type_classes.m:74 (from existential_type_classes.m:53)
                          func existential_type_classes.my_exist_t/0-0 (det)
-     E20:    C11  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:53)
+     E20:    C11 CALL existential_type_classes.m:68 (from existential_type_classes.m:53)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	43
 mdb> 
-     E21:    C12  3 CALL (from existential_type_classes.m:68)
+     E21:    C12 CALL (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> 
-     E22:    C13  4 CALL existential_type_classes.m:21
+     E22:    C13 CALL existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> continue -a
-     E23:    C14  5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
+     E23:    C14 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-     E24:    C14  5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
+     E24:    C14 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-     E25:    C13  4 EXIT existential_type_classes.m:21
+     E25:    C13 EXIT existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
-     E26:    C12  3 EXIT (from existential_type_classes.m:68)
+     E26:    C12 EXIT (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
-     E27:    C11  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:53)
+     E27:    C11 EXIT existential_type_classes.m:68 (from existential_type_classes.m:53)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	43
        N (arg 2)              	86
 mdb> continue -a
-     E28:    C15  2 CALL existential_type_classes.m:70 (from existential_type_classes.m:54)
+     E28:    C15 CALL existential_type_classes.m:70 (from existential_type_classes.m:54)
                          func existential_type_classes.call_my_exist_t/0-0 (det)
-     E29:    C16  3 CALL existential_type_classes.m:74 (from existential_type_classes.m:70)
+     E29:    C16 CALL existential_type_classes.m:74 (from existential_type_classes.m:70)
                          func existential_type_classes.my_exist_t/0-0 (det)
-     E30:    C16  3 EXIT existential_type_classes.m:74 (from existential_type_classes.m:70)
+     E30:    C16 EXIT existential_type_classes.m:74 (from existential_type_classes.m:70)
                          func existential_type_classes.my_exist_t/0-0 (det)
-     E31:    C15  2 EXIT existential_type_classes.m:70 (from existential_type_classes.m:54)
+     E31:    C15 EXIT existential_type_classes.m:70 (from existential_type_classes.m:54)
                          func existential_type_classes.call_my_exist_t/0-0 (det)
-     E32:    C17  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:54)
+     E32:    C17 CALL existential_type_classes.m:68 (from existential_type_classes.m:54)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	43
 mdb> 
-     E33:    C18  3 CALL (from existential_type_classes.m:68)
+     E33:    C18 CALL (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> 
-     E34:    C19  4 CALL existential_type_classes.m:21
+     E34:    C19 CALL existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> continue -a
-     E35:    C20  5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
+     E35:    C20 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-     E36:    C20  5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
+     E36:    C20 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-     E37:    C19  4 EXIT existential_type_classes.m:21
+     E37:    C19 EXIT existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
-     E38:    C18  3 EXIT (from existential_type_classes.m:68)
+     E38:    C18 EXIT (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
-     E39:    C17  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:54)
+     E39:    C17 EXIT existential_type_classes.m:68 (from existential_type_classes.m:54)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	43
        N (arg 2)              	86
 mdb> continue -a
-     E40:    C21  2 CALL existential_type_classes.m:82 (from existential_type_classes.m:55)
+     E40:    C21 CALL existential_type_classes.m:82 (from existential_type_classes.m:55)
                          func existential_type_classes.my_univ/1-0 (det)
-     E41:    C21  2 EXIT existential_type_classes.m:82 (from existential_type_classes.m:55)
+     E41:    C21 EXIT existential_type_classes.m:82 (from existential_type_classes.m:55)
                          func existential_type_classes.my_univ/1-0 (det)
-     E42:    C22  2 CALL existential_type_classes.m:76 (from existential_type_classes.m:55)
+     E42:    C22 CALL existential_type_classes.m:76 (from existential_type_classes.m:55)
                          func existential_type_classes.my_univ_value/1-0 (det)
-     E43:    C22  2 EXIT existential_type_classes.m:76 (from existential_type_classes.m:55)
+     E43:    C22 EXIT existential_type_classes.m:76 (from existential_type_classes.m:55)
                          func existential_type_classes.my_univ_value/1-0 (det)
-     E44:    C23  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:55)
+     E44:    C23 CALL existential_type_classes.m:68 (from existential_type_classes.m:55)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	45
 mdb> 
-     E45:    C24  3 CALL (from existential_type_classes.m:68)
+     E45:    C24 CALL (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
 mdb> P
        HeadVar__1             	45
 mdb> 
-     E46:    C25  4 CALL existential_type_classes.m:21
+     E46:    C25 CALL existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	45
 mdb> continue -a
-     E47:    C26  5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
+     E47:    C26 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-     E48:    C26  5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
+     E48:    C26 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-     E49:    C25  4 EXIT existential_type_classes.m:21
+     E49:    C25 EXIT existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
-     E50:    C24  3 EXIT (from existential_type_classes.m:68)
+     E50:    C24 EXIT (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
-     E51:    C23  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:55)
+     E51:    C23 EXIT existential_type_classes.m:68 (from existential_type_classes.m:55)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	45
        N (arg 2)              	90
 mdb> 
-     E52:    C27  2 CALL existential_type_classes.m:82 (from existential_type_classes.m:56)
+     E52:    C27 CALL existential_type_classes.m:82 (from existential_type_classes.m:56)
                          func existential_type_classes.my_univ/1-0 (det)
 mdb> 
-     E53:    C27  2 EXIT existential_type_classes.m:82 (from existential_type_classes.m:56)
+     E53:    C27 EXIT existential_type_classes.m:82 (from existential_type_classes.m:56)
                          func existential_type_classes.my_univ/1-0 (det)
 mdb> 
-     E54:    C28  2 CALL existential_type_classes.m:72 (from existential_type_classes.m:56)
+     E54:    C28 CALL existential_type_classes.m:72 (from existential_type_classes.m:56)
                          func existential_type_classes.call_my_univ_value/1-0 (det)
 mdb> P
        Univ (arg 1)           	my_univ('<<c_pointer>>')
 mdb> 
-     E55:    C29  3 CALL existential_type_classes.m:76 (from existential_type_classes.m:72)
+     E55:    C29 CALL existential_type_classes.m:76 (from existential_type_classes.m:72)
                          func existential_type_classes.my_univ_value/1-0 (det)
 mdb> P
        HeadVar__1             	my_univ('<<c_pointer>>')
 mdb> continue -a
-     E56:    C29  3 EXIT existential_type_classes.m:76 (from existential_type_classes.m:72)
+     E56:    C29 EXIT existential_type_classes.m:76 (from existential_type_classes.m:72)
                          func existential_type_classes.my_univ_value/1-0 (det)
-     E57:    C28  2 EXIT existential_type_classes.m:72 (from existential_type_classes.m:56)
+     E57:    C28 EXIT existential_type_classes.m:72 (from existential_type_classes.m:56)
                          func existential_type_classes.call_my_univ_value/1-0 (det)
-     E58:    C30  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:56)
+     E58:    C30 CALL existential_type_classes.m:68 (from existential_type_classes.m:56)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	"something"
Index: tests/debugger/existential_type_classes.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/existential_type_classes.exp2,v
retrieving revision 1.15
diff -u -r1.15 existential_type_classes.exp2
--- tests/debugger/existential_type_classes.exp2	30 Jan 2003 05:59:26 -0000	1.15
+++ tests/debugger/existential_type_classes.exp2	11 Nov 2004 06:03:45 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred existential_type_classes.main/2-0 (det) existential_type_classes.m:49
+      E1:     C1 CALL pred existential_type_classes.main/2-0 (det) existential_type_classes.m:49
 mdb> echo on
 Command echo enabled.
 mdb> alias P print *
@@ -9,212 +9,212 @@
 mdb> break -i do_foo
  0: + stop  interface pred existential_type_classes.do_foo/2-0 (det)
 mdb> continue -a
-      E2:     C2  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:51)
+      E2:     C2 CALL existential_type_classes.m:68 (from existential_type_classes.m:51)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	42
 mdb> 
-      E3:     C3  3 CALL (from existential_type_classes.m:68)
+      E3:     C3 CALL (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
 mdb> P
        HeadVar__1             	42
 mdb> 
-      E4:     C4  4 CALL existential_type_classes.m:21
+      E4:     C4 CALL existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	42
 mdb> continue -a
-      E5:     C5  5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
+      E5:     C5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-      E6:     C6  6 CALL int.m:NNNN (from existential_type_classes.m:44)
+      E6:     C6 CALL int.m:NNNN (from existential_type_classes.m:44)
                          func int.*/2-0 (det)
-      E7:     C6  6 EXIT int.m:NNNN (from existential_type_classes.m:44)
+      E7:     C6 EXIT int.m:NNNN (from existential_type_classes.m:44)
                          func int.*/2-0 (det)
-      E8:     C5  5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
+      E8:     C5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-      E9:     C4  4 EXIT existential_type_classes.m:21
+      E9:     C4 EXIT existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
-     E10:     C3  3 EXIT (from existential_type_classes.m:68)
+     E10:     C3 EXIT (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
-     E11:     C2  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:51)
+     E11:     C2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:51)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	42
        N (arg 2)              	84
 mdb> continue -a
-     E12:     C7  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:52)
+     E12:     C7 CALL existential_type_classes.m:68 (from existential_type_classes.m:52)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	"blah"
 mdb> 
-     E13:     C8  3 CALL (from existential_type_classes.m:68)
+     E13:     C8 CALL (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
 mdb> P
        HeadVar__1             	"blah"
 mdb> 
-     E14:     C9  4 CALL existential_type_classes.m:25
+     E14:     C9 CALL existential_type_classes.m:25
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____string__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	"blah"
 mdb> continue -a
-     E15:    C10  5 CALL existential_type_classes.m:47 (from existential_type_classes.m:25)
+     E15:    C10 CALL existential_type_classes.m:47 (from existential_type_classes.m:25)
                          pred existential_type_classes.string_foo/2-0 (det)
-     E16:    C11  6 CALL string.m:NNNN (from existential_type_classes.m:47)
+     E16:    C11 CALL string.m:NNNN (from existential_type_classes.m:47)
                          pred string.length/2-0 (det)
-     E17:    C11  6 EXIT string.m:NNNN (from existential_type_classes.m:47)
+     E17:    C11 EXIT string.m:NNNN (from existential_type_classes.m:47)
                          pred string.length/2-0 (det)
-     E18:    C10  5 EXIT existential_type_classes.m:47 (from existential_type_classes.m:25)
+     E18:    C10 EXIT existential_type_classes.m:47 (from existential_type_classes.m:25)
                          pred existential_type_classes.string_foo/2-0 (det)
-     E19:     C9  4 EXIT existential_type_classes.m:25
+     E19:     C9 EXIT existential_type_classes.m:25
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____string__arity0______existential_type_classes__foo_2/2-0 (det)
-     E20:     C8  3 EXIT (from existential_type_classes.m:68)
+     E20:     C8 EXIT (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
-     E21:     C7  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:52)
+     E21:     C7 EXIT existential_type_classes.m:68 (from existential_type_classes.m:52)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	"blah"
        N (arg 2)              	4
 mdb> continue -a
-     E22:    C12  2 CALL existential_type_classes.m:74 (from existential_type_classes.m:53)
+     E22:    C12 CALL existential_type_classes.m:74 (from existential_type_classes.m:53)
                          func existential_type_classes.my_exist_t/0-0 (det)
-     E23:    C12  2 EXIT existential_type_classes.m:74 (from existential_type_classes.m:53)
+     E23:    C12 EXIT existential_type_classes.m:74 (from existential_type_classes.m:53)
                          func existential_type_classes.my_exist_t/0-0 (det)
-     E24:    C13  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:53)
+     E24:    C13 CALL existential_type_classes.m:68 (from existential_type_classes.m:53)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	43
 mdb> 
-     E25:    C14  3 CALL (from existential_type_classes.m:68)
+     E25:    C14 CALL (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> 
-     E26:    C15  4 CALL existential_type_classes.m:21
+     E26:    C15 CALL existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> continue -a
-     E27:    C16  5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
+     E27:    C16 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-     E28:    C17  6 CALL int.m:NNNN (from existential_type_classes.m:44)
+     E28:    C17 CALL int.m:NNNN (from existential_type_classes.m:44)
                          func int.*/2-0 (det)
-     E29:    C17  6 EXIT int.m:NNNN (from existential_type_classes.m:44)
+     E29:    C17 EXIT int.m:NNNN (from existential_type_classes.m:44)
                          func int.*/2-0 (det)
-     E30:    C16  5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
+     E30:    C16 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-     E31:    C15  4 EXIT existential_type_classes.m:21
+     E31:    C15 EXIT existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
-     E32:    C14  3 EXIT (from existential_type_classes.m:68)
+     E32:    C14 EXIT (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
-     E33:    C13  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:53)
+     E33:    C13 EXIT existential_type_classes.m:68 (from existential_type_classes.m:53)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	43
        N (arg 2)              	86
 mdb> continue -a
-     E34:    C18  2 CALL existential_type_classes.m:70 (from existential_type_classes.m:54)
+     E34:    C18 CALL existential_type_classes.m:70 (from existential_type_classes.m:54)
                          func existential_type_classes.call_my_exist_t/0-0 (det)
-     E35:    C19  3 CALL existential_type_classes.m:74 (from existential_type_classes.m:70)
+     E35:    C19 CALL existential_type_classes.m:74 (from existential_type_classes.m:70)
                          func existential_type_classes.my_exist_t/0-0 (det)
-     E36:    C19  3 EXIT existential_type_classes.m:74 (from existential_type_classes.m:70)
+     E36:    C19 EXIT existential_type_classes.m:74 (from existential_type_classes.m:70)
                          func existential_type_classes.my_exist_t/0-0 (det)
-     E37:    C18  2 EXIT existential_type_classes.m:70 (from existential_type_classes.m:54)
+     E37:    C18 EXIT existential_type_classes.m:70 (from existential_type_classes.m:54)
                          func existential_type_classes.call_my_exist_t/0-0 (det)
-     E38:    C20  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:54)
+     E38:    C20 CALL existential_type_classes.m:68 (from existential_type_classes.m:54)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	43
 mdb> 
-     E39:    C21  3 CALL (from existential_type_classes.m:68)
+     E39:    C21 CALL (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> 
-     E40:    C22  4 CALL existential_type_classes.m:21
+     E40:    C22 CALL existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	43
 mdb> continue -a
-     E41:    C23  5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
+     E41:    C23 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-     E42:    C24  6 CALL int.m:NNNN (from existential_type_classes.m:44)
+     E42:    C24 CALL int.m:NNNN (from existential_type_classes.m:44)
                          func int.*/2-0 (det)
-     E43:    C24  6 EXIT int.m:NNNN (from existential_type_classes.m:44)
+     E43:    C24 EXIT int.m:NNNN (from existential_type_classes.m:44)
                          func int.*/2-0 (det)
-     E44:    C23  5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
+     E44:    C23 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-     E45:    C22  4 EXIT existential_type_classes.m:21
+     E45:    C22 EXIT existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
-     E46:    C21  3 EXIT (from existential_type_classes.m:68)
+     E46:    C21 EXIT (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
-     E47:    C20  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:54)
+     E47:    C20 EXIT existential_type_classes.m:68 (from existential_type_classes.m:54)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	43
        N (arg 2)              	86
 mdb> continue -a
-     E48:    C25  2 CALL existential_type_classes.m:82 (from existential_type_classes.m:55)
+     E48:    C25 CALL existential_type_classes.m:82 (from existential_type_classes.m:55)
                          func existential_type_classes.my_univ/1-0 (det)
-     E49:    C25  2 EXIT existential_type_classes.m:82 (from existential_type_classes.m:55)
+     E49:    C25 EXIT existential_type_classes.m:82 (from existential_type_classes.m:55)
                          func existential_type_classes.my_univ/1-0 (det)
-     E50:    C26  2 CALL existential_type_classes.m:76 (from existential_type_classes.m:55)
+     E50:    C26 CALL existential_type_classes.m:76 (from existential_type_classes.m:55)
                          func existential_type_classes.my_univ_value/1-0 (det)
-     E51:    C26  2 EXIT existential_type_classes.m:76 (from existential_type_classes.m:55)
+     E51:    C26 EXIT existential_type_classes.m:76 (from existential_type_classes.m:55)
                          func existential_type_classes.my_univ_value/1-0 (det)
-     E52:    C27  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:55)
+     E52:    C27 CALL existential_type_classes.m:68 (from existential_type_classes.m:55)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	45
 mdb> 
-     E53:    C28  3 CALL (from existential_type_classes.m:68)
+     E53:    C28 CALL (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
 mdb> P
        HeadVar__1             	45
 mdb> 
-     E54:    C29  4 CALL existential_type_classes.m:21
+     E54:    C29 CALL existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
 mdb> P
        HeadVar__1             	45
 mdb> continue -a
-     E55:    C30  5 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
+     E55:    C30 CALL existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-     E56:    C31  6 CALL int.m:NNNN (from existential_type_classes.m:44)
+     E56:    C31 CALL int.m:NNNN (from existential_type_classes.m:44)
                          func int.*/2-0 (det)
-     E57:    C31  6 EXIT int.m:NNNN (from existential_type_classes.m:44)
+     E57:    C31 EXIT int.m:NNNN (from existential_type_classes.m:44)
                          func int.*/2-0 (det)
-     E58:    C30  5 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
+     E58:    C30 EXIT existential_type_classes.m:44 (from existential_type_classes.m:21)
                          pred existential_type_classes.int_foo/2-0 (det)
-     E59:    C29  4 EXIT existential_type_classes.m:21
+     E59:    C29 EXIT existential_type_classes.m:21
                          pred existential_type_classes.ClassMethod_for_existential_type_classes__fooable____int__arity0______existential_type_classes__foo_2/2-0 (det)
-     E60:    C28  3 EXIT (from existential_type_classes.m:68)
+     E60:    C28 EXIT (from existential_type_classes.m:68)
                          pred existential_type_classes.foo/2-0 (det)
-     E61:    C27  2 EXIT existential_type_classes.m:68 (from existential_type_classes.m:55)
+     E61:    C27 EXIT existential_type_classes.m:68 (from existential_type_classes.m:55)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	45
        N (arg 2)              	90
 mdb> 
-     E62:    C32  2 CALL existential_type_classes.m:82 (from existential_type_classes.m:56)
+     E62:    C32 CALL existential_type_classes.m:82 (from existential_type_classes.m:56)
                          func existential_type_classes.my_univ/1-0 (det)
 mdb> 
-     E63:    C32  2 EXIT existential_type_classes.m:82 (from existential_type_classes.m:56)
+     E63:    C32 EXIT existential_type_classes.m:82 (from existential_type_classes.m:56)
                          func existential_type_classes.my_univ/1-0 (det)
 mdb> 
-     E64:    C33  2 CALL existential_type_classes.m:72 (from existential_type_classes.m:56)
+     E64:    C33 CALL existential_type_classes.m:72 (from existential_type_classes.m:56)
                          func existential_type_classes.call_my_univ_value/1-0 (det)
 mdb> P
        Univ (arg 1)           	my_univ('<<c_pointer>>')
 mdb> 
-     E65:    C34  3 CALL existential_type_classes.m:76 (from existential_type_classes.m:72)
+     E65:    C34 CALL existential_type_classes.m:76 (from existential_type_classes.m:72)
                          func existential_type_classes.my_univ_value/1-0 (det)
 mdb> P
        HeadVar__1             	my_univ('<<c_pointer>>')
 mdb> continue -a
-     E66:    C34  3 EXIT existential_type_classes.m:76 (from existential_type_classes.m:72)
+     E66:    C34 EXIT existential_type_classes.m:76 (from existential_type_classes.m:72)
                          func existential_type_classes.my_univ_value/1-0 (det)
-     E67:    C33  2 EXIT existential_type_classes.m:72 (from existential_type_classes.m:56)
+     E67:    C33 EXIT existential_type_classes.m:72 (from existential_type_classes.m:56)
                          func existential_type_classes.call_my_univ_value/1-0 (det)
-     E68:    C35  2 CALL existential_type_classes.m:68 (from existential_type_classes.m:56)
+     E68:    C35 CALL existential_type_classes.m:68 (from existential_type_classes.m:56)
                          pred existential_type_classes.do_foo/2-0 (det)
 mdb> P
        X (arg 1)              	"something"
Index: tests/debugger/exported_eqv_type.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/exported_eqv_type.exp,v
retrieving revision 1.2
diff -u -r1.2 exported_eqv_type.exp
--- tests/debugger/exported_eqv_type.exp	5 Apr 2004 05:11:34 -0000	1.2
+++ tests/debugger/exported_eqv_type.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred exported_eqv_type.main/2-0 (det) exported_eqv_type.m:18
+      E1:     C1 CALL pred exported_eqv_type.main/2-0 (det) exported_eqv_type.m:18
 mdb> echo on
 Command echo enabled.
 mdb> context none
@@ -7,17 +7,17 @@
 mdb> break p
  0: + stop  interface func exported_eqv_type.p/2-0 (det)
 mdb> continue
-      E2:     C2  2 CALL func exported_eqv_type.p/2-0 (det)
+      E2:     C2 CALL func exported_eqv_type.p/2-0 (det)
 mdb> finish
-      E3:     C2  2 EXIT func exported_eqv_type.p/2-0 (det)
+      E3:     C2 EXIT func exported_eqv_type.p/2-0 (det)
 mdb> print *
        Num (arg 1)            	2
        Item (arg 2)           	55
        Dups (arg 3)           	[55, 55]
 mdb> continue
-      E4:     C3  2 CALL func exported_eqv_type.p/2-0 (det)
+      E4:     C3 CALL func exported_eqv_type.p/2-0 (det)
 mdb> finish
-      E5:     C3  2 EXIT func exported_eqv_type.p/2-0 (det)
+      E5:     C3 EXIT func exported_eqv_type.p/2-0 (det)
 mdb> print *
        Num (arg 1)            	3
        Item (arg 2)           	"a"
Index: tests/debugger/higher_order.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/higher_order.exp,v
retrieving revision 1.4
diff -u -r1.4 higher_order.exp
--- tests/debugger/higher_order.exp	17 Jan 2003 05:56:53 -0000	1.4
+++ tests/debugger/higher_order.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred higher_order.main/2-0 (det) higher_order.m:12
+      E1:     C1 CALL pred higher_order.main/2-0 (det) higher_order.m:12
 mdb> echo on
 Command echo enabled.
 mdb> context none
@@ -7,56 +7,56 @@
 mdb> set depth 100
 mdb> set format flat
 mdb> step
-      E2:     C2  2 CALL pred higher_order.domap/3-0 (det)
+      E2:     C2 CALL pred higher_order.domap/3-0 (det)
 mdb> print *
        HeadVar__1             	float_add2(3.00000000000000)
        HeadVar__2             	[1.00000000000000, 2.00000000000000, 3.00000000000000, 4.00000000000000, 5.00000000000000]
 mdb> finish
-      E3:     C2  2 EXIT pred higher_order.domap/3-0 (det)
+      E3:     C2 EXIT pred higher_order.domap/3-0 (det)
 mdb> print *
        HeadVar__1             	float_add2(3.00000000000000)
        HeadVar__2             	[1.00000000000000, 2.00000000000000, 3.00000000000000, 4.00000000000000, 5.00000000000000]
        HeadVar__3             	[4.00000000000000, 5.00000000000000, 6.00000000000000, 7.00000000000000, 8.00000000000000]
 mdb> step
-      E4:     C3  2 CALL pred higher_order.domap/3-0 (det)
+      E4:     C3 CALL pred higher_order.domap/3-0 (det)
 mdb> print *
        HeadVar__1             	float_op3(4.00000000000000, 5.00000000000000)
        HeadVar__2             	[1.00000000000000, 2.00000000000000, 3.00000000000000, 4.00000000000000, 5.00000000000000]
 mdb> finish
-      E5:     C3  2 EXIT pred higher_order.domap/3-0 (det)
+      E5:     C3 EXIT pred higher_order.domap/3-0 (det)
 mdb> print *
        HeadVar__1             	float_op3(4.00000000000000, 5.00000000000000)
        HeadVar__2             	[1.00000000000000, 2.00000000000000, 3.00000000000000, 4.00000000000000, 5.00000000000000]
        HeadVar__3             	[9.00000000000000, 14.0000000000000, 19.0000000000000, 24.0000000000000, 29.0000000000000]
 mdb> step
-      E6:     C4  2 CALL pred higher_order.domap/3-0 (det)
+      E6:     C4 CALL pred higher_order.domap/3-0 (det)
 mdb> print *
        HeadVar__1             	max(3)
        HeadVar__2             	[1, 2, 3, 4, 5]
 mdb> finish
-      E7:     C4  2 EXIT pred higher_order.domap/3-0 (det)
+      E7:     C4 EXIT pred higher_order.domap/3-0 (det)
 mdb> print *
        HeadVar__1             	max(3)
        HeadVar__2             	[1, 2, 3, 4, 5]
        HeadVar__3             	[3, 3, 3, 4, 5]
 mdb> step
-      E8:     C5  2 CALL pred higher_order.domap/3-0 (det)
+      E8:     C5 CALL pred higher_order.domap/3-0 (det)
 mdb> print *
        HeadVar__1             	'IntroducedFrom__pred__main__21__1'([6])
        HeadVar__2             	[[1, 2], [3, 4, 5]]
 mdb> finish
-      E9:     C5  2 EXIT pred higher_order.domap/3-0 (det)
+      E9:     C5 EXIT pred higher_order.domap/3-0 (det)
 mdb> print *
        HeadVar__1             	'IntroducedFrom__pred__main__21__1'([6])
        HeadVar__2             	[[1, 2], [3, 4, 5]]
        HeadVar__3             	[[6, 1, 2], [6, 3, 4, 5]]
 mdb> step
-     E10:     C6  2 CALL pred higher_order.domap/3-0 (det)
+     E10:     C6 CALL pred higher_order.domap/3-0 (det)
 mdb> print *
        HeadVar__1             	'IntroducedFrom__pred__main__22__2'(["a"])
        HeadVar__2             	[["one", "two"], ["three", "four", "five"]]
 mdb> finish
-     E11:     C6  2 EXIT pred higher_order.domap/3-0 (det)
+     E11:     C6 EXIT pred higher_order.domap/3-0 (det)
 mdb> print *
        HeadVar__1             	'IntroducedFrom__pred__main__22__2'(["a"])
        HeadVar__2             	[["one", "two"], ["three", "four", "five"]]
Index: tests/debugger/interpreter.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/interpreter.exp2,v
retrieving revision 1.17
diff -u -r1.17 interpreter.exp2
--- tests/debugger/interpreter.exp2	17 Jan 2003 05:56:53 -0000	1.17
+++ tests/debugger/interpreter.exp2	10 Nov 2004 23:25:52 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred interpreter.main/2-0 (det) interpreter.m:34
+      E1:     C1 CALL pred interpreter.main/2-0 (det) interpreter.m:34
 mdb> echo on
 Command echo enabled.
 mdb> context none
@@ -9,7 +9,7 @@
 mdb> c
 Pure Prolog Interpreter.
 
-      E2:     C2  3 CALL pred interpreter.consult/5-0 (det)
+      E2:     C2 CALL pred interpreter.consult/5-0 (det)
 mdb> delete 0
  0: E stop  interface pred interpreter.consult/5-0 (det)
 mdb> vars
@@ -24,11 +24,11 @@
  0: + stop  interface pred interpreter.database_assert_clause/4-0 (det)
 mdb> c
 Consulting file `interpreter.m'...
-      E3:     C3  6 CALL pred interpreter.database_assert_clause/4-0 (det)
+      E3:     C3 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)
+      E4:     C3 EXIT pred interpreter.database_assert_clause/4-0 (det)
 mdb> print *
        Database (arg 1)       	[]
        VarSet (arg 2)         	varset(var_supply(0), empty, empty)
@@ -42,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> 
-      E5:     C4  6 CALL pred interpreter.consult_until_eof/4-0 (det)
+      E5:     C4 CALL pred interpreter.consult_until_eof/4-0 (det)
 mdb> finish -n
-      E6:     C4  6 EXIT pred interpreter.consult_until_eof/4-0 (det)
+      E6:     C4 EXIT pred interpreter.consult_until_eof/4-0 (det)
 mdb> 
-      E7:     C5  5 EXIT pred interpreter.consult_until_eof_2/5-0 (det)
+      E7:     C5 EXIT pred interpreter.consult_until_eof_2/5-0 (det)
 mdb> 
-      E8:     C6  4 EXIT pred interpreter.consult_until_eof/4-0 (det)
+      E8:     C6 EXIT pred interpreter.consult_until_eof/4-0 (det)
 mdb> continue
 ?- 
Index: tests/debugger/lambda_expr.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/lambda_expr.exp,v
retrieving revision 1.1
diff -u -r1.1 lambda_expr.exp
--- tests/debugger/lambda_expr.exp	19 Jul 2004 03:37:52 -0000	1.1
+++ tests/debugger/lambda_expr.exp	10 Nov 2004 23:24:25 -0000
@@ -1,11 +1,11 @@
-      E1:     C1  1 CALL pred lambda_expr.main/2-0 (det) lambda_expr.m:17
+      E1:     C1 CALL pred lambda_expr.main/2-0 (det) lambda_expr.m:17
 mdb> echo on
 Command echo enabled.
 mdb> context none
 Contexts will not be printed.
 mdb> register --quiet
 mdb> step
-      E2:     C2  2 CALL pred lambda_expr.IntroducedFrom__pred__main__18__1/2-0 (det)
+      E2:     C2 CALL pred lambda_expr.IntroducedFrom__pred__main__18__1/2-0 (det)
 mdb> print
 IntroducedFrom__pred__main__18__1(1, _)
 mdb> up
@@ -14,14 +14,14 @@
 mdb> print P
        P                      	'IntroducedFrom__pred__main__18__1'
 mdb> finish ; print
-      E3:     C2  2 EXIT pred lambda_expr.IntroducedFrom__pred__main__18__1/2-0 (det)
+      E3:     C2 EXIT pred lambda_expr.IntroducedFrom__pred__main__18__1/2-0 (det)
 IntroducedFrom__pred__main__18__1(1, 2)
 mdb> retry
-      E2:     C2  2 CALL pred lambda_expr.IntroducedFrom__pred__main__18__1/2-0 (det)
+      E2:     C2 CALL pred lambda_expr.IntroducedFrom__pred__main__18__1/2-0 (det)
 mdb> print
 IntroducedFrom__pred__main__18__1(1, _)
 mdb> finish
-      E3:     C2  2 EXIT pred lambda_expr.IntroducedFrom__pred__main__18__1/2-0 (det)
+      E3:     C2 EXIT pred lambda_expr.IntroducedFrom__pred__main__18__1/2-0 (det)
 mdb> print
 IntroducedFrom__pred__main__18__1(1, 2)
 mdb> continue
Index: tests/debugger/loopcheck.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/loopcheck.exp3,v
retrieving revision 1.1
diff -u -r1.1 loopcheck.exp3
--- tests/debugger/loopcheck.exp3	10 Nov 2004 02:21:40 -0000	1.1
+++ tests/debugger/loopcheck.exp3	11 Nov 2004 06:26:23 -0000
@@ -1,11 +1,10 @@
        1:      1  1 CALL pred loopcheck.main/2-0 (det) loopcheck.m:13
 mdb> echo on
 Command echo enabled.
+mdb> register --quiet
 mdb> context nextline
 Contexts will be printed on the next line.
 mdb> break loopcheck.main
-Registering debuggable procedures... done.
-There are 97 debuggable modules, with a total of 5317 procedures.
  0: + stop  interface pred loopcheck.main/2-0 (det)
 mdb> break loopcheck.loop
  1: + stop  interface pred loopcheck.loop/1-0 (det)
Index: tests/debugger/loopcheck.inp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/loopcheck.inp2,v
retrieving revision 1.1
diff -u -r1.1 loopcheck.inp2
--- tests/debugger/loopcheck.inp2	10 Nov 2004 02:21:40 -0000	1.1
+++ tests/debugger/loopcheck.inp2	11 Nov 2004 06:04:37 -0000
@@ -1,4 +1,5 @@
 echo on
+register --quiet
 context nextline
 break loopcheck.main
 break loopcheck.loop
Index: tests/debugger/nondet_stack.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/nondet_stack.exp,v
retrieving revision 1.11
diff -u -r1.11 nondet_stack.exp
--- tests/debugger/nondet_stack.exp	2 Sep 2004 04:31:41 -0000	1.11
+++ tests/debugger/nondet_stack.exp	10 Nov 2004 23:24:25 -0000
@@ -1,11 +1,11 @@
-      E1:     C1  1 CALL pred nondet_stack.main/2-0 (cc_multi) nondet_stack.m:NNNN
+      E1:     C1 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 22
-      E2:     C2  6 SWTC pred nondet_stack.qperm/2-0 (nondet) s2;
+      E2:     C2 SWTC pred nondet_stack.qperm/2-0 (nondet) s2;
 mdb> nondet_stack 3
 non 135: ordinary, 13 words
  redoip: unnamed label
@@ -190,7 +190,7 @@
  succip: label wrapper_not_reached
  succfr: non   4
 mdb> goto 39
-      E3:     C3  3 CALL pred nondet_stack.safe/1-0 (semidet)
+      E3:     C3 CALL pred nondet_stack.safe/1-0 (semidet)
 mdb> nondet_stack
 non 217: temp
  redoip: label UNKNOWN
@@ -481,7 +481,7 @@
 mdb> break nondet_stack__test
  0: + stop  interface pred nondet_stack.test/2-0 (nondet)
 mdb> continue
-      E4:     C4  2 CALL pred nondet_stack.test/2-0 (nondet)
+      E4:     C4 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.12
diff -u -r1.12 nondet_stack.exp2
--- tests/debugger/nondet_stack.exp2	2 Sep 2004 04:31:41 -0000	1.12
+++ tests/debugger/nondet_stack.exp2	11 Nov 2004 06:06:21 -0000
@@ -1,11 +1,11 @@
-      E1:     C1  1 CALL pred nondet_stack.main/2-0 (cc_multi) nondet_stack.m:NNNN
+      E1:     C1 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 22
-      E2:     C2  6 SWTC pred nondet_stack.qperm/2-0 (nondet) s2;
+      E2:     C2 SWTC pred nondet_stack.qperm/2-0 (nondet) s2;
 mdb> nondet_stack 3
 non 162: ordinary, 16 words
  redoip: unnamed label
@@ -190,7 +190,7 @@
  succip: label wrapper_not_reached
  succfr: non   4
 mdb> goto 39
-      E3:     C3  3 CALL pred nondet_stack.safe/1-0 (semidet)
+      E3:     C3 CALL pred nondet_stack.safe/1-0 (semidet)
 mdb> nondet_stack
 non 258: temp
  redoip: label UNKNOWN
@@ -481,7 +481,7 @@
 mdb> break nondet_stack__test
  0: + stop  interface pred nondet_stack.test/2-0 (nondet)
 mdb> continue
-      E4:     C4  2 CALL pred nondet_stack.test/2-0 (nondet)
+      E4:     C4 CALL pred nondet_stack.test/2-0 (nondet)
 mdb> nondet_stack
 non 341: ordinary, 16 words
  redoip: unnamed label
Index: tests/debugger/polymorphic_output.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/polymorphic_output.exp,v
retrieving revision 1.12
diff -u -r1.12 polymorphic_output.exp
--- tests/debugger/polymorphic_output.exp	5 Apr 2004 07:18:58 -0000	1.12
+++ tests/debugger/polymorphic_output.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred polymorphic_output.main/2-0 (det) polymorphic_output.m:20
+      E1:     C1 CALL pred polymorphic_output.main/2-0 (det) polymorphic_output.m:20
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -7,7 +7,7 @@
 mdb> b functor_names
  0: + stop  interface func polymorphic_output.functor_names/1-0 (det)
 mdb> c
-      E2:     C2  2 CALL func polymorphic_output.functor_names/1-0 (det)
+      E2:     C2 CALL func polymorphic_output.functor_names/1-0 (det)
 mdb> delete 0
  0: E stop  interface func polymorphic_output.functor_names/1-0 (det)
 mdb> p goal
Index: tests/debugger/polymorphic_output.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/polymorphic_output.exp2,v
retrieving revision 1.16
diff -u -r1.16 polymorphic_output.exp2
--- tests/debugger/polymorphic_output.exp2	5 Apr 2004 07:18:58 -0000	1.16
+++ tests/debugger/polymorphic_output.exp2	11 Nov 2004 10:53:59 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred polymorphic_output.main/2-0 (det) polymorphic_output.m:20
+      E1:     C1 CALL pred polymorphic_output.main/2-0 (det) polymorphic_output.m:20
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -7,7 +7,7 @@
 mdb> b functor_names
  0: + stop  interface func polymorphic_output.functor_names/1-0 (det)
 mdb> c
-      E2:     C2  2 CALL func polymorphic_output.functor_names/1-0 (det)
+      E2:     C2 CALL func polymorphic_output.functor_names/1-0 (det)
 mdb> delete 0
  0: E stop  interface func polymorphic_output.functor_names/1-0 (det)
 mdb> p goal
@@ -54,12 +54,12 @@
 mdb> b std_util__det_arg
  0: + stop  interface func std_util.det_arg/2-0 (det)
 mdb> c
-      E3:     C3  4 CALL func std_util.det_arg/2-0 (det)
+      E3:     C3 CALL func std_util.det_arg/2-0 (det)
 mdb> P
        Type (arg 1)           	two("three", 3, three("four", 4, "one", 1, empty, empty, empty), two/4)
        Index (arg 2)          	3
 mdb> f
-      E4:     C3  4 EXCP func std_util.det_arg/2-0 (det)
+      E4:     C3 EXCP func std_util.det_arg/2-0 (det)
 mdb> P
        Type (arg 1)           	two("three", 3, three("four", 4, "one", 1, empty, empty, empty), two/4)
        Index (arg 2)          	3
Index: tests/debugger/polymorphic_output.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/polymorphic_output.exp3,v
retrieving revision 1.9
diff -u -r1.9 polymorphic_output.exp3
--- tests/debugger/polymorphic_output.exp3	10 Nov 2004 02:21:40 -0000	1.9
+++ tests/debugger/polymorphic_output.exp3	11 Nov 2004 06:05:26 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred polymorphic_output.main/2-0 (det) polymorphic_output.m:20
+      E1:     C1 CALL pred polymorphic_output.main/2-0 (det) polymorphic_output.m:20
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -7,7 +7,7 @@
 mdb> b functor_names
  0: + stop  interface func polymorphic_output.functor_names/1-0 (det)
 mdb> c
-      E2:     C2  2 CALL func polymorphic_output.functor_names/1-0 (det)
+      E2:     C2 CALL func polymorphic_output.functor_names/1-0 (det)
 mdb> delete 0
  0: E stop  interface func polymorphic_output.functor_names/1-0 (det)
 mdb> p goal
@@ -54,12 +54,12 @@
 mdb> b std_util__det_arg
  0: + stop  interface func std_util.det_arg/2-0 (det)
 mdb> c
-      E3:     C3  4 CALL func std_util.det_arg/2-0 (det)
+      E3:     C3 CALL func std_util.det_arg/2-0 (det)
 mdb> P
        Type (arg 1)           	two("three", 3, three("four", 4, "one", 1, empty, empty, empty), two/4)
        Index (arg 2)          	3
 mdb> f
-      E4:     C3  4 EXCP func std_util.det_arg/2-0 (det)
+      E4:     C3 EXCP func std_util.det_arg/2-0 (det)
 mdb> P
        Type (arg 1)           	two("three", 3, three("four", 4, "one", 1, empty, empty, empty), two/4)
        Index (arg 2)          	3
Index: tests/debugger/print_goal.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/print_goal.exp,v
retrieving revision 1.6
diff -u -r1.6 print_goal.exp
--- tests/debugger/print_goal.exp	17 Jan 2003 05:56:55 -0000	1.6
+++ tests/debugger/print_goal.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred print_goal.main/2-0 (det) print_goal.m:12
+      E1:     C1 CALL pred print_goal.main/2-0 (det) print_goal.m:12
 mdb> echo on
 Command echo enabled.
 mdb> context none
@@ -9,16 +9,16 @@
 mdb> b print_goal
  1: + stop  interface pred print_goal.print_goal/9-0 (det)
 mdb> c
-      E2:     C2  2 CALL pred print_goal.big_data/1-0 (det)
+      E2:     C2 CALL pred print_goal.big_data/1-0 (det)
 mdb> p goal
 big_data(_)
 mdb> finish
-      E3:     C2  2 EXIT pred print_goal.big_data/1-0 (det)
+      E3:     C2 EXIT pred print_goal.big_data/1-0 (det)
 mdb> p goal
 big_data(big(big(big/3, 2, small), 3, big(big/3, 6, small)))
 mdb> c
 big(big(big(small, 1, small), 2, small), 3, big(big(small, 4, big(small, 5, small)), 6, small)).
-      E4:     C3  2 CALL pred print_goal.print_goal/9-0 (det)
+      E4:     C3 CALL pred print_goal.print_goal/9-0 (det)
 mdb> v
         1 HeadVar__1
         2 _W (arg 2)
@@ -28,7 +28,7 @@
 mdb> p goal
 print_goal(yes, 100, 101, _, _, 102, _, state(<<c_pointer>>), _)
 mdb> finish
-      E5:     C3  2 EXIT pred print_goal.print_goal/9-0 (det)
+      E5:     C3 EXIT pred print_goal.print_goal/9-0 (det)
 mdb> v
         1 HeadVar__1
         2 _W (arg 2)
@@ -43,7 +43,7 @@
 mdb> c
 103.
 103.
-      E6:     C4  2 CALL pred print_goal.print_goal/9-0 (det)
+      E6:     C4 CALL pred print_goal.print_goal/9-0 (det)
 mdb> v
         1 HeadVar__1
         2 _W (arg 2)
@@ -51,7 +51,7 @@
         4 Y (arg 6)
         5 DCG_0 (arg 8)
 mdb> finish
-      E7:     C4  2 EXIT pred print_goal.print_goal/9-0 (det)
+      E7:     C4 EXIT pred print_goal.print_goal/9-0 (det)
 mdb> v
         1 HeadVar__1
         2 _W (arg 2)
Index: tests/debugger/print_table.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/print_table.exp,v
retrieving revision 1.7
diff -u -r1.7 print_table.exp
--- tests/debugger/print_table.exp	20 Jul 2004 04:41:36 -0000	1.7
+++ tests/debugger/print_table.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred print_table.main/2-0 (det) print_table.m:13
+      E1:     C1 CALL pred print_table.main/2-0 (det) print_table.m:13
 mdb> echo on
 Command echo enabled.
 mdb> context none
@@ -9,9 +9,9 @@
 mdb> b p
  0: + stop  interface pred print_table.p/3-0 (det)
 mdb> c
-      E2:     C2  2 CALL pred print_table.p/3-0 (det)
+      E2:     C2 CALL pred print_table.p/3-0 (det)
 mdb> f -n
-      E3:     C2  2 EXIT pred print_table.p/3-0 (det)
+      E3:     C2 EXIT pred print_table.p/3-0 (det)
 mdb> table p
 memo table for pred print_table.p/3-0 (det):
 <5, 0>: succeeded <0>
@@ -33,9 +33,9 @@
 mdb> table p 5 2
 <5, 2>: succeeded <15>
 mdb> c
-      E4:     C3  2 CALL pred print_table.p/3-0 (det)
+      E4:     C3 CALL pred print_table.p/3-0 (det)
 mdb> f -n
-      E5:     C3  2 EXIT pred print_table.p/3-0 (det)
+      E5:     C3 EXIT pred print_table.p/3-0 (det)
 mdb> table p
 memo table for pred print_table.p/3-0 (det):
 <4, 0>: succeeded <0>
@@ -70,9 +70,9 @@
 mdb> table p 4 2
 <4, 2>: succeeded <12>
 mdb> c
-      E6:     C4  2 CALL pred print_table.p/3-0 (det)
+      E6:     C4 CALL pred print_table.p/3-0 (det)
 mdb> f -n
-      E7:     C4  2 EXIT pred print_table.p/3-0 (det)
+      E7:     C4 EXIT pred print_table.p/3-0 (det)
 mdb> table p
 memo table for pred print_table.p/3-0 (det):
 <2, 0>: succeeded <0>
@@ -110,9 +110,9 @@
 mdb> table p 2 1
 <2, 1>: succeeded <2>
 mdb> c
-      E8:     C5  2 CALL pred print_table.p/3-0 (det)
+      E8:     C5 CALL pred print_table.p/3-0 (det)
 mdb> f -n
-      E9:     C5  2 EXIT pred print_table.p/3-0 (det)
+      E9:     C5 EXIT pred print_table.p/3-0 (det)
 mdb> table p
 memo table for pred print_table.p/3-0 (det):
 <1, 0>: succeeded <0>
@@ -157,9 +157,9 @@
 mdb> b q
  1: + stop  interface pred print_table.q/3-0 (semidet)
 mdb> c
-     E10:     C6  2 CALL pred print_table.q/3-0 (semidet)
+     E10:     C6 CALL pred print_table.q/3-0 (semidet)
 mdb> f -n
-     E11:     C6  2 EXIT pred print_table.q/3-0 (semidet)
+     E11:     C6 EXIT pred print_table.q/3-0 (semidet)
 mdb> table q
 memo table for pred print_table.q/3-0 (semidet):
 <3, 0>: succeeded <0>
@@ -177,9 +177,9 @@
 mdb> table q 4
 call table does not contain 4 in argument position 1.
 mdb> c
-     E12:     C7  2 CALL pred print_table.q/3-0 (semidet)
+     E12:     C7 CALL pred print_table.q/3-0 (semidet)
 mdb> f -n
-     E13:     C7  2 FAIL pred print_table.q/3-0 (semidet)
+     E13:     C7 FAIL pred print_table.q/3-0 (semidet)
 mdb> table q
 memo table for pred print_table.q/3-0 (semidet):
 <3, 0>: succeeded <0>
@@ -209,12 +209,12 @@
 mdb> b r
  1: + stop  interface pred print_table.r/2-0 (det)
 mdb> c
-     E14:     C8  2 CALL pred print_table.r/2-0 (det)
+     E14:     C8 CALL pred print_table.r/2-0 (det)
 mdb> table r
 memo table for pred print_table.r/2-0 (det):
 end of table (0 entries)
 mdb> s
-     E15:     C8  2 COND pred print_table.r/2-0 (det)
+     E15:     C8 COND pred print_table.r/2-0 (det)
 mdb> table r
 memo table for pred print_table.r/2-0 (det):
 <3>: working
@@ -222,13 +222,13 @@
 mdb> table r 3
 <3>: working
 mdb> c
-     E16:     C9  3 CALL pred print_table.r/2-0 (det)
+     E16:     C9 CALL pred print_table.r/2-0 (det)
 mdb> table r
 memo table for pred print_table.r/2-0 (det):
 <3>: working
 end of table (1 entry)
 mdb> f -n
-     E17:     C9  3 EXIT pred print_table.r/2-0 (det)
+     E17:     C9 EXIT pred print_table.r/2-0 (det)
 mdb> table r
 memo table for pred print_table.r/2-0 (det):
 <0>: succeeded <0>
@@ -237,7 +237,7 @@
 <3>: working
 end of table (4 entries)
 mdb> f -n 1
-     E18:     C8  2 EXIT pred print_table.r/2-0 (det)
+     E18:     C8 EXIT pred print_table.r/2-0 (det)
 mdb> table r
 memo table for pred print_table.r/2-0 (det):
 <0>: succeeded <0>
@@ -250,20 +250,20 @@
 mdb> b s
  1: + stop  interface pred print_table.s/6-0 (det)
 mdb> c
-     E19:    C10  2 CALL pred print_table.s/6-0 (det)
+     E19:    C10 CALL pred print_table.s/6-0 (det)
 mdb> table s
 memo table for pred print_table.s/6-0 (det):
 end of table (0 entries)
 mdb> f -n
-     E20:    C10  2 EXIT pred print_table.s/6-0 (det)
+     E20:    C10 EXIT pred print_table.s/6-0 (det)
 mdb> table s
 memo table for pred print_table.s/6-0 (det):
 <3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
 end of table (1 entry)
 mdb> c
-     E21:    C11  2 CALL pred print_table.s/6-0 (det)
+     E21:    C11 CALL pred print_table.s/6-0 (det)
 mdb> f -n
-     E22:    C11  2 EXIT pred print_table.s/6-0 (det)
+     E22:    C11 EXIT pred print_table.s/6-0 (det)
 mdb> table s
 memo table for pred print_table.s/6-0 (det):
 <3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
@@ -285,17 +285,17 @@
 <3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
 end of table (1 entry)
 mdb> c
-     E23:    C12  2 CALL pred print_table.s/6-0 (det)
+     E23:    C12 CALL pred print_table.s/6-0 (det)
 mdb> f -n
-     E24:    C12  2 EXIT pred print_table.s/6-0 (det)
+     E24:    C12 EXIT pred print_table.s/6-0 (det)
 mdb> c
-     E25:    C13  2 CALL pred print_table.s/6-0 (det)
+     E25:    C13 CALL pred print_table.s/6-0 (det)
 mdb> f -n
-     E26:    C13  2 EXIT pred print_table.s/6-0 (det)
+     E26:    C13 EXIT pred print_table.s/6-0 (det)
 mdb> c
-     E27:    C14  2 CALL pred print_table.s/6-0 (det)
+     E27:    C14 CALL pred print_table.s/6-0 (det)
 mdb> f -n
-     E28:    C14  2 EXIT pred print_table.s/6-0 (det)
+     E28:    C14 EXIT pred print_table.s/6-0 (det)
 mdb> table s
 memo table for pred print_table.s/6-0 (det):
 <3.500000, 1, "abc", 1>: succeeded <"[3.5abc1]", 4.500000>
@@ -351,18 +351,18 @@
 mdb> b t
  1: + stop  interface pred print_table.t/3-0 (nondet)
 mdb> c
-     E29:    C15  2 CALL pred print_table.t/3-0 (nondet)
+     E29:    C15 CALL pred print_table.t/3-0 (nondet)
 mdb> table t
 memo table for pred print_table.t/3-0 (nondet):
 end of table (0 entries)
 mdb> s
-     E30:    C15  2 DISJ pred print_table.t/3-0 (nondet)
+     E30:    C15 DISJ pred print_table.t/3-0 (nondet)
 mdb> table t
 memo table for pred print_table.t/3-0 (nondet):
 <1, 2>: active
 end of table (1 entry)
 mdb> finish
-     E31:    C15  2 EXIT pred print_table.t/3-0 (nondet)
+     E31:    C15 EXIT pred print_table.t/3-0 (nondet)
 mdb> table t
 memo table for pred print_table.t/3-0 (nondet):
 <1, 2>: incomplete
@@ -373,7 +373,7 @@
 mdb> b tdone
  1: + stop  interface pred print_table.tdone/0-0 (det)
 mdb> c
-     E32:    C16  2 CALL pred print_table.tdone/0-0 (det)
+     E32:    C16 CALL pred print_table.tdone/0-0 (det)
 mdb> table t
 memo table for pred print_table.t/3-0 (nondet):
 <1, 2>: complete
Index: tests/debugger/queens.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/queens.exp,v
retrieving revision 1.27
diff -u -r1.27 queens.exp
--- tests/debugger/queens.exp	20 Jun 2003 12:33:55 -0000	1.27
+++ tests/debugger/queens.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred queens.main/2-0 (cc_multi) queens.m:17
+      E1:     C1 CALL pred queens.main/2-0 (cc_multi) queens.m:17
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -9,21 +9,21 @@
 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:24 (queens.m:15)
+      E2:     C2 CALL pred queens.data/1-0 (det) queens.m:24 (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> 
-      E3:     C2  2 EXIT pred queens.data/1-0 (det) queens.m:24 (queens.m:15)
+      E3:     C2 EXIT pred queens.data/1-0 (det) queens.m:24 (queens.m:15)
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> 
-      E4:     C3  2 CALL pred queens.queen/2-0 (nondet) queens.m:29 (queens.m:15)
+      E4:     C3 CALL pred queens.queen/2-0 (nondet) queens.m:29 (queens.m:15)
 mdb> print *
        Data (arg 1)           	[1, 2, 3, 4, 5]
 mdb> 
-      E5:     C4  3 CALL pred queens.qperm/2-0 (nondet) queens.m:36 (queens.m:30)
+      E5:     C4 CALL pred queens.qperm/2-0 (nondet) queens.m:36 (queens.m:30)
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> print_optionals on
@@ -34,15 +34,15 @@
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> 
-      E6:     C4  3 SWTC pred queens.qperm/2-0 (nondet) s2; queens.m:37
+      E6:     C4 SWTC pred queens.qperm/2-0 (nondet) s2; queens.m:37
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> 
-      E7:     C5  4 CALL pred queens.qdelete/3-0 (nondet) queens.m:45 (queens.m:38)
+      E7:     C5 CALL pred queens.qdelete/3-0 (nondet) queens.m:45 (queens.m:38)
 mdb> print *
        HeadVar__2             	[1, 2, 3, 4, 5]
 mdb> 
-      E8:     C5  4 DISJ pred queens.qdelete/3-0 (nondet) c2;d1; queens.m:45
+      E8:     C5 DISJ pred queens.qdelete/3-0 (nondet) c2;d1; queens.m:45
 mdb> print *
        HeadVar__2             	[1, 2, 3, 4, 5]
 mdb> level 1
@@ -83,7 +83,7 @@
 mdb> print *
        Data (arg 1)           	[1, 2, 3, 4, 5]
 mdb> 
-      E9:     C5  4 EXIT queens.m:45 (from queens.m:38)
+      E9:     C5 EXIT queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
 mdb> print HeadVar__1
        HeadVar__1             	1
@@ -92,45 +92,45 @@
 mdb> print HeadVar__3
        HeadVar__3             	[2, 3, 4, 5]
 mdb> 
-     E10:     C6  4 CALL queens.m:36 (from queens.m:40)
+     E10:     C6 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> print *
        HeadVar__1             	[2, 3, 4, 5]
 mdb> 
-     E11:     C6  4 SWTC queens.m:37
+     E11:     C6 SWTC queens.m:37
                          pred queens.qperm/2-0 (nondet) s2;
 mdb> print *
        HeadVar__1             	[2, 3, 4, 5]
 mdb> 
-     E12:     C7  5 CALL queens.m:45 (from queens.m:38)
+     E12:     C7 CALL queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
 mdb> print *
        HeadVar__2             	[2, 3, 4, 5]
 mdb> 
-     E13:     C7  5 DISJ queens.m:45
+     E13:     C7 DISJ queens.m:45
                          pred queens.qdelete/3-0 (nondet) c2;d1;
 mdb> print *
        HeadVar__2             	[2, 3, 4, 5]
 mdb> 
-     E14:     C7  5 EXIT queens.m:45 (from queens.m:38)
+     E14:     C7 EXIT queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
 mdb> print *
        HeadVar__1             	2
        HeadVar__2             	[2, 3, 4, 5]
        HeadVar__3             	[3, 4, 5]
 mdb> 
-     E15:     C8  5 CALL queens.m:36 (from queens.m:40)
+     E15:     C8 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> goto -a 21
-     E16:     C8  5 SWTC queens.m:37
+     E16:     C8 SWTC queens.m:37
                          pred queens.qperm/2-0 (nondet) s2;
-     E17:     C9  6 CALL queens.m:45 (from queens.m:38)
+     E17:     C9 CALL queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E18:     C9  6 DISJ queens.m:45
+     E18:     C9 DISJ queens.m:45
                          pred queens.qdelete/3-0 (nondet) c2;d1;
-     E19:     C9  6 EXIT queens.m:45 (from queens.m:38)
+     E19:     C9 EXIT queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E20:    C10  6 CALL queens.m:36 (from queens.m:40)
+     E20:    C10 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> stack
    0    4* pred queens.qperm/2-0 (nondet) (queens.m:36 and others)
@@ -154,41 +154,41 @@
 mdb> print *
        HeadVar__1             	[4, 5]
 mdb> 
-     E21:    C10  6 SWTC queens.m:37
+     E21:    C10 SWTC queens.m:37
                          pred queens.qperm/2-0 (nondet) s2;
 mdb> retry
-     E20:    C10  6 CALL queens.m:36 (from queens.m:40)
+     E20:    C10 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> print *
        HeadVar__1             	[4, 5]
 mdb> finish -a
-     E21:    C10  6 SWTC queens.m:37
+     E21:    C10 SWTC queens.m:37
                          pred queens.qperm/2-0 (nondet) s2;
-     E22:    C11  7 CALL queens.m:45 (from queens.m:38)
+     E22:    C11 CALL queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E23:    C11  7 DISJ queens.m:45
+     E23:    C11 DISJ queens.m:45
                          pred queens.qdelete/3-0 (nondet) c2;d1;
-     E24:    C11  7 EXIT queens.m:45 (from queens.m:38)
+     E24:    C11 EXIT queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E25:    C12  7 CALL queens.m:36 (from queens.m:40)
+     E25:    C12 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E26:    C12  7 SWTC queens.m:37
+     E26:    C12 SWTC queens.m:37
                          pred queens.qperm/2-0 (nondet) s2;
-     E27:    C13  8 CALL queens.m:45 (from queens.m:38)
+     E27:    C13 CALL queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E28:    C13  8 DISJ queens.m:45
+     E28:    C13 DISJ queens.m:45
                          pred queens.qdelete/3-0 (nondet) c2;d1;
-     E29:    C13  8 EXIT queens.m:45 (from queens.m:38)
+     E29:    C13 EXIT queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E30:    C14  8 CALL queens.m:36 (from queens.m:40)
+     E30:    C14 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E31:    C14  8 SWTC queens.m:36
+     E31:    C14 SWTC queens.m:36
                          pred queens.qperm/2-0 (nondet) s1;
-     E32:    C14  8 EXIT queens.m:36 (from queens.m:40)
+     E32:    C14 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E33:    C12  7 EXIT queens.m:36 (from queens.m:40)
+     E33:    C12 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E34:    C10  6 EXIT queens.m:36 (from queens.m:40)
+     E34:    C10 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> register --quiet
 mdb> break print_list
@@ -196,43 +196,43 @@
 mdb> break qdelete
  1: + stop  interface pred queens.qdelete/3-0 (nondet)
 mdb> continue -a
-     E35:     C8  5 EXIT queens.m:36 (from queens.m:40)
+     E35:     C8 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E36:     C6  4 EXIT queens.m:36 (from queens.m:40)
+     E36:     C6 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E37:     C4  3 EXIT queens.m:36 (from queens.m:30)
+     E37:     C4 EXIT queens.m:36 (from queens.m:30)
                          pred queens.qperm/2-0 (nondet)
-     E38:    C15  3 CALL queens.m:52 (from queens.m:31)
+     E38:    C15 CALL queens.m:52 (from queens.m:31)
                          pred queens.safe/1-0 (semidet)
-     E39:    C15  3 SWTC queens.m:53
+     E39:    C15 SWTC queens.m:53
                          pred queens.safe/1-0 (semidet) s2;
-     E40:    C16  4 CALL queens.m:60 (from queens.m:54)
+     E40:    C16 CALL queens.m:60 (from queens.m:54)
                          pred queens.nodiag/3-0 (semidet)
-     E41:    C16  4 SWTC queens.m:61
+     E41:    C16 SWTC queens.m:61
                          pred queens.nodiag/3-0 (semidet) s2;
-     E42:    C16  4 COND queens.m:64
+     E42:    C16 COND queens.m:64
                          pred queens.nodiag/3-0 (semidet) s2;c6;?;
-     E43:    C16  4 THEN queens.m:65
+     E43:    C16 THEN queens.m:65
                          pred queens.nodiag/3-0 (semidet) s2;c6;t;
-     E44:    C16  4 FAIL queens.m:60 (from queens.m:54)
+     E44:    C16 FAIL queens.m:60 (from queens.m:54)
                          pred queens.nodiag/3-0 (semidet)
-     E45:    C15  3 FAIL queens.m:52 (from queens.m:31)
+     E45:    C15 FAIL queens.m:52 (from queens.m:31)
                          pred queens.safe/1-0 (semidet)
-     E46:     C4  3 REDO queens.m:36 (from queens.m:30)
+     E46:     C4 REDO queens.m:36 (from queens.m:30)
                          pred queens.qperm/2-0 (nondet)
-     E47:     C6  4 REDO queens.m:36 (from queens.m:40)
+     E47:     C6 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E48:     C8  5 REDO queens.m:36 (from queens.m:40)
+     E48:     C8 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E49:    C10  6 REDO queens.m:36 (from queens.m:40)
+     E49:    C10 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E50:    C12  7 REDO queens.m:36 (from queens.m:40)
+     E50:    C12 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E51:    C14  8 REDO queens.m:36 (from queens.m:40)
+     E51:    C14 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E52:    C14  8 FAIL queens.m:36 (from queens.m:40)
+     E52:    C14 FAIL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E53:    C13  8 REDO queens.m:45 (from queens.m:38)
+     E53:    C13 REDO queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
 mdb> break info
  0: + stop  interface pred queens.print_list/3-0 (det)
@@ -241,74 +241,74 @@
  0: + stop  interface pred queens.print_list/3-0 (det)
  1: + stop  interface pred queens.qdelete/3-0 (nondet)
 mdb> step -aS 5
-     E54:    C13  8 DISJ queens.m:46
+     E54:    C13 DISJ queens.m:46
                          pred queens.qdelete/3-0 (nondet) c2;d2;
-     E55:    C17  9 CALL queens.m:45 (from queens.m:47)
+     E55:    C17 CALL queens.m:45 (from queens.m:47)
                          pred queens.qdelete/3-0 (nondet)
-     E56:    C17  9 FAIL queens.m:45 (from queens.m:47)
+     E56:    C17 FAIL queens.m:45 (from queens.m:47)
                          pred queens.qdelete/3-0 (nondet)
-     E57:    C13  8 FAIL queens.m:45 (from queens.m:38)
+     E57:    C13 FAIL queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E58:    C12  7 FAIL queens.m:36 (from queens.m:40)
+     E58:    C12 FAIL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> disable 1
  1: - stop  interface pred queens.qdelete/3-0 (nondet)
 mdb> retry 4
-      E5:     C4  3 CALL queens.m:36 (from queens.m:30)
+      E5:     C4 CALL queens.m:36 (from queens.m:30)
                          pred queens.qperm/2-0 (nondet)
 mdb> break 40
  2: + stop  linenumber queens.m:40
 mdb> continue -n
-     E10:     C6  4 CALL queens.m:36 (from queens.m:40)
+     E10:     C6 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E15:     C8  5 CALL queens.m:36 (from queens.m:40)
+     E15:     C8 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E20:    C10  6 CALL queens.m:36 (from queens.m:40)
+     E20:    C10 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E25:    C12  7 CALL queens.m:36 (from queens.m:40)
+     E25:    C12 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E30:    C14  8 CALL queens.m:36 (from queens.m:40)
+     E30:    C14 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E32:    C14  8 EXIT queens.m:36 (from queens.m:40)
+     E32:    C14 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> return
-     E33:    C12  7 EXIT queens.m:36 (from queens.m:40)
+     E33:    C12 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E34:    C10  6 EXIT queens.m:36 (from queens.m:40)
+     E34:    C10 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E35:     C8  5 EXIT queens.m:36 (from queens.m:40)
+     E35:     C8 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E36:     C6  4 EXIT queens.m:36 (from queens.m:40)
+     E36:     C6 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E38:    C15  3 CALL queens.m:52 (from queens.m:31)
+     E38:    C15 CALL queens.m:52 (from queens.m:31)
                          pred queens.safe/1-0 (semidet)
 mdb> continue -n
-     E47:     C6  4 REDO queens.m:36 (from queens.m:40)
+     E47:     C6 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E48:     C8  5 REDO queens.m:36 (from queens.m:40)
+     E48:     C8 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> forward
-     E49:    C10  6 REDO queens.m:36 (from queens.m:40)
+     E49:    C10 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E50:    C12  7 REDO queens.m:36 (from queens.m:40)
+     E50:    C12 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E51:    C14  8 REDO queens.m:36 (from queens.m:40)
+     E51:    C14 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E52:    C14  8 FAIL queens.m:36 (from queens.m:40)
+     E52:    C14 FAIL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E54:    C13  8 DISJ queens.m:46
+     E54:    C13 DISJ queens.m:46
                          pred queens.qdelete/3-0 (nondet) c2;d2;
 mdb> continue -n
-     E58:    C12  7 FAIL queens.m:36 (from queens.m:40)
+     E58:    C12 FAIL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E59:    C18  7 CALL queens.m:36 (from queens.m:40)
+     E59:    C18 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> delete *
  0: E stop  interface pred queens.print_list/3-0 (det)
@@ -318,12 +318,12 @@
  0: + stop  interface pred queens.main/2-0 (cc_multi)
 mdb> continue -n
 [1, 3, 5, 2, 4]
-     E60:     C1  1 EXIT queens.m:17
+     E60:     C1 EXIT queens.m:17
                          pred queens.main/2-0 (cc_multi)
 mdb> retry
 Retry across I/O operations is not always safe.
 Are you sure you want to do it? yes
-      E1:     C1  1 CALL queens.m:17
+      E1:     C1 CALL queens.m:17
                          pred queens.main/2-0 (cc_multi)
 mdb> continue -n -S
 [1, 3, 5, 2, 4]
Index: tests/debugger/queens.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/queens.exp2,v
retrieving revision 1.8
diff -u -r1.8 queens.exp2
--- tests/debugger/queens.exp2	25 Jun 2003 19:13:24 -0000	1.8
+++ tests/debugger/queens.exp2	11 Nov 2004 06:07:08 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred queens.main/2-0 (cc_multi) queens.m:17
+      E1:     C1 CALL pred queens.main/2-0 (cc_multi) queens.m:17
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -9,21 +9,21 @@
 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:24 (queens.m:15)
+      E2:     C2 CALL pred queens.data/1-0 (det) queens.m:24 (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> 
-      E3:     C2  2 EXIT pred queens.data/1-0 (det) queens.m:24 (queens.m:15)
+      E3:     C2 EXIT pred queens.data/1-0 (det) queens.m:24 (queens.m:15)
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> 
-      E4:     C3  2 CALL pred queens.queen/2-0 (nondet) queens.m:29 (queens.m:15)
+      E4:     C3 CALL pred queens.queen/2-0 (nondet) queens.m:29 (queens.m:15)
 mdb> print *
        Data (arg 1)           	[1, 2, 3, 4, 5]
 mdb> 
-      E5:     C4  3 CALL pred queens.qperm/2-0 (nondet) queens.m:36 (queens.m:30)
+      E5:     C4 CALL pred queens.qperm/2-0 (nondet) queens.m:36 (queens.m:30)
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> print_optionals on
@@ -34,15 +34,15 @@
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> 
-      E6:     C4  3 SWTC pred queens.qperm/2-0 (nondet) s2; queens.m:37
+      E6:     C4 SWTC pred queens.qperm/2-0 (nondet) s2; queens.m:37
 mdb> print *
        HeadVar__1             	[1, 2, 3, 4, 5]
 mdb> 
-      E7:     C5  4 CALL pred queens.qdelete/3-0 (nondet) queens.m:45 (queens.m:38)
+      E7:     C5 CALL pred queens.qdelete/3-0 (nondet) queens.m:45 (queens.m:38)
 mdb> print *
        HeadVar__2             	[1, 2, 3, 4, 5]
 mdb> 
-      E8:     C5  4 DISJ pred queens.qdelete/3-0 (nondet) c2;d1; queens.m:45
+      E8:     C5 DISJ pred queens.qdelete/3-0 (nondet) c2;d1; queens.m:45
 mdb> print *
        HeadVar__2             	[1, 2, 3, 4, 5]
 mdb> level 1
@@ -83,7 +83,7 @@
 mdb> print *
        Data (arg 1)           	[1, 2, 3, 4, 5]
 mdb> 
-      E9:     C5  4 EXIT queens.m:45 (from queens.m:38)
+      E9:     C5 EXIT queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
 mdb> print HeadVar__1
        HeadVar__1             	1
@@ -92,45 +92,45 @@
 mdb> print HeadVar__3
        HeadVar__3             	[2, 3, 4, 5]
 mdb> 
-     E10:     C6  4 CALL queens.m:36 (from queens.m:40)
+     E10:     C6 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> print *
        HeadVar__1             	[2, 3, 4, 5]
 mdb> 
-     E11:     C6  4 SWTC queens.m:37
+     E11:     C6 SWTC queens.m:37
                          pred queens.qperm/2-0 (nondet) s2;
 mdb> print *
        HeadVar__1             	[2, 3, 4, 5]
 mdb> 
-     E12:     C7  5 CALL queens.m:45 (from queens.m:38)
+     E12:     C7 CALL queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
 mdb> print *
        HeadVar__2             	[2, 3, 4, 5]
 mdb> 
-     E13:     C7  5 DISJ queens.m:45
+     E13:     C7 DISJ queens.m:45
                          pred queens.qdelete/3-0 (nondet) c2;d1;
 mdb> print *
        HeadVar__2             	[2, 3, 4, 5]
 mdb> 
-     E14:     C7  5 EXIT queens.m:45 (from queens.m:38)
+     E14:     C7 EXIT queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
 mdb> print *
        HeadVar__1             	2
        HeadVar__2             	[2, 3, 4, 5]
        HeadVar__3             	[3, 4, 5]
 mdb> 
-     E15:     C8  5 CALL queens.m:36 (from queens.m:40)
+     E15:     C8 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> goto -a 21
-     E16:     C8  5 SWTC queens.m:37
+     E16:     C8 SWTC queens.m:37
                          pred queens.qperm/2-0 (nondet) s2;
-     E17:     C9  6 CALL queens.m:45 (from queens.m:38)
+     E17:     C9 CALL queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E18:     C9  6 DISJ queens.m:45
+     E18:     C9 DISJ queens.m:45
                          pred queens.qdelete/3-0 (nondet) c2;d1;
-     E19:     C9  6 EXIT queens.m:45 (from queens.m:38)
+     E19:     C9 EXIT queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E20:    C10  6 CALL queens.m:36 (from queens.m:40)
+     E20:    C10 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> stack
    0    4* pred queens.qperm/2-0 (nondet) (queens.m:36 and others)
@@ -154,41 +154,41 @@
 mdb> print *
        HeadVar__1             	[4, 5]
 mdb> 
-     E21:    C10  6 SWTC queens.m:37
+     E21:    C10 SWTC queens.m:37
                          pred queens.qperm/2-0 (nondet) s2;
 mdb> retry
-     E20:    C10  6 CALL queens.m:36 (from queens.m:40)
+     E20:    C10 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> print *
        HeadVar__1             	[4, 5]
 mdb> finish -a
-     E21:    C10  6 SWTC queens.m:37
+     E21:    C10 SWTC queens.m:37
                          pred queens.qperm/2-0 (nondet) s2;
-     E22:    C11  7 CALL queens.m:45 (from queens.m:38)
+     E22:    C11 CALL queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E23:    C11  7 DISJ queens.m:45
+     E23:    C11 DISJ queens.m:45
                          pred queens.qdelete/3-0 (nondet) c2;d1;
-     E24:    C11  7 EXIT queens.m:45 (from queens.m:38)
+     E24:    C11 EXIT queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E25:    C12  7 CALL queens.m:36 (from queens.m:40)
+     E25:    C12 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E26:    C12  7 SWTC queens.m:37
+     E26:    C12 SWTC queens.m:37
                          pred queens.qperm/2-0 (nondet) s2;
-     E27:    C13  8 CALL queens.m:45 (from queens.m:38)
+     E27:    C13 CALL queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E28:    C13  8 DISJ queens.m:45
+     E28:    C13 DISJ queens.m:45
                          pred queens.qdelete/3-0 (nondet) c2;d1;
-     E29:    C13  8 EXIT queens.m:45 (from queens.m:38)
+     E29:    C13 EXIT queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E30:    C14  8 CALL queens.m:36 (from queens.m:40)
+     E30:    C14 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E31:    C14  8 SWTC queens.m:36
+     E31:    C14 SWTC queens.m:36
                          pred queens.qperm/2-0 (nondet) s1;
-     E32:    C14  8 EXIT queens.m:36 (from queens.m:40)
+     E32:    C14 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E33:    C12  7 EXIT queens.m:36 (from queens.m:40)
+     E33:    C12 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E34:    C10  6 EXIT queens.m:36 (from queens.m:40)
+     E34:    C10 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> register --quiet
 mdb> break print_list
@@ -196,51 +196,51 @@
 mdb> break qdelete
  1: + stop  interface pred queens.qdelete/3-0 (nondet)
 mdb> continue -a
-     E35:     C8  5 EXIT queens.m:36 (from queens.m:40)
+     E35:     C8 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E36:     C6  4 EXIT queens.m:36 (from queens.m:40)
+     E36:     C6 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E37:     C4  3 EXIT queens.m:36 (from queens.m:30)
+     E37:     C4 EXIT queens.m:36 (from queens.m:30)
                          pred queens.qperm/2-0 (nondet)
-     E38:    C15  3 CALL queens.m:52 (from queens.m:31)
+     E38:    C15 CALL queens.m:52 (from queens.m:31)
                          pred queens.safe/1-0 (semidet)
-     E39:    C15  3 SWTC queens.m:53
+     E39:    C15 SWTC queens.m:53
                          pred queens.safe/1-0 (semidet) s2;
-     E40:    C16  4 CALL queens.m:60 (from queens.m:54)
+     E40:    C16 CALL queens.m:60 (from queens.m:54)
                          pred queens.nodiag/3-0 (semidet)
-     E41:    C16  4 SWTC queens.m:61
+     E41:    C16 SWTC queens.m:61
                          pred queens.nodiag/3-0 (semidet) s2;
-     E42:    C17  5 CALL int.m:NNNN (from queens.m:62)
+     E42:    C17 CALL int.m:NNNN (from queens.m:62)
                          func int.-/2-0 (det)
-     E43:    C17  5 EXIT int.m:NNNN (from queens.m:62)
+     E43:    C17 EXIT int.m:NNNN (from queens.m:62)
                          func int.-/2-0 (det)
-     E44:    C18  5 CALL int.m:NNNN (from queens.m:63)
+     E44:    C18 CALL int.m:NNNN (from queens.m:63)
                          func int.-/2-0 (det)
-     E45:    C18  5 EXIT int.m:NNNN (from queens.m:63)
+     E45:    C18 EXIT int.m:NNNN (from queens.m:63)
                          func int.-/2-0 (det)
-     E46:    C16  4 COND queens.m:64
+     E46:    C16 COND queens.m:64
                          pred queens.nodiag/3-0 (semidet) s2;c6;?;
-     E47:    C16  4 THEN queens.m:65
+     E47:    C16 THEN queens.m:65
                          pred queens.nodiag/3-0 (semidet) s2;c6;t;
-     E48:    C16  4 FAIL queens.m:60 (from queens.m:54)
+     E48:    C16 FAIL queens.m:60 (from queens.m:54)
                          pred queens.nodiag/3-0 (semidet)
-     E49:    C15  3 FAIL queens.m:52 (from queens.m:31)
+     E49:    C15 FAIL queens.m:52 (from queens.m:31)
                          pred queens.safe/1-0 (semidet)
-     E50:     C4  3 REDO queens.m:36 (from queens.m:30)
+     E50:     C4 REDO queens.m:36 (from queens.m:30)
                          pred queens.qperm/2-0 (nondet)
-     E51:     C6  4 REDO queens.m:36 (from queens.m:40)
+     E51:     C6 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E52:     C8  5 REDO queens.m:36 (from queens.m:40)
+     E52:     C8 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E53:    C10  6 REDO queens.m:36 (from queens.m:40)
+     E53:    C10 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E54:    C12  7 REDO queens.m:36 (from queens.m:40)
+     E54:    C12 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E55:    C14  8 REDO queens.m:36 (from queens.m:40)
+     E55:    C14 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E56:    C14  8 FAIL queens.m:36 (from queens.m:40)
+     E56:    C14 FAIL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E57:    C13  8 REDO queens.m:45 (from queens.m:38)
+     E57:    C13 REDO queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
 mdb> break info
  0: + stop  interface pred queens.print_list/3-0 (det)
@@ -249,74 +249,74 @@
  0: + stop  interface pred queens.print_list/3-0 (det)
  1: + stop  interface pred queens.qdelete/3-0 (nondet)
 mdb> step -aS 5
-     E58:    C13  8 DISJ queens.m:46
+     E58:    C13 DISJ queens.m:46
                          pred queens.qdelete/3-0 (nondet) c2;d2;
-     E59:    C19  9 CALL queens.m:45 (from queens.m:47)
+     E59:    C19 CALL queens.m:45 (from queens.m:47)
                          pred queens.qdelete/3-0 (nondet)
-     E60:    C19  9 FAIL queens.m:45 (from queens.m:47)
+     E60:    C19 FAIL queens.m:45 (from queens.m:47)
                          pred queens.qdelete/3-0 (nondet)
-     E61:    C13  8 FAIL queens.m:45 (from queens.m:38)
+     E61:    C13 FAIL queens.m:45 (from queens.m:38)
                          pred queens.qdelete/3-0 (nondet)
-     E62:    C12  7 FAIL queens.m:36 (from queens.m:40)
+     E62:    C12 FAIL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> disable 1
  1: - stop  interface pred queens.qdelete/3-0 (nondet)
 mdb> retry 4
-      E5:     C4  3 CALL queens.m:36 (from queens.m:30)
+      E5:     C4 CALL queens.m:36 (from queens.m:30)
                          pred queens.qperm/2-0 (nondet)
 mdb> break 40
  2: + stop  linenumber queens.m:40
 mdb> continue -n
-     E10:     C6  4 CALL queens.m:36 (from queens.m:40)
+     E10:     C6 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E15:     C8  5 CALL queens.m:36 (from queens.m:40)
+     E15:     C8 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E20:    C10  6 CALL queens.m:36 (from queens.m:40)
+     E20:    C10 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E25:    C12  7 CALL queens.m:36 (from queens.m:40)
+     E25:    C12 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E30:    C14  8 CALL queens.m:36 (from queens.m:40)
+     E30:    C14 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E32:    C14  8 EXIT queens.m:36 (from queens.m:40)
+     E32:    C14 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> return
-     E33:    C12  7 EXIT queens.m:36 (from queens.m:40)
+     E33:    C12 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E34:    C10  6 EXIT queens.m:36 (from queens.m:40)
+     E34:    C10 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E35:     C8  5 EXIT queens.m:36 (from queens.m:40)
+     E35:     C8 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E36:     C6  4 EXIT queens.m:36 (from queens.m:40)
+     E36:     C6 EXIT queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E38:    C15  3 CALL queens.m:52 (from queens.m:31)
+     E38:    C15 CALL queens.m:52 (from queens.m:31)
                          pred queens.safe/1-0 (semidet)
 mdb> continue -n
-     E51:     C6  4 REDO queens.m:36 (from queens.m:40)
+     E51:     C6 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E52:     C8  5 REDO queens.m:36 (from queens.m:40)
+     E52:     C8 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> forward
-     E53:    C10  6 REDO queens.m:36 (from queens.m:40)
+     E53:    C10 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E54:    C12  7 REDO queens.m:36 (from queens.m:40)
+     E54:    C12 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E55:    C14  8 REDO queens.m:36 (from queens.m:40)
+     E55:    C14 REDO queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E56:    C14  8 FAIL queens.m:36 (from queens.m:40)
+     E56:    C14 FAIL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
-     E58:    C13  8 DISJ queens.m:46
+     E58:    C13 DISJ queens.m:46
                          pred queens.qdelete/3-0 (nondet) c2;d2;
 mdb> continue -n
-     E62:    C12  7 FAIL queens.m:36 (from queens.m:40)
+     E62:    C12 FAIL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> continue -n
-     E63:    C20  7 CALL queens.m:36 (from queens.m:40)
+     E63:    C20 CALL queens.m:36 (from queens.m:40)
                          pred queens.qperm/2-0 (nondet)
 mdb> delete *
  0: E stop  interface pred queens.print_list/3-0 (det)
@@ -326,12 +326,12 @@
  0: + stop  interface pred queens.main/2-0 (cc_multi)
 mdb> continue -n
 [1, 3, 5, 2, 4]
-     E64:     C1  1 EXIT queens.m:17
+     E64:     C1 EXIT queens.m:17
                          pred queens.main/2-0 (cc_multi)
 mdb> retry
 Retry across I/O operations is not always safe.
 Are you sure you want to do it? yes
-      E1:     C1  1 CALL queens.m:17
+      E1:     C1 CALL queens.m:17
                          pred queens.main/2-0 (cc_multi)
 mdb> continue -n -S
 [1, 3, 5, 2, 4]
Index: tests/debugger/resume_typeinfos.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/resume_typeinfos.exp,v
retrieving revision 1.4
diff -u -r1.4 resume_typeinfos.exp
--- tests/debugger/resume_typeinfos.exp	17 Jan 2003 05:56:56 -0000	1.4
+++ tests/debugger/resume_typeinfos.exp	10 Nov 2004 23:24:25 -0000
@@ -1,16 +1,16 @@
-      E1:     C1  1 CALL pred resume_typeinfos.main/2-0 (det) resume_typeinfos.m:NNNN
+      E1:     C1 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 4
-      E2:     C2  3 CALL pred resume_typeinfos.introduce_new_typeinfo/2-0 (det)
+      E2:     C2 CALL pred resume_typeinfos.introduce_new_typeinfo/2-0 (det)
 mdb> print *
        HeadVar__1             	[1, 2]
 mdb> goto 6
-      E3:     C3  2 COND pred resume_typeinfos.test/2-0 (semidet) c2;?;
+      E3:     C3 COND pred resume_typeinfos.test/2-0 (semidet) c2;?;
 mdb> finish
-      E4:     C3  2 FAIL pred resume_typeinfos.test/2-0 (semidet)
+      E4:     C3 FAIL pred resume_typeinfos.test/2-0 (semidet)
 mdb> print *
        TestList (arg 1)       	[1, 2]
 mdb> continue
Index: tests/debugger/retry.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/retry.exp,v
retrieving revision 1.10
diff -u -r1.10 retry.exp
--- tests/debugger/retry.exp	2 Sep 2004 04:31:41 -0000	1.10
+++ tests/debugger/retry.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred retry.main/2-0 (det) retry.m:25
+      E1:     C1 CALL pred retry.main/2-0 (det) retry.m:25
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -11,8 +11,8 @@
 mdb> break det_without_cut_1
  0: + stop  interface pred retry.det_without_cut_1/2-0 (det)
 mdb> continue -a
-      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)
+      E2:     C2 CALL pred retry.det_without_cut/2-0 (det)
+      E3:     C3 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
@@ -22,74 +22,74 @@
    1       pred retry.det_without_cut/2-0 (det)
    2       pred retry.main/2-0 (det)
 mdb> finish
-      E4:     C3  3 EXIT pred retry.det_without_cut_1/2-0 (det)
+      E4:     C3 EXIT pred retry.det_without_cut_1/2-0 (det)
 mdb> retry 1
-      E2:     C2  2 CALL pred retry.det_without_cut/2-0 (det)
+      E2:     C2 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
-      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)
+      E3:     C3 CALL pred retry.det_without_cut_1/2-0 (det)
+      E5:     C4 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
-      E2:     C2  2 CALL pred retry.det_without_cut/2-0 (det)
+      E2:     C2 CALL pred retry.det_without_cut/2-0 (det)
 mdb> finish
-      E6:     C2  2 EXIT pred retry.det_without_cut/2-0 (det)
+      E6:     C2 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
-      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)
+      E7:     C5 CALL pred retry.det_with_cut/2-0 (det)
+      E8:     C5 COND pred retry.det_with_cut/2-0 (det)
+      E9:     C6 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
-     E10:     C6  3 EXIT pred retry.det_with_cut_1/2-0 (nondet)
+     E10:     C6 EXIT pred retry.det_with_cut_1/2-0 (nondet)
 mdb> retry 1
-      E7:     C5  2 CALL pred retry.det_with_cut/2-0 (det)
+      E7:     C5 CALL pred retry.det_with_cut/2-0 (det)
 mdb> finish
-     E11:     C5  2 EXIT pred retry.det_with_cut/2-0 (det)
+     E11:     C5 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 -f 1
-      E1:     C1  1 CALL pred retry.main/2-0 (det)
+      E1:     C1 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
-      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)
-     E14:     C7  4 CALL pred retry.det_with_cut_2/2-0 (det)
+      E2:     C2 CALL pred retry.det_without_cut/2-0 (det)
+      E3:     C3 CALL pred retry.det_without_cut_1/2-0 (det)
+      E5:     C4 CALL pred retry.det_without_cut_2/2-0 (det)
+     E12:     C4 EXIT pred retry.det_without_cut_2/2-0 (det)
+      E4:     C3 EXIT pred retry.det_without_cut_1/2-0 (det)
+      E6:     C2 EXIT pred retry.det_without_cut/2-0 (det)
+      E7:     C5 CALL pred retry.det_with_cut/2-0 (det)
+      E8:     C5 COND pred retry.det_with_cut/2-0 (det)
+      E9:     C6 CALL pred retry.det_with_cut_1/2-0 (nondet)
+     E13:     C6 DISJ pred retry.det_with_cut_1/2-0 (nondet)
+     E14:     C7 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
-     E15:     C8  2 CALL pred retry.nondet/2-0 (multi)
+     E15:     C8 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
-     E16:     C9  3 CALL pred retry.nondet_2/2-0 (det)
+     E16:     C9 CALL pred retry.nondet_2/2-0 (det)
 mdb> retry 1
-     E15:     C8  2 CALL pred retry.nondet/2-0 (multi)
+     E15:     C8 CALL pred retry.nondet/2-0 (multi)
 mdb> print *
        X0 (arg 1)             	4
 mdb> delete *
@@ -103,51 +103,51 @@
 9
 40 41 
 50 51 
-     E17:    C10  2 CALL pred retry.fib/2-0 (det)
+     E17:    C10 CALL pred retry.fib/2-0 (det)
 mdb> print *
        N (arg 1)              	15
 mdb> continue
-     E18:    C11  3 CALL pred retry.fib/2-0 (det)
+     E18:    C11 CALL pred retry.fib/2-0 (det)
 mdb> print *
        N (arg 1)              	14
 mdb> continue
-     E19:    C12  4 CALL pred retry.fib/2-0 (det)
+     E19:    C12 CALL pred retry.fib/2-0 (det)
 mdb> continue
-     E20:    C13  5 CALL pred retry.fib/2-0 (det)
+     E20:    C13 CALL pred retry.fib/2-0 (det)
 mdb> step
-     E21:    C13  5 COND pred retry.fib/2-0 (det)
+     E21:    C13 COND pred retry.fib/2-0 (det)
 mdb> retry 2
-     E18:    C11  3 CALL pred retry.fib/2-0 (det)
+     E18:    C11 CALL pred retry.fib/2-0 (det)
 mdb> print *
        N (arg 1)              	14
 mdb> next
-     E22:    C11  3 COND pred retry.fib/2-0 (det)
+     E22:    C11 COND pred retry.fib/2-0 (det)
 mdb> retry 1
-     E17:    C10  2 CALL pred retry.fib/2-0 (det)
+     E17:    C10 CALL pred retry.fib/2-0 (det)
 mdb> finish -n
-     E23:    C10  2 EXIT pred retry.fib/2-0 (det)
+     E23:    C10 EXIT pred retry.fib/2-0 (det)
 mdb> delete *
  0: E stop  interface pred retry.fib/2-0 (det)
 mdb> break t
  0: + stop  interface pred retry.t/3-0 (nondet)
 mdb> continue
 987
-     E24:    C14  2 CALL pred retry.t/3-0 (nondet)
+     E24:    C14 CALL pred retry.t/3-0 (nondet)
 mdb> table t 1 2
 call table does not contain 1 in argument position 1.
 mdb> finish
 marker executed: t 1 2
-     E25:    C14  2 EXIT pred retry.t/3-0 (nondet)
+     E25:    C14 EXIT pred retry.t/3-0 (nondet)
 mdb> table t 1 2
 <1, 2>: incomplete
 answer #1: <120>
 mdb> retry
-     E24:    C14  2 CALL pred retry.t/3-0 (nondet)
+     E24:    C14 CALL pred retry.t/3-0 (nondet)
 mdb> table t 1 2
 <1, 2>: inactive
 mdb> finish
 marker executed: t 1 2
-     E25:    C14  2 EXIT pred retry.t/3-0 (nondet)
+     E25:    C14 EXIT pred retry.t/3-0 (nondet)
 mdb> table t 1 2
 <1, 2>: incomplete
 answer #1: <120>
Index: tests/debugger/retry.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/retry.exp2,v
retrieving revision 1.11
diff -u -r1.11 retry.exp2
--- tests/debugger/retry.exp2	2 Sep 2004 04:31:41 -0000	1.11
+++ tests/debugger/retry.exp2	11 Nov 2004 06:13:20 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred retry.main/2-0 (det) retry.m:25
+      E1:     C1 CALL pred retry.main/2-0 (det) retry.m:25
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -11,10 +11,10 @@
 mdb> break det_without_cut_1
  0: + stop  interface pred retry.det_without_cut_1/2-0 (det)
 mdb> continue -a
-      E2:     C2  2 CALL pred retry.det_without_cut/2-0 (det)
-      E3:     C3  3 CALL func int.+/2-0 (det)
-      E4:     C3  3 EXIT func int.+/2-0 (det)
-      E5:     C4  3 CALL pred retry.det_without_cut_1/2-0 (det)
+      E2:     C2 CALL pred retry.det_without_cut/2-0 (det)
+      E3:     C3 CALL func int.+/2-0 (det)
+      E4:     C3 EXIT func int.+/2-0 (det)
+      E5:     C4 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
@@ -24,80 +24,80 @@
    1       pred retry.det_without_cut/2-0 (det)
    2       pred retry.main/2-0 (det)
 mdb> finish
-      E6:     C4  3 EXIT pred retry.det_without_cut_1/2-0 (det)
+      E6:     C4 EXIT pred retry.det_without_cut_1/2-0 (det)
 mdb> retry 1
-      E2:     C2  2 CALL pred retry.det_without_cut/2-0 (det)
+      E2:     C2 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
-      E3:     C3  3 CALL func int.+/2-0 (det)
-      E4:     C3  3 EXIT func int.+/2-0 (det)
-      E5:     C4  3 CALL pred retry.det_without_cut_1/2-0 (det)
-      E7:     C5  4 CALL pred retry.det_without_cut_2/2-0 (det)
+      E3:     C3 CALL func int.+/2-0 (det)
+      E4:     C3 EXIT func int.+/2-0 (det)
+      E5:     C4 CALL pred retry.det_without_cut_1/2-0 (det)
+      E7:     C5 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
-      E2:     C2  2 CALL pred retry.det_without_cut/2-0 (det)
+      E2:     C2 CALL pred retry.det_without_cut/2-0 (det)
 mdb> finish
-      E8:     C2  2 EXIT pred retry.det_without_cut/2-0 (det)
+      E8:     C2 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
-      E9:     C6  2 CALL pred retry.det_with_cut/2-0 (det)
-     E10:     C6  2 COND pred retry.det_with_cut/2-0 (det)
-     E11:     C7  3 CALL pred retry.det_with_cut_1/2-0 (nondet)
+      E9:     C6 CALL pred retry.det_with_cut/2-0 (det)
+     E10:     C6 COND pred retry.det_with_cut/2-0 (det)
+     E11:     C7 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
-     E12:     C7  3 EXIT pred retry.det_with_cut_1/2-0 (nondet)
+     E12:     C7 EXIT pred retry.det_with_cut_1/2-0 (nondet)
 mdb> retry 1
-      E9:     C6  2 CALL pred retry.det_with_cut/2-0 (det)
+      E9:     C6 CALL pred retry.det_with_cut/2-0 (det)
 mdb> finish
-     E13:     C6  2 EXIT pred retry.det_with_cut/2-0 (det)
+     E13:     C6 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 -f 1
-      E1:     C1  1 CALL pred retry.main/2-0 (det)
+      E1:     C1 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
-      E2:     C2  2 CALL pred retry.det_without_cut/2-0 (det)
-      E3:     C3  3 CALL func int.+/2-0 (det)
-      E4:     C3  3 EXIT func int.+/2-0 (det)
-      E5:     C4  3 CALL pred retry.det_without_cut_1/2-0 (det)
-      E7:     C5  4 CALL pred retry.det_without_cut_2/2-0 (det)
-     E14:     C5  4 EXIT pred retry.det_without_cut_2/2-0 (det)
-     E15:     C8  4 CALL func int.*/2-0 (det)
-     E16:     C8  4 EXIT func int.*/2-0 (det)
-      E6:     C4  3 EXIT pred retry.det_without_cut_1/2-0 (det)
-      E8:     C2  2 EXIT pred retry.det_without_cut/2-0 (det)
-      E9:     C6  2 CALL pred retry.det_with_cut/2-0 (det)
-     E10:     C6  2 COND pred retry.det_with_cut/2-0 (det)
-     E11:     C7  3 CALL pred retry.det_with_cut_1/2-0 (nondet)
-     E17:     C7  3 DISJ pred retry.det_with_cut_1/2-0 (nondet)
-     E18:     C9  4 CALL pred retry.det_with_cut_2/2-0 (det)
+      E2:     C2 CALL pred retry.det_without_cut/2-0 (det)
+      E3:     C3 CALL func int.+/2-0 (det)
+      E4:     C3 EXIT func int.+/2-0 (det)
+      E5:     C4 CALL pred retry.det_without_cut_1/2-0 (det)
+      E7:     C5 CALL pred retry.det_without_cut_2/2-0 (det)
+     E14:     C5 EXIT pred retry.det_without_cut_2/2-0 (det)
+     E15:     C8 CALL func int.*/2-0 (det)
+     E16:     C8 EXIT func int.*/2-0 (det)
+      E6:     C4 EXIT pred retry.det_without_cut_1/2-0 (det)
+      E8:     C2 EXIT pred retry.det_without_cut/2-0 (det)
+      E9:     C6 CALL pred retry.det_with_cut/2-0 (det)
+     E10:     C6 COND pred retry.det_with_cut/2-0 (det)
+     E11:     C7 CALL pred retry.det_with_cut_1/2-0 (nondet)
+     E17:     C7 DISJ pred retry.det_with_cut_1/2-0 (nondet)
+     E18:     C9 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
-     E19:    C10  3 CALL pred retry.nondet/2-0 (multi)
+     E19:    C10 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
-     E20:    C11  4 CALL pred retry.nondet_2/2-0 (det)
+     E20:    C11 CALL pred retry.nondet_2/2-0 (det)
 mdb> retry 1
-     E19:    C10  3 CALL pred retry.nondet/2-0 (multi)
+     E19:    C10 CALL pred retry.nondet/2-0 (multi)
 mdb> print *
        X0 (arg 1)             	4
 mdb> delete *
@@ -111,51 +111,51 @@
 9
 40 41 
 50 51 
-     E21:    C12  2 CALL pred retry.fib/2-0 (det)
+     E21:    C12 CALL pred retry.fib/2-0 (det)
 mdb> print *
        N (arg 1)              	15
 mdb> continue
-     E22:    C13  3 CALL pred retry.fib/2-0 (det)
+     E22:    C13 CALL pred retry.fib/2-0 (det)
 mdb> print *
        N (arg 1)              	14
 mdb> continue
-     E23:    C14  4 CALL pred retry.fib/2-0 (det)
+     E23:    C14 CALL pred retry.fib/2-0 (det)
 mdb> continue
-     E24:    C15  5 CALL pred retry.fib/2-0 (det)
+     E24:    C15 CALL pred retry.fib/2-0 (det)
 mdb> step
-     E25:    C15  5 COND pred retry.fib/2-0 (det)
+     E25:    C15 COND pred retry.fib/2-0 (det)
 mdb> retry 2
-     E22:    C13  3 CALL pred retry.fib/2-0 (det)
+     E22:    C13 CALL pred retry.fib/2-0 (det)
 mdb> print *
        N (arg 1)              	14
 mdb> next
-     E26:    C13  3 COND pred retry.fib/2-0 (det)
+     E26:    C13 COND pred retry.fib/2-0 (det)
 mdb> retry 1
-     E21:    C12  2 CALL pred retry.fib/2-0 (det)
+     E21:    C12 CALL pred retry.fib/2-0 (det)
 mdb> finish -n
-     E27:    C12  2 EXIT pred retry.fib/2-0 (det)
+     E27:    C12 EXIT pred retry.fib/2-0 (det)
 mdb> delete *
  0: E stop  interface pred retry.fib/2-0 (det)
 mdb> break t
  0: + stop  interface pred retry.t/3-0 (nondet)
 mdb> continue
 987
-     E28:    C16  3 CALL pred retry.t/3-0 (nondet)
+     E28:    C16 CALL pred retry.t/3-0 (nondet)
 mdb> table t 1 2
 call table does not contain 1 in argument position 1.
 mdb> finish
 marker executed: t 1 2
-     E29:    C16  3 EXIT pred retry.t/3-0 (nondet)
+     E29:    C16 EXIT pred retry.t/3-0 (nondet)
 mdb> table t 1 2
 <1, 2>: incomplete
 answer #1: <120>
 mdb> retry
-     E28:    C16  3 CALL pred retry.t/3-0 (nondet)
+     E28:    C16 CALL pred retry.t/3-0 (nondet)
 mdb> table t 1 2
 <1, 2>: inactive
 mdb> finish
 marker executed: t 1 2
-     E29:    C16  3 EXIT pred retry.t/3-0 (nondet)
+     E29:    C16 EXIT pred retry.t/3-0 (nondet)
 mdb> table t 1 2
 <1, 2>: incomplete
 answer #1: <120>
Index: tests/debugger/tabled_read.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/tabled_read.exp,v
retrieving revision 1.8
diff -u -r1.8 tabled_read.exp
--- tests/debugger/tabled_read.exp	10 Mar 2004 04:30:43 -0000	1.8
+++ tests/debugger/tabled_read.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred tabled_read.main/2-0 (det) tabled_read.m:17
+      E1:     C1 CALL pred tabled_read.main/2-0 (det) tabled_read.m:17
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -12,22 +12,22 @@
 mdb> table_io start
 I/O tabling started.
 mdb> continue
-      E2:     C2  3 CALL pred tabled_read.test/5-0 (det)
+      E2:     C2 CALL pred tabled_read.test/5-0 (det)
 mdb> finish -n
-      E3:     C2  3 EXIT pred tabled_read.test/5-0 (det)
+      E3:     C2 EXIT pred tabled_read.test/5-0 (det)
 mdb> print *
        Stream (arg 1)         	'<<c_pointer>>'
        SoFar (arg 2)          	0
        N (arg 3)              	123
        DCG_2 (arg 5)          	state('<<c_pointer>>')
 mdb> retry -o -a
-      E2:     C2  3 CALL pred tabled_read.test/5-0 (det)
+      E2:     C2 CALL pred tabled_read.test/5-0 (det)
 mdb> print *
        Stream (arg 1)         	'<<c_pointer>>'
        SoFar (arg 2)          	0
        DCG_0 (arg 4)          	state('<<c_pointer>>')
 mdb> finish -n
-      E3:     C2  3 EXIT pred tabled_read.test/5-0 (det)
+      E3:     C2 EXIT pred tabled_read.test/5-0 (det)
 mdb> print *
        Stream (arg 1)         	'<<c_pointer>>'
        SoFar (arg 2)          	0
@@ -38,18 +38,18 @@
 mdb> continue
 123
 456
-      E4:     C3  3 CALL pred tabled_read.test/5-0 (det)
+      E4:     C3 CALL pred tabled_read.test/5-0 (det)
 mdb> finish -n
-      E5:     C3  3 EXIT pred tabled_read.test/5-0 (det)
+      E5:     C3 EXIT pred tabled_read.test/5-0 (det)
 mdb> print *
        Stream (arg 1)         	'<<c_pointer>>'
        SoFar (arg 2)          	0
        N (arg 3)              	789
        DCG_2 (arg 5)          	state('<<c_pointer>>')
 mdb> retry -f
-      E4:     C3  3 CALL pred tabled_read.test/5-0 (det)
+      E4:     C3 CALL pred tabled_read.test/5-0 (det)
 mdb> finish -n
-      E6:     C3  3 EXIT pred tabled_read.test/5-0 (det)
+      E6:     C3 EXIT pred tabled_read.test/5-0 (det)
 mdb> print *
        Stream (arg 1)         	'<<c_pointer>>'
        SoFar (arg 2)          	0
Index: tests/debugger/tabled_read_decl.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/tabled_read_decl.exp,v
retrieving revision 1.9
diff -u -r1.9 tabled_read_decl.exp
--- tests/debugger/tabled_read_decl.exp	10 Mar 2004 04:30:44 -0000	1.9
+++ tests/debugger/tabled_read_decl.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred tabled_read_decl.main/2-0 (det) tabled_read_decl.m:17
+      E1:     C1 CALL pred tabled_read_decl.main/2-0 (det) tabled_read_decl.m:17
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -12,22 +12,22 @@
 mdb> table_io start
 I/O tabling started.
 mdb> continue
-      E2:     C2  3 CALL pred tabled_read_decl.test/5-0 (det)
+      E2:     C2 CALL pred tabled_read_decl.test/5-0 (det)
 mdb> finish -n
-      E3:     C2  3 EXIT pred tabled_read_decl.test/5-0 (det)
+      E3:     C2 EXIT pred tabled_read_decl.test/5-0 (det)
 mdb> print *
        Stream (arg 1)         	'<<c_pointer>>'
        SoFar (arg 2)          	0
        N (arg 3)              	123
        DCG_2 (arg 5)          	state('<<c_pointer>>')
 mdb> retry -o -a
-      E2:     C2  3 CALL pred tabled_read_decl.test/5-0 (det)
+      E2:     C2 CALL pred tabled_read_decl.test/5-0 (det)
 mdb> print *
        Stream (arg 1)         	'<<c_pointer>>'
        SoFar (arg 2)          	0
        DCG_0 (arg 4)          	state('<<c_pointer>>')
 mdb> finish -n
-      E3:     C2  3 EXIT pred tabled_read_decl.test/5-0 (det)
+      E3:     C2 EXIT pred tabled_read_decl.test/5-0 (det)
 mdb> print *
        Stream (arg 1)         	'<<c_pointer>>'
        SoFar (arg 2)          	0
@@ -37,9 +37,9 @@
  1: + stop  interface pred tabled_read_decl.poly_test/6-0 (det)
 mdb> continue
 123
-      E4:     C3  3 CALL pred tabled_read_decl.poly_test/6-0 (det)
+      E4:     C3 CALL pred tabled_read_decl.poly_test/6-0 (det)
 mdb> finish -n
-      E5:     C3  3 EXIT pred tabled_read_decl.poly_test/6-0 (det)
+      E5:     C3 EXIT pred tabled_read_decl.poly_test/6-0 (det)
 mdb> print *
        Stream (arg 1)         	'<<c_pointer>>'
        Unused (arg 2)         	['a', 'b', 'c']
@@ -47,9 +47,9 @@
        N (arg 4)              	456
        DCG_2 (arg 6)          	state('<<c_pointer>>')
 mdb> retry -o -a
-      E4:     C3  3 CALL pred tabled_read_decl.poly_test/6-0 (det)
+      E4:     C3 CALL pred tabled_read_decl.poly_test/6-0 (det)
 mdb> finish -n
-      E5:     C3  3 EXIT pred tabled_read_decl.poly_test/6-0 (det)
+      E5:     C3 EXIT pred tabled_read_decl.poly_test/6-0 (det)
 mdb> print *
        Stream (arg 1)         	'<<c_pointer>>'
        Unused (arg 2)         	['a', 'b', 'c']
@@ -63,7 +63,7 @@
  0: + stop  interface pred tabled_read_decl.part_2/3-0 (det)
 mdb> continue
 456
-      E6:     C4  2 CALL pred tabled_read_decl.part_2/3-0 (det)
+      E6:     C4 CALL pred tabled_read_decl.part_2/3-0 (det)
 mdb> table_io end
 I/O tabling stopped.
 mdb> print action 0
Index: tests/debugger/tabled_read_unitize.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/tabled_read_unitize.exp,v
retrieving revision 1.7
diff -u -r1.7 tabled_read_unitize.exp
--- tests/debugger/tabled_read_unitize.exp	10 Mar 2004 04:30:44 -0000	1.7
+++ tests/debugger/tabled_read_unitize.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred tabled_read_unitize.main/2-0 (det) tabled_read_unitize.m:17
+      E1:     C1 CALL pred tabled_read_unitize.main/2-0 (det) tabled_read_unitize.m:17
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -10,11 +10,11 @@
 mdb> break unitize
  0: + stop  interface pred tabled_read_unitize.unitize/4-0 (det)
 mdb> continue
-      E2:     C2  2 CALL pred tabled_read_unitize.unitize/4-0 (det)
+      E2:     C2 CALL pred tabled_read_unitize.unitize/4-0 (det)
 mdb> finish -a
-      E3:     C2  2 EXIT pred tabled_read_unitize.unitize/4-0 (det)
+      E3:     C2 EXIT pred tabled_read_unitize.unitize/4-0 (det)
 mdb> retry -f
-      E2:     C2  2 CALL pred tabled_read_unitize.unitize/4-0 (det)
+      E2:     C2 CALL pred tabled_read_unitize.unitize/4-0 (det)
 mdb> continue -S
 123
 4506
Index: tests/debugger/type_desc_test.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/type_desc_test.exp,v
retrieving revision 1.4
diff -u -r1.4 type_desc_test.exp
--- tests/debugger/type_desc_test.exp	17 Jan 2003 05:56:57 -0000	1.4
+++ tests/debugger/type_desc_test.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred type_desc_test.main/2-0 (det) type_desc_test.m:21
+      E1:     C1 CALL pred type_desc_test.main/2-0 (det) type_desc_test.m:21
 mdb> echo on
 Command echo enabled.
 mdb> context none
@@ -9,33 +9,33 @@
 mdb> break get_type_ctor_desc
  1: + stop  interface func type_desc_test.get_type_ctor_desc/1-0 (det)
 mdb> continue
-      E2:     C2  3 CALL func type_desc_test.get_type_desc/1-0 (det)
+      E2:     C2 CALL func type_desc_test.get_type_desc/1-0 (det)
 mdb> finish
-      E3:     C2  3 EXIT func type_desc_test.get_type_desc/1-0 (det)
+      E3:     C2 EXIT func type_desc_test.get_type_desc/1-0 (det)
 mdb> print *
        Val (arg 1)            	[1, 2]
        HeadVar__2             	list.list(int)
 mdb> continue
 type_desc: list.list(int)
-      E4:     C3  3 CALL func type_desc_test.get_type_ctor_desc/1-0 (det)
+      E4:     C3 CALL func type_desc_test.get_type_ctor_desc/1-0 (det)
 mdb> finish
-      E5:     C3  3 EXIT func type_desc_test.get_type_ctor_desc/1-0 (det)
+      E5:     C3 EXIT func type_desc_test.get_type_ctor_desc/1-0 (det)
 mdb> print *
        TypeDesc (arg 1)       	list.list(int)
        HeadVar__2             	list.list/1
 mdb> continue
 type_ctor_desc: list.list/1
-      E6:     C4  3 CALL func type_desc_test.get_type_desc/1-0 (det)
+      E6:     C4 CALL func type_desc_test.get_type_desc/1-0 (det)
 mdb> finish
-      E7:     C4  3 EXIT func type_desc_test.get_type_desc/1-0 (det)
+      E7:     C4 EXIT func type_desc_test.get_type_desc/1-0 (det)
 mdb> print *
        Val (arg 1)            	["one", "two", "three"]
        HeadVar__2             	list.list(string)
 mdb> continue
 type_desc: list.list(string)
-      E8:     C5  3 CALL func type_desc_test.get_type_ctor_desc/1-0 (det)
+      E8:     C5 CALL func type_desc_test.get_type_ctor_desc/1-0 (det)
 mdb> finish
-      E9:     C5  3 EXIT func type_desc_test.get_type_ctor_desc/1-0 (det)
+      E9:     C5 EXIT func type_desc_test.get_type_ctor_desc/1-0 (det)
 mdb> print *
        TypeDesc (arg 1)       	list.list(string)
        HeadVar__2             	list.list/1
Index: tests/debugger/declarative/aadebug.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/aadebug.exp,v
retrieving revision 1.8
diff -u -r1.8 aadebug.exp
--- tests/debugger/declarative/aadebug.exp	17 Jan 2003 05:56:59 -0000	1.8
+++ tests/debugger/declarative/aadebug.exp	10 Nov 2004 23:24:25 -0000
@@ -1,13 +1,13 @@
-      E1:     C1  1 CALL pred aadebug.main/2-0 (det) aadebug.m:11
+      E1:     C1 CALL pred aadebug.main/2-0 (det) aadebug.m:11
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
 mdb> break p
  0: + stop  interface pred aadebug.p/2-0 (nondet)
 mdb> continue
-      E2:     C2  2 CALL pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
+      E2:     C2 CALL pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
 mdb> finish
-      E3:     C2  2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
+      E3:     C2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
 mdb> dd
 p('a', 30)
 Valid? no
@@ -20,22 +20,22 @@
 Found incorrect contour:
 p('a', 30)
 Is this a bug? yes
-      E3:     C2  2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
+      E3:     C2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
 mdb> continue
-      E4:     C2  2 REDO pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
+      E4:     C2 REDO pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
 mdb> finish
-      E5:     C2  2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
+      E5:     C2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
 mdb> dd
 p('a', 31)
 Valid? no
 Found incorrect contour:
 p('a', 31)
 Is this a bug? yes
-      E5:     C2  2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
+      E5:     C2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
 mdb> continue
-      E6:     C2  2 REDO pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
+      E6:     C2 REDO pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
 mdb> finish
-      E7:     C2  2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
+      E7:     C2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
 mdb> dd
 p('a', 32)
 Valid? no
@@ -50,11 +50,11 @@
 Found incorrect contour:
 p('a', 32)
 Is this a bug? yes
-      E7:     C2  2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
+      E7:     C2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
 mdb> continue
-      E8:     C2  2 REDO pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
+      E8:     C2 REDO pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
 mdb> finish
-      E9:     C2  2 FAIL pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
+      E9:     C2 FAIL pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
 mdb> dd
 Call p('a', _)
 Solutions:
@@ -70,6 +70,6 @@
 Found partially uncovered atom:
 p('a', _)
 Is this a bug? yes
-      E9:     C2  2 FAIL pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
+      E9:     C2 FAIL pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
 mdb> continue
 no
Index: tests/debugger/declarative/app.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/app.exp,v
retrieving revision 1.15
diff -u -r1.15 app.exp
--- tests/debugger/declarative/app.exp	17 Jan 2003 05:56:59 -0000	1.15
+++ tests/debugger/declarative/app.exp	10 Nov 2004 23:24:25 -0000
@@ -1,30 +1,30 @@
-      E1:     C1  1 CALL pred app.main/2-0 (det) app.m:10
+      E1:     C1 CALL pred app.main/2-0 (det) app.m:10
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
 mdb> break app
  0: + stop  interface pred app.app/3-0 (det)
 mdb> continue
-      E2:     C2  2 CALL pred app.app/3-0 (det) app.m:26 (app.m:13)
+      E2:     C2 CALL pred app.app/3-0 (det) app.m:26 (app.m:13)
 mdb> continue
-      E3:     C3  3 CALL pred app.app/3-0 (det) app.m:26 (app.m:28)
+      E3:     C3 CALL pred app.app/3-0 (det) app.m:26 (app.m:28)
 mdb> continue
-      E4:     C4  4 CALL pred app.app/3-0 (det) app.m:26 (app.m:28)
+      E4:     C4 CALL pred app.app/3-0 (det) app.m:26 (app.m:28)
 mdb> continue
-      E5:     C5  5 CALL pred app.app/3-0 (det) app.m:26 (app.m:28)
+      E5:     C5 CALL pred app.app/3-0 (det) app.m:26 (app.m:28)
 mdb> finish -n
-      E6:     C5  5 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
+      E6:     C5 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
 mdb> dd
 app([4, 5], [6, 7, 8], [4, ...])
 Valid? yes
 No bug found.
-      E6:     C5  5 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
+      E6:     C5 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
 mdb> continue
-      E7:     C4  4 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
+      E7:     C4 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
 mdb> continue
-      E8:     C3  3 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
+      E8:     C3 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
 mdb> continue
-      E9:     C2  2 EXIT pred app.app/3-0 (det) app.m:26 (app.m:13)
+      E9:     C2 EXIT pred app.app/3-0 (det) app.m:26 (app.m:13)
 mdb> dd
 app([1, 2, 3, 4, 5], [6, 7, ...], [|]/2)
 Valid? no
@@ -35,16 +35,16 @@
 Found incorrect contour:
 app([3, 4, 5], [6, 7, 8], [3, ...])
 Is this a bug? yes
-      E7:     C4  4 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
+      E7:     C4 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
 mdb> continue
-      E8:     C3  3 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
+      E8:     C3 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
 mdb> continue
-      E9:     C2  2 EXIT pred app.app/3-0 (det) app.m:26 (app.m:13)
+      E9:     C2 EXIT pred app.app/3-0 (det) app.m:26 (app.m:13)
 mdb> continue
 append([1, 2, 3, 4, 5], [6, 7, 8], [1, 2, 3, 4, 5, 6, 7, 8]).
-     E10:     C6  2 CALL pred app.app/3-0 (det) app.m:26 (app.m:18)
+     E10:     C6 CALL pred app.app/3-0 (det) app.m:26 (app.m:18)
 mdb> finish -n
-     E11:     C6  2 EXIT pred app.app/3-0 (det) app.m:26 (app.m:18)
+     E11:     C6 EXIT pred app.app/3-0 (det) app.m:26 (app.m:18)
 mdb> dd
 app([1, 2, 3, 4, 5, 6, 7, 8, ...], [|]/2, [|]/2)
 Valid? no
@@ -69,8 +69,8 @@
 Found incorrect contour:
 app([3, 4, 5], [6, 7, 8], [3, ...])
 Is this a bug? yes
-     E12:     C7 14 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
+     E12:     C7 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
 mdb> continue
-     E13:     C8 13 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
+     E13:     C8 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
 mdb> quit
 mdb: are you sure you want to quit? y
Index: tests/debugger/declarative/args.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/args.exp,v
retrieving revision 1.7
diff -u -r1.7 args.exp
--- tests/debugger/declarative/args.exp	30 Jan 2003 05:59:27 -0000	1.7
+++ tests/debugger/declarative/args.exp	10 Nov 2004 23:24:25 -0000
@@ -1,13 +1,13 @@
-      E1:     C1  1 CALL pred args.main/2-0 (cc_multi) args.m:17
+      E1:     C1 CALL pred args.main/2-0 (cc_multi) args.m:17
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
 mdb> break p
  0: + stop  interface pred args.p/5-0 (nondet)
 mdb> continue
-      E2:     C2  2 CALL pred args.p/5-0 (nondet) args.m:24 (args.m:10)
+      E2:     C2 CALL pred args.p/5-0 (nondet) args.m:24 (args.m:10)
 mdb> finish
-      E3:     C2  2 EXIT pred args.p/5-0 (nondet) args.m:24 (args.m:10)
+      E3:     C2 EXIT pred args.p/5-0 (nondet) args.m:24 (args.m:10)
 mdb> dd
 p(1, 16, 3, 20, 5)
 Valid? no
@@ -24,11 +24,11 @@
 Found incorrect contour:
 p(1, 16, 3, 20, 5)
 Is this a bug? yes
-      E3:     C2  2 EXIT pred args.p/5-0 (nondet) args.m:24 (args.m:10)
+      E3:     C2 EXIT pred args.p/5-0 (nondet) args.m:24 (args.m:10)
 mdb> continue
-      E4:     C2  2 REDO pred args.p/5-0 (nondet) args.m:24 (args.m:10)
+      E4:     C2 REDO pred args.p/5-0 (nondet) args.m:24 (args.m:10)
 mdb> finish
-      E5:     C2  2 EXIT pred args.p/5-0 (nondet) args.m:24 (args.m:10)
+      E5:     C2 EXIT pred args.p/5-0 (nondet) args.m:24 (args.m:10)
 mdb> dd
 p(1, -2, 3, 2, 5)
 Valid? no
@@ -39,11 +39,11 @@
 Found incorrect contour:
 p(1, -2, 3, 2, 5)
 Is this a bug? yes
-      E5:     C2  2 EXIT pred args.p/5-0 (nondet) args.m:24 (args.m:10)
+      E5:     C2 EXIT pred args.p/5-0 (nondet) args.m:24 (args.m:10)
 mdb> continue
-      E6:     C2  2 REDO pred args.p/5-0 (nondet) args.m:24 (args.m:10)
+      E6:     C2 REDO pred args.p/5-0 (nondet) args.m:24 (args.m:10)
 mdb> finish
-      E7:     C2  2 FAIL pred args.p/5-0 (nondet) args.m:24 (args.m:10)
+      E7:     C2 FAIL pred args.p/5-0 (nondet) args.m:24 (args.m:10)
 mdb> dd
 Call p(1, _, 3, _, 5)
 Solutions:
@@ -53,6 +53,6 @@
 Found partially uncovered atom:
 p(1, _, 3, _, 5)
 Is this a bug? yes
-      E7:     C2  2 FAIL pred args.p/5-0 (nondet) args.m:24 (args.m:10)
+      E7:     C2 FAIL pred args.p/5-0 (nondet) args.m:24 (args.m:10)
 mdb> continue
 no.
Index: tests/debugger/declarative/big.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/big.exp,v
retrieving revision 1.9
diff -u -r1.9 big.exp
--- tests/debugger/declarative/big.exp	30 Jan 2003 05:59:27 -0000	1.9
+++ tests/debugger/declarative/big.exp	10 Nov 2004 23:24:25 -0000
@@ -1,13 +1,13 @@
-      E1:     C1  1 CALL pred big.main/2-0 (det) big.m:10
+      E1:     C1 CALL pred big.main/2-0 (det) big.m:10
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
 mdb> break p
  0: + stop  interface pred big.p/1-0 (nondet)
 mdb> continue
-      E2:     C2  2 CALL pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+      E2:     C2 CALL pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> finish
-      E3:     C2  2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+      E3:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> dd
 p(-12)
 Valid? no
@@ -27,11 +27,11 @@
 Found incorrect contour:
 p(-12)
 Is this a bug? yes
-      E3:     C2  2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+      E3:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> continue
-      E4:     C2  2 REDO pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+      E4:     C2 REDO pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> finish
-      E5:     C2  2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+      E5:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> dd
 p(-14)
 Valid? no
@@ -42,11 +42,11 @@
 Found incorrect contour:
 p(-14)
 Is this a bug? yes
-      E5:     C2  2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+      E5:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> continue
-      E6:     C2  2 REDO pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+      E6:     C2 REDO pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> finish
-      E7:     C2  2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+      E7:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> dd
 p(-20)
 Valid? no
@@ -69,11 +69,11 @@
 Found incorrect contour:
 p(-20)
 Is this a bug? yes
-      E7:     C2  2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+      E7:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> continue
-      E8:     C2  2 REDO pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+      E8:     C2 REDO pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> finish
-      E9:     C2  2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+      E9:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> dd
 p(-22)
 Valid? no
@@ -84,11 +84,11 @@
 Found incorrect contour:
 p(-22)
 Is this a bug? yes
-      E9:     C2  2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+      E9:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> continue
-     E10:     C2  2 REDO pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+     E10:     C2 REDO pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> finish
-     E11:     C2  2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+     E11:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> dd
 p(2)
 Valid? no
@@ -116,11 +116,11 @@
 Found incorrect contour:
 p(2)
 Is this a bug? yes
-     E11:     C2  2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+     E11:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> continue
-     E12:     C2  2 REDO pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+     E12:     C2 REDO pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> finish
-     E13:     C2  2 FAIL pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+     E13:     C2 FAIL pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> dd
 Call p(_)
 Solutions:
@@ -164,6 +164,6 @@
 Found partially uncovered atom:
 p(_)
 Is this a bug? yes
-     E13:     C2  2 FAIL pred big.p/1-0 (nondet) big.m:24 (big.m:12)
+     E13:     C2 FAIL pred big.p/1-0 (nondet) big.m:24 (big.m:12)
 mdb> continue
 no.
Index: tests/debugger/declarative/filter.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/filter.exp,v
retrieving revision 1.9
diff -u -r1.9 filter.exp
--- tests/debugger/declarative/filter.exp	17 Jan 2003 05:57:00 -0000	1.9
+++ tests/debugger/declarative/filter.exp	10 Nov 2004 23:24:25 -0000
@@ -1,13 +1,13 @@
-      E1:     C1  1 CALL pred filter.main/2-0 (det) filter.m:13
+      E1:     C1 CALL pred filter.main/2-0 (det) filter.m:13
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
 mdb> break p
  0: + stop  interface pred filter.p/1-0 (multi)
 mdb> continue
-      E2:     C2  2 CALL pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+      E2:     C2 CALL pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> finish
-      E3:     C2  2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+      E3:     C2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> dd
 p([1, 2, 9])
 Valid? no
@@ -20,11 +20,11 @@
 Found incorrect contour:
 p([1, 2, 9])
 Is this a bug? yes
-      E3:     C2  2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+      E3:     C2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> continue
-      E4:     C2  2 REDO pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+      E4:     C2 REDO pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> finish
-      E5:     C2  2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+      E5:     C2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> dd
 p([1, 2, 7, 8, 9])
 Valid? no
@@ -35,11 +35,11 @@
 Found incorrect contour:
 p([1, 2, 7, 8, 9])
 Is this a bug? yes
-      E5:     C2  2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+      E5:     C2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> continue
-      E6:     C2  2 REDO pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+      E6:     C2 REDO pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> finish
-      E7:     C2  2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+      E7:     C2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> dd
 p([1, 2, 3, 9])
 Valid? no
@@ -50,11 +50,11 @@
 Found incorrect contour:
 p([1, 2, 3, 9])
 Is this a bug? yes
-      E7:     C2  2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+      E7:     C2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> continue
-      E8:     C2  2 REDO pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+      E8:     C2 REDO pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> finish
-      E9:     C2  2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+      E9:     C2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> dd
 p([1, 2, 3, 7, 8, 9])
 Valid? no
@@ -63,11 +63,11 @@
 Found incorrect contour:
 p([1, 2, 3, 7, 8, 9])
 Is this a bug? yes
-      E9:     C2  2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+      E9:     C2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> continue
-     E10:     C2  2 REDO pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+     E10:     C2 REDO pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> finish
-     E11:     C2  2 FAIL pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+     E11:     C2 FAIL pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> dd
 Call p(_)
 Solutions:
@@ -89,6 +89,6 @@
 Found partially uncovered atom:
 p(_)
 Is this a bug? yes
-     E11:     C2  2 FAIL pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
+     E11:     C2 FAIL pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
 mdb> continue
 no
Index: tests/debugger/declarative/if_then_else.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/if_then_else.exp,v
retrieving revision 1.10
diff -u -r1.10 if_then_else.exp
--- tests/debugger/declarative/if_then_else.exp	17 Jan 2003 05:57:01 -0000	1.10
+++ tests/debugger/declarative/if_then_else.exp	10 Nov 2004 23:24:25 -0000
@@ -1,13 +1,13 @@
-      E1:     C1  1 CALL pred if_then_else.main/2-0 (det) if_then_else.m:7
+      E1:     C1 CALL pred if_then_else.main/2-0 (det) if_then_else.m:7
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
 mdb> break ite
  0: + stop  interface pred if_then_else.ite/2-0 (det)
 mdb> continue
-      E2:     C2  2 CALL pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:8)
+      E2:     C2 CALL pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:8)
 mdb> finish
-      E3:     C2  2 EXIT pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:8)
+      E3:     C2 EXIT pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:8)
 mdb> dd
 ite(0, 1)
 Valid? no
@@ -18,12 +18,12 @@
 Found incorrect contour:
 ite(0, 1)
 Is this a bug? yes
-      E3:     C2  2 EXIT pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:8)
+      E3:     C2 EXIT pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:8)
 mdb> continue
 ite(0, 1).
-      E4:     C3  2 CALL pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:12)
+      E4:     C3 CALL pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:12)
 mdb> finish
-      E5:     C3  2 EXIT pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:12)
+      E5:     C3 EXIT pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:12)
 mdb> dd
 ite(1, 0)
 Valid? no
@@ -33,6 +33,6 @@
 Found incorrect contour:
 ite(1, 0)
 Is this a bug? yes
-      E5:     C3  2 EXIT pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:12)
+      E5:     C3 EXIT pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:12)
 mdb> continue
 ite(1, 0).
Index: tests/debugger/declarative/input_term_dep.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/input_term_dep.exp,v
retrieving revision 1.5
diff -u -r1.5 input_term_dep.exp
--- tests/debugger/declarative/input_term_dep.exp	17 Jan 2003 05:57:01 -0000	1.5
+++ tests/debugger/declarative/input_term_dep.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred input_term_dep.main/2-0 (det) input_term_dep.m:9
+      E1:     C1 CALL pred input_term_dep.main/2-0 (det) input_term_dep.m:9
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -11,9 +11,9 @@
 mdb> break s
  3: + stop  interface pred input_term_dep.s/1-0 (semidet)
 mdb> continue
-      E2:     C2  3 CALL pred input_term_dep.p/3-0 (det) input_term_dep.m:33 (input_term_dep.m:22)
+      E2:     C2 CALL pred input_term_dep.p/3-0 (det) input_term_dep.m:33 (input_term_dep.m:22)
 mdb> finish
-      E3:     C2  3 EXIT pred input_term_dep.p/3-0 (det) input_term_dep.m:33 (input_term_dep.m:22)
+      E3:     C2 EXIT pred input_term_dep.p/3-0 (det) input_term_dep.m:33 (input_term_dep.m:22)
 mdb> dd
 p(5, 8, 13)
 Valid? browse 3
@@ -28,14 +28,14 @@
 Found incorrect contour:
 p(5, 8, 13)
 Is this a bug? yes
-      E3:     C2  3 EXIT pred input_term_dep.p/3-0 (det) input_term_dep.m:33 (input_term_dep.m:22)
+      E3:     C2 EXIT pred input_term_dep.p/3-0 (det) input_term_dep.m:33 (input_term_dep.m:22)
 mdb> continue
 5
 8
 13
-      E4:     C3  3 CALL pred input_term_dep.q/1-0 (semidet) input_term_dep.m:69 (input_term_dep.m:58)
+      E4:     C3 CALL pred input_term_dep.q/1-0 (semidet) input_term_dep.m:69 (input_term_dep.m:58)
 mdb> finish
-      E5:     C3  3 EXIT pred input_term_dep.q/1-0 (semidet) input_term_dep.m:69 (input_term_dep.m:58)
+      E5:     C3 EXIT pred input_term_dep.q/1-0 (semidet) input_term_dep.m:69 (input_term_dep.m:58)
 mdb> dd
 q([[2, 3], [], [1]])
 Valid? browse 1
@@ -50,12 +50,12 @@
 Found incorrect contour:
 q([[2, 3], [], [1]])
 Is this a bug? yes
-      E5:     C3  3 EXIT pred input_term_dep.q/1-0 (semidet) input_term_dep.m:69 (input_term_dep.m:58)
+      E5:     C3 EXIT pred input_term_dep.q/1-0 (semidet) input_term_dep.m:69 (input_term_dep.m:58)
 mdb> continue
 [[2, 3], [], [1]]
-      E6:     C4  3 CALL pred input_term_dep.r/2-0 (det) input_term_dep.m:111 (input_term_dep.m:93)
+      E6:     C4 CALL pred input_term_dep.r/2-0 (det) input_term_dep.m:111 (input_term_dep.m:93)
 mdb> finish
-      E7:     C4  3 EXIT pred input_term_dep.r/2-0 (det) input_term_dep.m:111 (input_term_dep.m:93)
+      E7:     C4 EXIT pred input_term_dep.r/2-0 (det) input_term_dep.m:111 (input_term_dep.m:93)
 mdb> dd
 r(1, 33)
 Valid? browse 2
@@ -70,12 +70,12 @@
 Found incorrect contour:
 r(1, 33)
 Is this a bug? yes
-      E7:     C4  3 EXIT pred input_term_dep.r/2-0 (det) input_term_dep.m:111 (input_term_dep.m:93)
+      E7:     C4 EXIT pred input_term_dep.r/2-0 (det) input_term_dep.m:111 (input_term_dep.m:93)
 mdb> continue
 33
-      E8:     C5  3 CALL pred input_term_dep.s/1-0 (semidet) input_term_dep.m:146 (input_term_dep.m:135)
+      E8:     C5 CALL pred input_term_dep.s/1-0 (semidet) input_term_dep.m:146 (input_term_dep.m:135)
 mdb> finish
-      E9:     C5  3 EXIT pred input_term_dep.s/1-0 (semidet) input_term_dep.m:146 (input_term_dep.m:135)
+      E9:     C5 EXIT pred input_term_dep.s/1-0 (semidet) input_term_dep.m:146 (input_term_dep.m:135)
 mdb> dd
 s(1)
 Valid? no
@@ -93,6 +93,6 @@
 Found incorrect contour:
 s(1)
 Is this a bug? yes
-      E9:     C5  3 EXIT pred input_term_dep.s/1-0 (semidet) input_term_dep.m:146 (input_term_dep.m:135)
+      E9:     C5 EXIT pred input_term_dep.s/1-0 (semidet) input_term_dep.m:146 (input_term_dep.m:135)
 mdb> continue
 yes
Index: tests/debugger/declarative/io_stream_test.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/io_stream_test.exp,v
retrieving revision 1.2
diff -u -r1.2 io_stream_test.exp
--- tests/debugger/declarative/io_stream_test.exp	10 Mar 2004 04:30:47 -0000	1.2
+++ tests/debugger/declarative/io_stream_test.exp	11 Nov 2004 10:56:22 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred io_stream_test.main/2-0 (det) io_stream_test.m:16
+      E1:     C1 CALL pred io_stream_test.main/2-0 (det) io_stream_test.m:16
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -10,12 +10,12 @@
 mdb> break io_stream_test__test
  0: + stop  interface pred io_stream_test.test/4-0 (det)
 mdb> continue
-      E2:     C2  3 CALL pred io_stream_test.test/4-0 (det)
+      E2:     C2 CALL pred io_stream_test.test/4-0 (det)
 mdb> print *
        Stream (arg 1)         	stream(0, input, text, file("tabled_read_decl.data"))
        DCG_0 (arg 3)          	state('<<c_pointer>>')
 mdb> finish -n
-      E3:     C2  3 EXIT pred io_stream_test.test/4-0 (det)
+      E3:     C2 EXIT pred io_stream_test.test/4-0 (det)
 mdb> print *
        Stream (arg 1)         	stream(0, input, text, file("tabled_read_decl.data"))
        N (arg 2)              	1123
@@ -63,7 +63,7 @@
 read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 51)
 read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 10)
 Is this a bug? yes
-      E3:     C2  3 EXIT pred io_stream_test.test/4-0 (det)
+      E3:     C2 EXIT pred io_stream_test.test/4-0 (det)
 mdb> c -n -S
 1123
 1456
Index: tests/debugger/declarative/io_stream_test.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/io_stream_test.exp2,v
retrieving revision 1.2
diff -u -r1.2 io_stream_test.exp2
--- tests/debugger/declarative/io_stream_test.exp2	10 Mar 2004 04:30:47 -0000	1.2
+++ tests/debugger/declarative/io_stream_test.exp2	10 Nov 2004 23:26:49 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred io_stream_test.main/2-0 (det) io_stream_test.m:16
+      E1:     C1 CALL pred io_stream_test.main/2-0 (det) io_stream_test.m:16
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -10,12 +10,12 @@
 mdb> break io_stream_test__test
  0: + stop  interface pred io_stream_test.test/4-0 (det)
 mdb> continue
-      E2:     C2  3 CALL pred io_stream_test.test/4-0 (det)
+      E2:     C2 CALL pred io_stream_test.test/4-0 (det)
 mdb> print *
        Stream (arg 1)         	stream(0, input, text, file("tabled_read_decl.data"))
        DCG_0 (arg 3)          	state('<<c_pointer>>')
 mdb> finish -n
-      E3:     C2  3 EXIT pred io_stream_test.test/4-0 (det)
+      E3:     C2 EXIT pred io_stream_test.test/4-0 (det)
 mdb> print *
        Stream (arg 1)         	stream(0, input, text, file("tabled_read_decl.data"))
        N (arg 2)              	1123
@@ -37,7 +37,7 @@
 Found incorrect contour:
 test(stream(0, input, text, file("tabled_read_decl.data")), 1456, _, state('<<c_pointer>>'))
 Is this a bug? yes
-      E3:     C2  3 EXIT pred io_stream_test.test/4-0 (det)
+      E3:     C2 EXIT pred io_stream_test.test/4-0 (det)
 mdb> c -n -S
 1789
 142
Index: tests/debugger/declarative/output_term_dep.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/output_term_dep.exp,v
retrieving revision 1.7
diff -u -r1.7 output_term_dep.exp
--- tests/debugger/declarative/output_term_dep.exp	17 Jan 2003 05:57:01 -0000	1.7
+++ tests/debugger/declarative/output_term_dep.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred output_term_dep.main/2-0 (det) output_term_dep.m:9
+      E1:     C1 CALL pred output_term_dep.main/2-0 (det) output_term_dep.m:9
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -15,9 +15,9 @@
 mdb> break t
  4: + stop  interface pred output_term_dep.t/2-0 (semidet)
 mdb> continue
-      E2:     C2  3 CALL pred output_term_dep.p/3-0 (det)
+      E2:     C2 CALL pred output_term_dep.p/3-0 (det)
 mdb> finish
-      E3:     C2  3 EXIT pred output_term_dep.p/3-0 (det)
+      E3:     C2 EXIT pred output_term_dep.p/3-0 (det)
 mdb> dd
 p(5, 8, 13)
 Valid? browse 2
@@ -31,14 +31,14 @@
 Found incorrect contour:
 p(5, 8, 13)
 Is this a bug? yes
-      E3:     C2  3 EXIT pred output_term_dep.p/3-0 (det)
+      E3:     C2 EXIT pred output_term_dep.p/3-0 (det)
 mdb> continue
 5
 8
 13
-      E4:     C3  3 CALL pred output_term_dep.q/1-0 (det)
+      E4:     C3 CALL pred output_term_dep.q/1-0 (det)
 mdb> finish
-      E5:     C3  3 EXIT pred output_term_dep.q/1-0 (det)
+      E5:     C3 EXIT pred output_term_dep.q/1-0 (det)
 mdb> dd
 q([[1, ...], [], [99]])
 Valid? browse 1
@@ -52,12 +52,12 @@
 Found incorrect contour:
 q([[1, ...], [], [99]])
 Is this a bug? yes
-      E5:     C3  3 EXIT pred output_term_dep.q/1-0 (det)
+      E5:     C3 EXIT pred output_term_dep.q/1-0 (det)
 mdb> continue
 [[1, 2, 3], [], [99]]
-      E6:     C4  3 CALL pred output_term_dep.r/2-0 (det)
+      E6:     C4 CALL pred output_term_dep.r/2-0 (det)
 mdb> finish
-      E7:     C4  3 EXIT pred output_term_dep.r/2-0 (det)
+      E7:     C4 EXIT pred output_term_dep.r/2-0 (det)
 mdb> dd
 r(1, 999)
 Valid? browse 2
@@ -65,12 +65,12 @@
 Found incorrect contour:
 r(1, 999)
 Is this a bug? yes
-      E7:     C4  3 EXIT pred output_term_dep.r/2-0 (det)
+      E7:     C4 EXIT pred output_term_dep.r/2-0 (det)
 mdb> continue
 999
-      E8:     C5  3 CALL pred output_term_dep.r/2-0 (det)
+      E8:     C5 CALL pred output_term_dep.r/2-0 (det)
 mdb> finish
-      E9:     C5  3 EXIT pred output_term_dep.r/2-0 (det)
+      E9:     C5 EXIT pred output_term_dep.r/2-0 (det)
 mdb> dd
 r(2, 43)
 Valid? browse 2
@@ -83,12 +83,12 @@
 Found incorrect contour:
 r(2, 43)
 Is this a bug? yes
-      E9:     C5  3 EXIT pred output_term_dep.r/2-0 (det)
+      E9:     C5 EXIT pred output_term_dep.r/2-0 (det)
 mdb> continue
 43
-     E10:     C6  3 CALL pred output_term_dep.r/2-0 (det)
+     E10:     C6 CALL pred output_term_dep.r/2-0 (det)
 mdb> finish
-     E11:     C6  3 EXIT pred output_term_dep.r/2-0 (det)
+     E11:     C6 EXIT pred output_term_dep.r/2-0 (det)
 mdb> dd
 r(3, 57)
 Valid? browse 2
@@ -102,12 +102,12 @@
 Found incorrect contour:
 r(3, 57)
 Is this a bug? yes
-     E11:     C6  3 EXIT pred output_term_dep.r/2-0 (det)
+     E11:     C6 EXIT pred output_term_dep.r/2-0 (det)
 mdb> continue
 57
-     E12:     C7  3 CALL pred output_term_dep.r/2-0 (det)
+     E12:     C7 CALL pred output_term_dep.r/2-0 (det)
 mdb> finish
-     E13:     C7  3 EXIT pred output_term_dep.r/2-0 (det)
+     E13:     C7 EXIT pred output_term_dep.r/2-0 (det)
 mdb> dd
 r(4, -1)
 Valid? browse 2
@@ -120,12 +120,12 @@
 Found incorrect contour:
 r(4, -1)
 Is this a bug? yes
-     E13:     C7  3 EXIT pred output_term_dep.r/2-0 (det)
+     E13:     C7 EXIT pred output_term_dep.r/2-0 (det)
 mdb> continue
 -1
-     E14:     C8  3 CALL pred output_term_dep.s/3-0 (nondet)
+     E14:     C8 CALL pred output_term_dep.s/3-0 (nondet)
 mdb> finish
-     E15:     C8  3 EXIT pred output_term_dep.s/3-0 (nondet)
+     E15:     C8 EXIT pred output_term_dep.s/3-0 (nondet)
 mdb> dd
 s(1, 7, 7)
 Valid? browse 2
@@ -133,11 +133,11 @@
 sa(7)
 Valid? abort
 Diagnosis aborted.
-     E15:     C8  3 EXIT pred output_term_dep.s/3-0 (nondet)
+     E15:     C8 EXIT pred output_term_dep.s/3-0 (nondet)
 mdb> continue
-     E16:     C8  3 REDO pred output_term_dep.s/3-0 (nondet)
+     E16:     C8 REDO pred output_term_dep.s/3-0 (nondet)
 mdb> finish
-     E17:     C8  3 EXIT pred output_term_dep.s/3-0 (nondet)
+     E17:     C8 EXIT pred output_term_dep.s/3-0 (nondet)
 mdb> dd
 s(1, 7, 155)
 Valid? browse 3
@@ -145,11 +145,11 @@
 sc(155)
 Valid? abort
 Diagnosis aborted.
-     E17:     C8  3 EXIT pred output_term_dep.s/3-0 (nondet)
+     E17:     C8 EXIT pred output_term_dep.s/3-0 (nondet)
 mdb> continue
-     E18:     C8  3 REDO pred output_term_dep.s/3-0 (nondet)
+     E18:     C8 REDO pred output_term_dep.s/3-0 (nondet)
 mdb> finish
-     E19:     C8  3 EXIT pred output_term_dep.s/3-0 (nondet)
+     E19:     C8 EXIT pred output_term_dep.s/3-0 (nondet)
 mdb> dd
 s(1, 38, 7)
 Valid? browse 3
@@ -157,11 +157,11 @@
 sa(7)
 Valid? abort
 Diagnosis aborted.
-     E19:     C8  3 EXIT pred output_term_dep.s/3-0 (nondet)
+     E19:     C8 EXIT pred output_term_dep.s/3-0 (nondet)
 mdb> continue
-     E20:     C8  3 REDO pred output_term_dep.s/3-0 (nondet)
+     E20:     C8 REDO pred output_term_dep.s/3-0 (nondet)
 mdb> finish
-     E21:     C8  3 EXIT pred output_term_dep.s/3-0 (nondet)
+     E21:     C8 EXIT pred output_term_dep.s/3-0 (nondet)
 mdb> dd
 s(1, 38, 155)
 Valid? browse 3
@@ -169,16 +169,16 @@
 sc(155)
 Valid? abort
 Diagnosis aborted.
-     E21:     C8  3 EXIT pred output_term_dep.s/3-0 (nondet)
+     E21:     C8 EXIT pred output_term_dep.s/3-0 (nondet)
 mdb> continue
-     E22:     C8  3 REDO pred output_term_dep.s/3-0 (nondet)
+     E22:     C8 REDO pred output_term_dep.s/3-0 (nondet)
 mdb> finish
-     E23:     C8  3 FAIL pred output_term_dep.s/3-0 (nondet)
+     E23:     C8 FAIL pred output_term_dep.s/3-0 (nondet)
 mdb> continue
 no
-     E24:     C9  3 CALL pred output_term_dep.s/3-0 (nondet)
+     E24:     C9 CALL pred output_term_dep.s/3-0 (nondet)
 mdb> finish
-     E25:     C9  3 EXIT pred output_term_dep.s/3-0 (nondet)
+     E25:     C9 EXIT pred output_term_dep.s/3-0 (nondet)
 mdb> dd
 s(2, 7, 38)
 Valid? browse 3
@@ -188,13 +188,13 @@
 Found incorrect contour:
 sb(38)
 Is this a bug? yes
-     E26:    C10  4 EXIT pred output_term_dep.sb/1-0 (det)
+     E26:    C10 EXIT pred output_term_dep.sb/1-0 (det)
 mdb> continue
-     E25:     C9  3 EXIT pred output_term_dep.s/3-0 (nondet)
+     E25:     C9 EXIT pred output_term_dep.s/3-0 (nondet)
 mdb> continue
-     E27:     C9  3 REDO pred output_term_dep.s/3-0 (nondet)
+     E27:     C9 REDO pred output_term_dep.s/3-0 (nondet)
 mdb> finish
-     E28:     C9  3 EXIT pred output_term_dep.s/3-0 (nondet)
+     E28:     C9 EXIT pred output_term_dep.s/3-0 (nondet)
 mdb> dd
 s(2, 38, 155)
 Valid? browse 2
@@ -202,18 +202,18 @@
 Found incorrect contour:
 sb(38)
 Is this a bug? yes
-     E29:    C11  4 EXIT pred output_term_dep.sb/1-0 (det)
+     E29:    C11 EXIT pred output_term_dep.sb/1-0 (det)
 mdb> continue
-     E28:     C9  3 EXIT pred output_term_dep.s/3-0 (nondet)
+     E28:     C9 EXIT pred output_term_dep.s/3-0 (nondet)
 mdb> continue
-     E30:     C9  3 REDO pred output_term_dep.s/3-0 (nondet)
+     E30:     C9 REDO pred output_term_dep.s/3-0 (nondet)
 mdb> continue
-     E31:     C9  3 FAIL pred output_term_dep.s/3-0 (nondet)
+     E31:     C9 FAIL pred output_term_dep.s/3-0 (nondet)
 mdb> continue
 no
-     E32:    C12  3 CALL pred output_term_dep.t/2-0 (semidet)
+     E32:    C12 CALL pred output_term_dep.t/2-0 (semidet)
 mdb> finish
-     E33:    C12  3 EXIT pred output_term_dep.t/2-0 (semidet)
+     E33:    C12 EXIT pred output_term_dep.t/2-0 (semidet)
 mdb> dd
 t(1, 77)
 Valid? browse 2
@@ -229,6 +229,6 @@
 Found incorrect contour:
 t(1, 77)
 Is this a bug? yes
-     E33:    C12  3 EXIT pred output_term_dep.t/2-0 (semidet)
+     E33:    C12 EXIT pred output_term_dep.t/2-0 (semidet)
 mdb> continue
 77
Index: tests/debugger/declarative/propositional.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/propositional.exp,v
retrieving revision 1.11
diff -u -r1.11 propositional.exp
--- tests/debugger/declarative/propositional.exp	17 Jan 2003 05:57:02 -0000	1.11
+++ tests/debugger/declarative/propositional.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred propositional.main/2-0 (det) propositional.m:13
+      E1:     C1 CALL pred propositional.main/2-0 (det) propositional.m:13
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -7,9 +7,9 @@
 mdb> break b
  1: + stop  interface pred propositional.b/0-0 (semidet)
 mdb> continue
-      E2:     C2  2 CALL pred propositional.a/0-0 (semidet) propositional.m:27 (propositional.m:10)
+      E2:     C2 CALL pred propositional.a/0-0 (semidet) propositional.m:27 (propositional.m:10)
 mdb> finish
-      E3:     C2  2 EXIT pred propositional.a/0-0 (semidet) propositional.m:27 (propositional.m:10)
+      E3:     C2 EXIT pred propositional.a/0-0 (semidet) propositional.m:27 (propositional.m:10)
 mdb> dd
 a
 Valid? no
@@ -18,11 +18,11 @@
 Found incorrect contour:
 a
 Is this a bug? yes
-      E3:     C2  2 EXIT pred propositional.a/0-0 (semidet) propositional.m:27 (propositional.m:10)
+      E3:     C2 EXIT pred propositional.a/0-0 (semidet) propositional.m:27 (propositional.m:10)
 mdb> continue
-      E4:     C3  2 CALL pred propositional.b/0-0 (semidet) propositional.m:29 (propositional.m:10)
+      E4:     C3 CALL pred propositional.b/0-0 (semidet) propositional.m:29 (propositional.m:10)
 mdb> finish
-      E5:     C3  2 EXIT pred propositional.b/0-0 (semidet) propositional.m:29 (propositional.m:10)
+      E5:     C3 EXIT pred propositional.b/0-0 (semidet) propositional.m:29 (propositional.m:10)
 mdb> dd
 b
 Valid? no
@@ -33,8 +33,8 @@
 Found incorrect contour:
 f
 Is this a bug? yes
-      E6:     C4  3 EXIT pred propositional.f/0-0 (semidet) propositional.m:35 (propositional.m:29)
+      E6:     C4 EXIT pred propositional.f/0-0 (semidet) propositional.m:35 (propositional.m:29)
 mdb> continue
-      E5:     C3  2 EXIT pred propositional.b/0-0 (semidet) propositional.m:29 (propositional.m:10)
+      E5:     C3 EXIT pred propositional.b/0-0 (semidet) propositional.m:29 (propositional.m:10)
 mdb> continue
 yes
Index: tests/debugger/declarative/remember_modes.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/remember_modes.exp,v
retrieving revision 1.1
diff -u -r1.1 remember_modes.exp
--- tests/debugger/declarative/remember_modes.exp	7 Jul 2004 05:26:16 -0000	1.1
+++ tests/debugger/declarative/remember_modes.exp	10 Nov 2004 23:24:25 -0000
@@ -1,13 +1,13 @@
-      E1:     C1  1 CALL pred remember_modes.main/2-0 (det) remember_modes.m:37
+      E1:     C1 CALL pred remember_modes.main/2-0 (det) remember_modes.m:37
 mdb> Contexts will not be printed.
 mdb> mdb> echo on
 Command echo enabled.
 mdb> break q
  0: + stop  interface pred remember_modes.q/5-0 (semidet)
 mdb> continue
-      E2:     C2  2 CALL pred remember_modes.q/5-0 (semidet)
+      E2:     C2 CALL pred remember_modes.q/5-0 (semidet)
 mdb> finish
-      E3:     C2  2 EXIT pred remember_modes.q/5-0 (semidet)
+      E3:     C2 EXIT pred remember_modes.q/5-0 (semidet)
 mdb> dd
 q(1, 1, 2, 1, 2)
 Valid? no
@@ -16,7 +16,7 @@
 Found incorrect contour:
 q(1, 1, 2, 1, 2)
 Is this a bug? yes
-      E3:     C2  2 EXIT pred remember_modes.q/5-0 (semidet)
+      E3:     C2 EXIT pred remember_modes.q/5-0 (semidet)
 mdb> continue
 1
 2
Index: tests/debugger/declarative/special_term_dep.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/special_term_dep.exp,v
retrieving revision 1.3
diff -u -r1.3 special_term_dep.exp
--- tests/debugger/declarative/special_term_dep.exp	17 Jan 2003 05:57:02 -0000	1.3
+++ tests/debugger/declarative/special_term_dep.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred special_term_dep.main/2-0 (det) special_term_dep.m:13
+      E1:     C1 CALL pred special_term_dep.main/2-0 (det) special_term_dep.m:13
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -7,9 +7,9 @@
 mdb> break q
  1: + stop  interface pred special_term_dep.q/2-0 (semidet)
 mdb> continue
-      E2:     C2  3 CALL pred special_term_dep.p/1-0 (det) special_term_dep.m:29 (special_term_dep.m:22)
+      E2:     C2 CALL pred special_term_dep.p/1-0 (det) special_term_dep.m:29 (special_term_dep.m:22)
 mdb> finish
-      E3:     C2  3 EXIT pred special_term_dep.p/1-0 (det) special_term_dep.m:29 (special_term_dep.m:22)
+      E3:     C2 EXIT pred special_term_dep.p/1-0 (det) special_term_dep.m:29 (special_term_dep.m:22)
 mdb> dd
 p([2, 3])
 Valid? browse 1
@@ -19,12 +19,12 @@
 Found incorrect contour:
 p([2, 3])
 Is this a bug? yes
-      E3:     C2  3 EXIT pred special_term_dep.p/1-0 (det) special_term_dep.m:29 (special_term_dep.m:22)
+      E3:     C2 EXIT pred special_term_dep.p/1-0 (det) special_term_dep.m:29 (special_term_dep.m:22)
 mdb> continue
 [2, 3]
-      E4:     C3  3 CALL pred special_term_dep.q/2-0 (semidet) special_term_dep.m:61 (special_term_dep.m:50)
+      E4:     C3 CALL pred special_term_dep.q/2-0 (semidet) special_term_dep.m:61 (special_term_dep.m:50)
 mdb> finish
-      E5:     C3  3 EXIT pred special_term_dep.q/2-0 (semidet) special_term_dep.m:61 (special_term_dep.m:50)
+      E5:     C3 EXIT pred special_term_dep.q/2-0 (semidet) special_term_dep.m:61 (special_term_dep.m:50)
 mdb> dd
 q([1, 2], [3])
 Valid? browse 2
@@ -37,6 +37,6 @@
 Found incorrect contour:
 q([1, 2], [3])
 Is this a bug? yes
-      E5:     C3  3 EXIT pred special_term_dep.q/2-0 (semidet) special_term_dep.m:61 (special_term_dep.m:50)
+      E5:     C3 EXIT pred special_term_dep.q/2-0 (semidet) special_term_dep.m:61 (special_term_dep.m:50)
 mdb> continue
 [3]
Index: tests/debugger/declarative/tabled_read_decl.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/tabled_read_decl.exp,v
retrieving revision 1.9
diff -u -r1.9 tabled_read_decl.exp
--- tests/debugger/declarative/tabled_read_decl.exp	10 Mar 2004 04:30:47 -0000	1.9
+++ tests/debugger/declarative/tabled_read_decl.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred tabled_read_decl.main/2-0 (det) tabled_read_decl.m:17
+      E1:     C1 CALL pred tabled_read_decl.main/2-0 (det) tabled_read_decl.m:17
 mdb> echo on
 Command echo enabled.
 mdb> register --quiet
@@ -10,9 +10,9 @@
 mdb> break tabled_read_decl__test
  0: + stop  interface pred tabled_read_decl.test/4-0 (det)
 mdb> continue
-      E2:     C2  3 CALL pred tabled_read_decl.test/4-0 (det)
+      E2:     C2 CALL pred tabled_read_decl.test/4-0 (det)
 mdb> finish -n
-      E3:     C2  3 EXIT pred tabled_read_decl.test/4-0 (det)
+      E3:     C2 EXIT pred tabled_read_decl.test/4-0 (det)
 mdb> print
 test('<<c_pointer>>', 1123, _, state('<<c_pointer>>'))
 mdb> dd -a
@@ -81,7 +81,7 @@
 read_char_code('<<c_pointer>>', 51)
 read_char_code('<<c_pointer>>', 10)
 Is this a bug? yes
-      E3:     C2  3 EXIT pred tabled_read_decl.test/4-0 (det)
+      E3:     C2 EXIT pred tabled_read_decl.test/4-0 (det)
 mdb> c -n -S
 1123
 1456
Index: tests/debugger/declarative/trust.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/trust.exp,v
retrieving revision 1.3
diff -u -r1.3 trust.exp
--- tests/debugger/declarative/trust.exp	20 Sep 2004 04:50:25 -0000	1.3
+++ tests/debugger/declarative/trust.exp	10 Nov 2004 23:24:25 -0000
@@ -1,4 +1,4 @@
-      E1:     C1  1 CALL pred trust.main/2-0 (cc_multi) trust.m:13
+      E1:     C1 CALL pred trust.main/2-0 (cc_multi) trust.m:13
 mdb> mdb> Contexts will not be printed.
 mdb> echo on
 Command echo enabled.
@@ -60,16 +60,16 @@
 mdb> untrust 99
 mdb: no such trusted object
 mdb> step
-      E2:     C2  2 CALL pred trust.dostuff/2-0 (cc_multi)
+      E2:     C2 CALL pred trust.dostuff/2-0 (cc_multi)
 mdb> finish
-      E3:     C2  2 EXIT pred trust.dostuff/2-0 (cc_multi)
+      E3:     C2 EXIT pred trust.dostuff/2-0 (cc_multi)
 mdb> dd
 dostuff(w("aaabbb"), '=')
 Valid? n
 Found incorrect contour:
 dostuff(w("aaabbb"), '=')
 Is this a bug? y
-      E3:     C2  2 EXIT pred trust.dostuff/2-0 (cc_multi)
+      E3:     C2 EXIT pred trust.dostuff/2-0 (cc_multi)
 mdb> continue
 aaabbb
 '='
Index: trace/mercury_trace_internal.c
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_internal.c,v
retrieving revision 1.178
diff -u -r1.178 mercury_trace_internal.c
--- trace/mercury_trace_internal.c	20 Sep 2004 04:50:25 -0000	1.178
+++ trace/mercury_trace_internal.c	10 Nov 2004 13:22:28 -0000
@@ -7084,8 +7084,7 @@
 		fprintf(MR_mdb_out, "%8s: ", buf);
 		snprintf(buf, 64, "C%ld", (long) call_num);
 		fprintf(MR_mdb_out, "%6s ", buf);
-		fprintf(MR_mdb_out, "%2ld %s",
-			(long) event_info->MR_call_depth,
+		fprintf(MR_mdb_out, "%s",
 			MR_port_names[event_info->MR_trace_port]);
 	} else {
 		fprintf(MR_mdb_out, "%8ld: %6ld %2ld %s",
--------------------------------------------------------------------------
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