[m-rev.] for review: print contour when found incorrect contour bug

Ian MacLarty maclarty at cs.mu.OZ.AU
Sun Jan 2 19:31:59 AEDT 2005


For review by anyone.

Estimated hours taken: 4
Branches: main

Print all atoms in a contour when found incorrect contour bug.

browser/declarative_debugger.m
	Define decl_contour type as a list of final atoms.

browser/declarative_tree.m
	Add function to find the exit atoms in a contour.  Include the contour
	in incorrect contour bugs.
	
browser/declarative_user.m
	Print exit atoms in contour when displaying incorrect contour bug.

doc/user_guide.texi
	Document new output for incorrect contour bugs.

tests/debugger/declarative/aadebug.exp
tests/debugger/declarative/app.exp
tests/debugger/declarative/args.exp
tests/debugger/declarative/big.exp
tests/debugger/declarative/binary_search.exp
tests/debugger/declarative/binary_search.exp2
tests/debugger/declarative/catch.exp
tests/debugger/declarative/catch.exp2
tests/debugger/declarative/empty_command.exp
tests/debugger/declarative/explicit_subtree.exp
tests/debugger/declarative/explicit_subtree.exp2
tests/debugger/declarative/filter.exp
tests/debugger/declarative/find_origin.exp
tests/debugger/declarative/find_origin.exp2
tests/debugger/declarative/func_call.exp
tests/debugger/declarative/func_call.exp2
tests/debugger/declarative/gcf.exp
tests/debugger/declarative/gcf.exp2
tests/debugger/declarative/higher_order.exp
tests/debugger/declarative/higher_order.exp2
tests/debugger/declarative/ho2.exp
tests/debugger/declarative/ho2.exp2
tests/debugger/declarative/if_then_else.exp
tests/debugger/declarative/ignore.exp
tests/debugger/declarative/ignore.exp2
tests/debugger/declarative/inadmissible.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/ite_2.exp
tests/debugger/declarative/ite_2.exp2
tests/debugger/declarative/lpe_example.exp
tests/debugger/declarative/lpe_example.exp2
tests/debugger/declarative/lpe_example.exp3
tests/debugger/declarative/oracle_db.exp
tests/debugger/declarative/output_term_dep.exp
tests/debugger/declarative/propositional.exp
tests/debugger/declarative/remember_modes.exp
tests/debugger/declarative/revise.exp
tests/debugger/declarative/shallow.exp
tests/debugger/declarative/skip.exp
tests/debugger/declarative/solutions.exp3
tests/debugger/declarative/special_term_dep.exp
tests/debugger/declarative/tabled_read_decl.exp
tests/debugger/declarative/trust.exp
tests/debugger/declarative/untraced_subgoal.exp
	Change expected output for test cases that print incorrect contour 
	bugs.

Index: browser/declarative_debugger.m
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/declarative_debugger.m,v
retrieving revision 1.43
diff -u -r1.43 declarative_debugger.m
--- browser/declarative_debugger.m	16 Dec 2004 00:12:38 -0000	1.43
+++ browser/declarative_debugger.m	28 Dec 2004 03:00:44 -0000
@@ -125,9 +125,10 @@
 			event_number	% The call event.
 		).
 
+:- type decl_contour == list(final_decl_atom).
+
 	% XXX not yet implemented.
 	%
-:- type decl_contour == unit.
 :- type decl_position == unit.
 
 	% Values of the following two types represent questions from the
Index: browser/declarative_tree.m
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/declarative_tree.m,v
retrieving revision 1.11
diff -u -r1.11 declarative_tree.m
--- browser/declarative_tree.m	16 Dec 2004 00:12:39 -0000	1.11
+++ browser/declarative_tree.m	28 Dec 2004 03:52:38 -0000
@@ -171,7 +171,8 @@
 	(
 		Node = exit(_, _, _, _, Event, _),
 		DeclAtom = exit_node_decl_atom(IoActionMap, Store, Node),
-		Bug = incorrect_contour(DeclAtom, unit, Event)
+		get_exit_atoms_in_contour(IoActionMap, Store, Node, Contour),
+		Bug = incorrect_contour(DeclAtom, Contour, Event)
 	;
 		Node = fail(_, CallId, _, Event),
 		DeclAtom = call_node_decl_atom(Store, CallId),
@@ -878,6 +879,23 @@
 		materialize_contour(Store, PrevNodeId, PrevNode,
 			Nodes1, Nodes)
 	).
+
+:- pred get_exit_atoms_in_contour(io_action_map::in, S::in, 
+	trace_node(R)::in(trace_node_exit),
+	list(final_decl_atom)::out) is det <= annotated_trace(S, R).
+
+get_exit_atoms_in_contour(IoActionMap, Store, ExitNode, ExitAtoms) :-
+	ExitPrecId = ExitNode ^ exit_preceding,
+	det_trace_node_from_id(Store, ExitPrecId, ExitPrec),
+	materialize_contour(Store, ExitPrecId, ExitPrec, [], Contour),
+	list.filter_map(get_exit_atom(IoActionMap, Store), Contour, ExitAtoms).
+
+:- pred get_exit_atom(io_action_map::in, S::in, pair(R, trace_node(R))::in, 
+	final_decl_atom::out) is semidet <= annotated_trace(S, R).
+
+get_exit_atom(IoActionMap, Store, _ - Exit, FinalAtom) :-
+	Exit = exit(_, _, _, _, _, _),
+	FinalAtom = exit_node_decl_atom(IoActionMap, Store, Exit).
 
 :- type primitive_list_and_var(R)
 	--->	primitive_list_and_var(
Index: browser/declarative_user.m
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/declarative_user.m,v
retrieving revision 1.32
diff -u -r1.32 declarative_user.m
--- browser/declarative_user.m	19 Nov 2004 11:54:17 -0000	1.32
+++ browser/declarative_user.m	2 Jan 2005 08:22:23 -0000
@@ -723,8 +723,10 @@
 
 write_decl_bug(e_bug(EBug), User) -->
 	(
-		{ EBug = incorrect_contour(Atom, _, _) },
+		{ EBug = incorrect_contour(Atom, Contour, _) },
 		io__write_string(User ^ outstr, "Found incorrect contour:\n"),
+		io__write_list(Contour, "", write_decl_final_atom(User, "", 
+			decl_caller_type)),
 		write_decl_final_atom(User, "", decl_caller_type, Atom)
 	;
 		{ EBug = partially_uncovered_atom(Atom, _) },
Index: doc/user_guide.texi
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/user_guide.texi,v
retrieving revision 1.404
diff -u -r1.404 user_guide.texi
--- doc/user_guide.texi	20 Dec 2004 01:15:48 -0000	1.404
+++ doc/user_guide.texi	30 Dec 2004 05:23:23 -0000
@@ -3824,10 +3824,10 @@
 lead to a kind of bug we call an ``incorrect contour''.
 This is a contour (an execution path through the body of a clause)
 which results in a wrong answer for that clause.
-When the debugger diagnoses a bug of this kind,
-it displays the exit atom for the event at the end of the contour.
-The program event associated with this bug, which we call the ``bug event'',
-is the exit event at the end of the contour.
+When the debugger diagnoses a bug of this kind, it displays the exit atoms in
+the contour, with the resulting incorrect exit atom at the end.  The program
+event associated with this bug, which we call the ``bug event'', is the exit
+event at the end of the contour.
 (The current implementation does not yet display a representation
 of which contour was at fault.)
 
Index: tests/debugger/declarative/aadebug.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/aadebug.exp,v
retrieving revision 1.9
diff -u -r1.9 aadebug.exp
--- tests/debugger/declarative/aadebug.exp	16 Nov 2004 00:16:42 -0000	1.9
+++ tests/debugger/declarative/aadebug.exp	30 Dec 2004 03:53:13 -0000
@@ -18,6 +18,9 @@
 s(10, 30)
 Valid? yes
 Found incorrect contour:
+q('a', 'a')
+r('a', 10)
+s(10, 30)
 p('a', 30)
 Is this a bug? yes
       E3:     C2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
@@ -29,6 +32,8 @@
 p('a', 31)
 Valid? no
 Found incorrect contour:
+q('a', 'a')
+r('a', 10)
 p('a', 31)
 Is this a bug? yes
       E5:     C2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
@@ -48,6 +53,7 @@
 No solutions.
 Complete? yes
 Found incorrect contour:
+q('a', 'b')
 p('a', 32)
 Is this a bug? yes
       E7:     C2 EXIT pred aadebug.p/2-0 (nondet) aadebug.m:24 (aadebug.m:9)
Index: tests/debugger/declarative/app.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/app.exp,v
retrieving revision 1.17
diff -u -r1.17 app.exp
--- tests/debugger/declarative/app.exp	16 Dec 2004 00:12:40 -0000	1.17
+++ tests/debugger/declarative/app.exp	30 Dec 2004 03:53:13 -0000
@@ -35,6 +35,7 @@
 app([3, 4, 5], [6, 7, 8], [3, ...])
 Valid? no
 Found incorrect contour:
+app([4, 5], [6, 7, 8], [4, ...])
 app([3, 4, 5], [6, 7, 8], [3, ...])
 Is this a bug? yes
       E7:     C4 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
@@ -69,6 +70,7 @@
 app([0, 1, 2, 3, 4, 5], [6, ...], [|]/2)
 Valid? no
 Found incorrect contour:
+app([4, 5], [6, 7, 8], [4, ...])
 app([3, 4, 5], [6, 7, 8], [3, ...])
 Is this a bug? yes
      E12:     C7 EXIT pred app.app/3-0 (det) app.m:26 (app.m:28)
Index: tests/debugger/declarative/args.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/args.exp,v
retrieving revision 1.8
diff -u -r1.8 args.exp
--- tests/debugger/declarative/args.exp	16 Nov 2004 00:16:42 -0000	1.8
+++ tests/debugger/declarative/args.exp	30 Dec 2004 03:53:13 -0000
@@ -22,6 +22,11 @@
 semidet_succeed
 Valid? yes
 Found incorrect contour:
++(1, 3) = 4
+*(3, 5) = 15
++(1, 15) = 16
+*(4, 5) = 20
+semidet_succeed
 p(1, 16, 3, 20, 5)
 Is this a bug? yes
       E3:     C2 EXIT pred args.p/5-0 (nondet) args.m:24 (args.m:10)
@@ -37,6 +42,9 @@
 -(5, 3) = 2
 Valid? yes
 Found incorrect contour:
+-(1, 3) = -2
+-(5, 3) = 2
+semidet_succeed
 p(1, -2, 3, 2, 5)
 Is this a bug? yes
       E5:     C2 EXIT pred args.p/5-0 (nondet) args.m:24 (args.m:10)
Index: tests/debugger/declarative/big.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/big.exp,v
retrieving revision 1.10
diff -u -r1.10 big.exp
--- tests/debugger/declarative/big.exp	16 Nov 2004 00:16:42 -0000	1.10
+++ tests/debugger/declarative/big.exp	30 Dec 2004 03:53:13 -0000
@@ -25,6 +25,11 @@
 f(6, -12)
 Valid? yes
 Found incorrect contour:
+a(0)
+b(0, 0)
+c(0, 2)
+c(2, 6)
+f(6, -12)
 p(-12)
 Is this a bug? yes
       E3:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
@@ -40,6 +45,11 @@
 f(7, -14)
 Valid? yes
 Found incorrect contour:
+a(0)
+b(0, 0)
+c(0, 2)
+c(2, 7)
+f(7, -14)
 p(-14)
 Is this a bug? yes
       E5:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
@@ -67,6 +77,10 @@
 f(10, -20)
 Valid? yes
 Found incorrect contour:
+a(0)
+b(0, 1)
+e(1, 10)
+f(10, -20)
 p(-20)
 Is this a bug? yes
       E7:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
@@ -82,6 +96,10 @@
 f(11, -22)
 Valid? yes
 Found incorrect contour:
+a(0)
+b(0, 1)
+e(1, 11)
+f(11, -22)
 p(-22)
 Is this a bug? yes
       E9:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
@@ -114,6 +132,11 @@
 	c(2, 7)
 Complete? yes
 Found incorrect contour:
+a(0)
+f(0, 0)
+b(0, 0)
+g(1, -1)
+f(-1, 2)
 p(2)
 Is this a bug? yes
      E11:     C2 EXIT pred big.p/1-0 (nondet) big.m:24 (big.m:12)
Index: tests/debugger/declarative/binary_search.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/binary_search.exp,v
retrieving revision 1.1
diff -u -r1.1 binary_search.exp
--- tests/debugger/declarative/binary_search.exp	19 Nov 2004 11:54:23 -0000	1.1
+++ tests/debugger/declarative/binary_search.exp	30 Dec 2004 03:53:13 -0000
@@ -35,6 +35,7 @@
 silly_even(619, yes)
 Valid? n
 Found incorrect contour:
+silly_even(618, yes)
 silly_even(619, yes)
 Is this a bug? y
       E4:     C3 EXIT pred binary_search.silly_even/2-0 (det)
@@ -63,6 +64,7 @@
 silly_even(614, yes)
 Valid? y
 Found incorrect contour:
+silly_even(618, yes)
 silly_even(619, yes)
 Is this a bug? y
       E7:     C5 EXIT pred binary_search.silly_even/2-0 (det)
@@ -95,6 +97,7 @@
 add1s([6, 7, 8, 9, 10], [7, 8, ...])
 Valid? n
 Found incorrect contour:
+add1s([7, 8, 9, 10], [8, 9, 10, ...])
 add1s([6, 7, 8, 9, 10], [7, 8, ...])
 Is this a bug? y
      E10:     C7 EXIT pred binary_search.add1s/2-0 (det)
Index: tests/debugger/declarative/binary_search.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/binary_search.exp2,v
retrieving revision 1.1
diff -u -r1.1 binary_search.exp2
--- tests/debugger/declarative/binary_search.exp2	19 Nov 2004 11:54:24 -0000	1.1
+++ tests/debugger/declarative/binary_search.exp2	30 Dec 2004 10:52:15 -0000
@@ -35,6 +35,9 @@
 silly_even(619, yes)
 Valid? n
 Found incorrect contour:
+>(619, 0)
+-(619, 1) = 618
+silly_even(618, yes)
 silly_even(619, yes)
 Is this a bug? y
       E4:     C3 EXIT pred binary_search.silly_even/2-0 (det)
@@ -63,6 +66,9 @@
 silly_even(614, yes)
 Valid? y
 Found incorrect contour:
+>(619, 0)
+-(619, 1) = 618
+silly_even(618, yes)
 silly_even(619, yes)
 Is this a bug? y
       E7:     C5 EXIT pred binary_search.silly_even/2-0 (det)
@@ -93,6 +99,8 @@
 add1s([4, 5, 6, 7, 8, 9, 10], [5, ...])
 Valid? y
 Found incorrect contour:
++(3, 1) = 4
+add1s([4, 5, 6, 7, 8, 9, 10], [5, ...])
 add1s([3, 4, 5, 6, 7, 8, 9, 10], [|]/2)
 Is this a bug? y
      E10:     C7 EXIT pred binary_search.add1s/2-0 (det)
Index: tests/debugger/declarative/catch.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/catch.exp,v
retrieving revision 1.4
diff -u -r1.4 catch.exp
--- tests/debugger/declarative/catch.exp	16 Dec 2004 00:12:40 -0000	1.4
+++ tests/debugger/declarative/catch.exp	30 Dec 2004 03:53:13 -0000
@@ -36,6 +36,7 @@
 q(2, 2)
 Valid? yes
 Found incorrect contour:
+q(2, 2)
 p(2, succeeded(2))
 Is this a bug? yes
       E5:     C3 EXIT pred catch.p/2-0 (cc_multi) catch.m:18 (catch.m:12)
Index: tests/debugger/declarative/catch.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/catch.exp2,v
retrieving revision 1.7
diff -u -r1.7 catch.exp2
--- tests/debugger/declarative/catch.exp2	19 Nov 2004 11:54:27 -0000	1.7
+++ tests/debugger/declarative/catch.exp2	30 Dec 2004 10:52:15 -0000
@@ -27,6 +27,7 @@
 q(2, 2)
 Valid? yes
 Found incorrect contour:
+try(q(2), succeeded(2))
 p(2, succeeded(2))
 Is this a bug? yes
       E5:     C3 EXIT pred catch.p/2-0 (cc_multi) catch.m:18 (catch.m:12)
Index: tests/debugger/declarative/empty_command.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/empty_command.exp,v
retrieving revision 1.1
diff -u -r1.1 empty_command.exp
--- tests/debugger/declarative/empty_command.exp	3 Feb 2003 05:19:32 -0000	1.1
+++ tests/debugger/declarative/empty_command.exp	30 Dec 2004 03:53:13 -0000
@@ -20,6 +20,9 @@
 r(53, 53)
 Valid? yes
 Found incorrect contour:
+q(53, 53)
+r(53, 53)
+s(53, 53)
 p(53, 53)
 Is this a bug? no
 p(53, 53)
@@ -31,6 +34,9 @@
 s(53, 53)
 Valid? [yes] 
 Found incorrect contour:
+q(53, 53)
+r(53, 53)
+s(53, 53)
 p(53, 53)
 Is this a bug? yes
        9:      2  2 EXIT pred empty_command.p/2-0 (det) empty_command.m:17 (empty_command.m:8)
Index: tests/debugger/declarative/explicit_subtree.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/explicit_subtree.exp,v
retrieving revision 1.2
diff -u -r1.2 explicit_subtree.exp
--- tests/debugger/declarative/explicit_subtree.exp	16 Dec 2004 00:12:40 -0000	1.2
+++ tests/debugger/declarative/explicit_subtree.exp	30 Dec 2004 03:53:13 -0000
@@ -28,6 +28,7 @@
 q(0, 51, 51)
 Valid? y
 Found incorrect contour:
+q(0, 51, 51)
 q(1, 50, 51)
 Is this a bug? n
 q(1, 50, 51)
@@ -35,11 +36,14 @@
 q(50, 1, 51)
 Valid? y
 Found incorrect contour:
+q(50, 1, 51)
 q(51, 0, 51)
 Is this a bug? n
 q(51, 0, 51)
 Valid? y
 Found incorrect contour:
+q(49, 0, 49)
+q(51, 0, 51)
 a(0)
 Is this a bug? n
 a(0)
@@ -57,6 +61,7 @@
 q(0, 49, 49)
 Valid? [no] y
 Found incorrect contour:
+q(0, 49, 49)
 q(1, 48, 49)
 Is this a bug? n
 q(1, 48, 49)
@@ -64,6 +69,7 @@
 q(48, 1, 49)
 Valid? y
 Found incorrect contour:
+q(48, 1, 49)
 q(49, 0, 49)
 Is this a bug? n
 q(49, 0, 49)
@@ -71,6 +77,8 @@
 q(51, 0, 51)
 Valid? [yes] 
 Found incorrect contour:
+q(49, 0, 49)
+q(51, 0, 51)
 a(0)
 Is this a bug? n
 a(0)
Index: tests/debugger/declarative/explicit_subtree.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/explicit_subtree.exp2,v
retrieving revision 1.2
diff -u -r1.2 explicit_subtree.exp2
--- tests/debugger/declarative/explicit_subtree.exp2	16 Dec 2004 00:12:40 -0000	1.2
+++ tests/debugger/declarative/explicit_subtree.exp2	30 Dec 2004 10:52:15 -0000
@@ -53,6 +53,9 @@
 q(50, 1, 51)
 Valid? y
 Found incorrect contour:
+-(51, 1) = 50
++(0, 1) = 1
+q(50, 1, 51)
 q(51, 0, 51)
 Is this a bug? n
 q(51, 0, 51)
@@ -60,6 +63,10 @@
 +(49, 51) = 100
 Valid? y
 Found incorrect contour:
+q(49, 0, 49)
+q(51, 0, 51)
++(49, 51) = 100
+-(100, 100) = 0
 a(0)
 Is this a bug? n
 a(0)
@@ -84,6 +91,9 @@
 q(48, 1, 49)
 Valid? y
 Found incorrect contour:
+-(49, 1) = 48
++(0, 1) = 1
+q(48, 1, 49)
 q(49, 0, 49)
 Is this a bug? n
 q(49, 0, 49)
@@ -95,6 +105,10 @@
 -(100, 100) = 0
 Valid? [yes] y
 Found incorrect contour:
+q(49, 0, 49)
+q(51, 0, 51)
++(49, 51) = 100
+-(100, 100) = 0
 a(0)
 Is this a bug? n
 a(0)
Index: tests/debugger/declarative/filter.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/filter.exp,v
retrieving revision 1.10
diff -u -r1.10 filter.exp
--- tests/debugger/declarative/filter.exp	16 Nov 2004 00:16:42 -0000	1.10
+++ tests/debugger/declarative/filter.exp	30 Dec 2004 03:53:13 -0000
@@ -18,6 +18,9 @@
 my_append([1, 2], [9], [1, 2, 9])
 Valid? yes
 Found incorrect contour:
+s1([1, 2])
+s2([9])
+my_append([1, 2], [9], [1, 2, 9])
 p([1, 2, 9])
 Is this a bug? yes
       E3:     C2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
@@ -33,6 +36,9 @@
 my_append([1, 2], [7, 8, 9], [1, ...])
 Valid? yes
 Found incorrect contour:
+s1([1, 2])
+s2([7, 8, 9])
+my_append([1, 2], [7, 8, 9], [1, ...])
 p([1, 2, 7, 8, 9])
 Is this a bug? yes
       E5:     C2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
@@ -48,6 +54,9 @@
 my_append([1, 2, 3], [9], [1, 2, ...])
 Valid? yes
 Found incorrect contour:
+s1([1, 2, 3])
+s2([9])
+my_append([1, 2, 3], [9], [1, 2, ...])
 p([1, 2, 3, 9])
 Is this a bug? yes
       E7:     C2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
@@ -61,6 +70,9 @@
 my_append([1, 2, 3], [7, 8, 9], [1, ...])
 Valid? yes
 Found incorrect contour:
+s1([1, 2, 3])
+s2([7, 8, 9])
+my_append([1, 2, 3], [7, 8, 9], [1, ...])
 p([1, 2, 3, 7, 8, 9])
 Is this a bug? yes
       E9:     C2 EXIT pred filter.p/1-0 (multi) filter.m:20 (filter.m:10)
Index: tests/debugger/declarative/find_origin.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/find_origin.exp,v
retrieving revision 1.1
diff -u -r1.1 find_origin.exp
--- tests/debugger/declarative/find_origin.exp	19 Nov 2004 11:54:32 -0000	1.1
+++ tests/debugger/declarative/find_origin.exp	30 Dec 2004 03:53:13 -0000
@@ -24,6 +24,7 @@
 No solutions.
 Complete? y
 Found incorrect contour:
+IntroducedFrom__pred__monotest4__86__1(t(101), t(101))
 monotest4(t(101), t(101))
 Is this a bug? y
       E4:     C3 EXIT pred find_origin.monotest4/2-0 (det)
@@ -51,6 +52,7 @@
 No solutions.
 Complete? y
 Found incorrect contour:
+IntroducedFrom__pred__polytest4__148__2(u(string), u(u("hello")), u(u("hello")))
 polytest4(u("hello"), u("hello"))
 Is this a bug? y
       E7:     C5 EXIT pred find_origin.polytest4/2-0 (det)
Index: tests/debugger/declarative/find_origin.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/find_origin.exp2,v
retrieving revision 1.1
diff -u -r1.1 find_origin.exp2
--- tests/debugger/declarative/find_origin.exp2	19 Nov 2004 11:54:32 -0000	1.1
+++ tests/debugger/declarative/find_origin.exp2	30 Dec 2004 10:52:15 -0000
@@ -2,20 +2,32 @@
 mdb> mdb> Contexts will not be printed.
 mdb> echo on
 Command echo enabled.
-mdb> step
+mdb> 
       E2:     C2 CALL pred find_origin.monotest/2-0 (det)
-mdb> finish
+mdb> f
       E3:     C2 EXIT pred find_origin.monotest/2-0 (det)
 mdb> dd
 monotest(t(101), 1)
 Valid? b 1
 browser> mark
-monotest1(t(101))
+monotest4(t(101), t(101))
 Valid? n
+Call IntroducedFrom__pred__monotest4__86__1(t(101), t(3))
+No solutions.
+Complete? y
+IntroducedFrom__pred__monotest4__86__1(t(101), t(101))
+Valid? y
+Call IntroducedFrom__pred__monotest4__86__1(t(101), t(2))
+No solutions.
+Complete? y
+Call IntroducedFrom__pred__monotest4__86__1(t(101), t(1))
+No solutions.
+Complete? y
 Found incorrect contour:
-monotest1(t(101))
+filter(IntroducedFrom__pred__monotest4__86__1(t(101)), [t(1), t(2), t(101), t(3)], [t(101)])
+monotest4(t(101), t(101))
 Is this a bug? y
-      E4:     C3 EXIT pred find_origin.monotest1/1-0 (det)
+      E4:     C3 EXIT pred find_origin.monotest4/2-0 (det)
 mdb> break polytest
  0: + stop  interface pred find_origin.polytest/3-0 (det)
 mdb> c
@@ -26,14 +38,24 @@
 polytest("hello", u("hello"), 5)
 Valid? b 2
 browser> mark
-polytest1("hello", u("hello"))
-Valid? n
+polytest4(u("hello"), u("hello"))
+Valid? browse
+browser> set format pretty
+browser> p
+find_origin.polytest4(u("hello"), u("hello"))
+browser> quit
+polytest4(u("hello"), u("hello"))
+Valid? no
+IntroducedFrom__pred__polytest4__148__2(u(string), u(u("hello")), u(u("hello")))
+Valid? y
+Call IntroducedFrom__pred__polytest4__148__2(u(string), u(u("hello")), v(u("hello")))
+No solutions.
+Complete? y
 Found incorrect contour:
-polytest1("hello", u("hello"))
+filter(IntroducedFrom__pred__polytest4__148__2(u(string), u(u/1)), [v(u/1), v(u/1), v(u/1), u(u/1)], [u/1])
+polytest4(u("hello"), u("hello"))
 Is this a bug? y
-      E7:     C5 EXIT pred find_origin.polytest1/2-0 (det)
-mdb> c
-      E6:     C4 EXIT pred find_origin.polytest/3-0 (det)
+      E7:     C5 EXIT pred find_origin.polytest4/2-0 (det)
 mdb> delete 0
  0: E stop  interface pred find_origin.polytest/3-0 (det)
 mdb> break tracetest
Index: tests/debugger/declarative/func_call.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/func_call.exp,v
retrieving revision 1.4
diff -u -r1.4 func_call.exp
--- tests/debugger/declarative/func_call.exp	30 Jan 2003 05:59:27 -0000	1.4
+++ tests/debugger/declarative/func_call.exp	30 Dec 2004 03:53:13 -0000
@@ -39,6 +39,11 @@
 +(3, 1) = 4
 Valid? yes
 Found incorrect contour:
+-(4, 1) = 3
+fib(3) = 3
+-(4, 3) = 1
+fib(1) = 1
++(3, 1) = 4
 fib(4) = 4
 Is this a bug? yes
       75:      8  4 EXIT func func_call.fib/1-0 (det) func_call.m:14 (func_call.m:20)
Index: tests/debugger/declarative/func_call.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/func_call.exp2,v
retrieving revision 1.1
diff -u -r1.1 func_call.exp2
--- tests/debugger/declarative/func_call.exp2	30 Jan 2003 05:59:27 -0000	1.1
+++ tests/debugger/declarative/func_call.exp2	30 Dec 2004 10:52:15 -0000
@@ -39,6 +39,11 @@
 +(3, 1) = 4
 Valid? yes
 Found incorrect contour:
+-(4, 1) = 3
+fib(3) = 3
+-(4, 3) = 1
+fib(1) = 1
++(3, 1) = 4
 fib(4) = 4
 Is this a bug? yes
      115:     12  4 EXIT func func_call.fib/1-0 (det) func_call.m:14 (func_call.m:20)
Index: tests/debugger/declarative/gcf.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/gcf.exp,v
retrieving revision 1.9
diff -u -r1.9 gcf.exp
--- tests/debugger/declarative/gcf.exp	17 Jan 2003 05:57:01 -0000	1.9
+++ tests/debugger/declarative/gcf.exp	30 Dec 2004 03:53:13 -0000
@@ -18,6 +18,9 @@
 f(11)
 Valid? yes
 Found incorrect contour:
+g(2)
+c(2, 11)
+f(11)
 a(11)
 Is this a bug? yes
       23:      2  2 EXIT pred gcf.a/1-0 (nondet) gcf.m:26 (gcf.m:10)
@@ -33,6 +36,9 @@
 f(12)
 Valid? yes
 Found incorrect contour:
+g(2)
+c(2, 12)
+f(12)
 a(12)
 Is this a bug? yes
       30:      2  2 EXIT pred gcf.a/1-0 (nondet) gcf.m:26 (gcf.m:10)
@@ -50,6 +56,9 @@
 f(20)
 Valid? yes
 Found incorrect contour:
+g(3)
+c(3, 20)
+f(20)
 a(20)
 Is this a bug? yes
       42:      2  2 EXIT pred gcf.a/1-0 (nondet) gcf.m:26 (gcf.m:10)
Index: tests/debugger/declarative/gcf.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/gcf.exp2,v
retrieving revision 1.3
diff -u -r1.3 gcf.exp2
--- tests/debugger/declarative/gcf.exp2	30 Jan 2003 05:59:27 -0000	1.3
+++ tests/debugger/declarative/gcf.exp2	30 Dec 2004 10:52:15 -0000
@@ -18,6 +18,9 @@
 f(11)
 Valid? yes
 Found incorrect contour:
+g(2)
+c(2, 11)
+f(11)
 a(11)
 Is this a bug? yes
       27:      2  2 EXIT pred gcf.a/1-0 (nondet) gcf.m:26 (gcf.m:10)
@@ -33,6 +36,9 @@
 f(12)
 Valid? yes
 Found incorrect contour:
+g(2)
+c(2, 12)
+f(12)
 a(12)
 Is this a bug? yes
       38:      2  2 EXIT pred gcf.a/1-0 (nondet) gcf.m:26 (gcf.m:10)
@@ -50,6 +56,9 @@
 f(20)
 Valid? yes
 Found incorrect contour:
+g(3)
+c(3, 20)
+f(20)
 a(20)
 Is this a bug? yes
       54:      2  2 EXIT pred gcf.a/1-0 (nondet) gcf.m:26 (gcf.m:10)
Index: tests/debugger/declarative/higher_order.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/higher_order.exp,v
retrieving revision 1.2
diff -u -r1.2 higher_order.exp
--- tests/debugger/declarative/higher_order.exp	17 Jan 2003 05:57:01 -0000	1.2
+++ tests/debugger/declarative/higher_order.exp	30 Dec 2004 03:53:13 -0000
@@ -14,6 +14,7 @@
 q('IntroducedFrom__pred__p__16__1', 3, 81)
 Valid? yes
 Found incorrect contour:
+q('IntroducedFrom__pred__p__16__1', 3, 81)
 p(3, 81)
 Is this a bug? yes
        7:      2  2 EXIT pred higher_order.p/2-0 (det) higher_order.m:15 (higher_order.m:9)
Index: tests/debugger/declarative/higher_order.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/higher_order.exp2,v
retrieving revision 1.1
diff -u -r1.1 higher_order.exp2
--- tests/debugger/declarative/higher_order.exp2	30 Jan 2003 05:59:27 -0000	1.1
+++ tests/debugger/declarative/higher_order.exp2	30 Dec 2004 10:52:15 -0000
@@ -14,6 +14,7 @@
 q('IntroducedFrom__pred__p__16__1', 3, 81)
 Valid? yes
 Found incorrect contour:
+q('IntroducedFrom__pred__p__16__1', 3, 81)
 p(3, 81)
 Is this a bug? yes
       11:      2  2 EXIT pred higher_order.p/2-0 (det) higher_order.m:15 (higher_order.m:9)
Index: tests/debugger/declarative/ho2.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ho2.exp,v
retrieving revision 1.2
diff -u -r1.2 ho2.exp
--- tests/debugger/declarative/ho2.exp	17 Jan 2003 05:57:01 -0000	1.2
+++ tests/debugger/declarative/ho2.exp	30 Dec 2004 03:53:13 -0000
@@ -14,6 +14,7 @@
 q('IntroducedFrom__pred__p__22__1'(3), 3, 27)
 Valid? yes
 Found incorrect contour:
+q('IntroducedFrom__pred__p__22__1'(3), 3, 27)
 p(0, 3, 27)
 Is this a bug? yes
        7:      2  2 EXIT pred ho2.p/3-0 (det) ho2.m:21 (ho2.m:9)
@@ -25,6 +26,7 @@
 p(1, 3, 27)
 Valid? no
 Found incorrect contour:
+q('IntroducedFrom__pred__p__22__1'(3), 3, 27)
 p(1, 3, 27)
 Is this a bug? yes
       13:      5  2 EXIT pred ho2.p/3-0 (det) ho2.m:21 (ho2.m:10)
@@ -38,6 +40,7 @@
 q('IntroducedFrom__pred__p__22__1'(4), 4, 64)
 Valid? yes
 Found incorrect contour:
+q('IntroducedFrom__pred__p__22__1'(4), 4, 64)
 p(2, 4, 64)
 Is this a bug? yes
       19:      8  2 EXIT pred ho2.p/3-0 (det) ho2.m:21 (ho2.m:11)
Index: tests/debugger/declarative/ho2.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ho2.exp2,v
retrieving revision 1.1
diff -u -r1.1 ho2.exp2
--- tests/debugger/declarative/ho2.exp2	30 Jan 2003 05:59:28 -0000	1.1
+++ tests/debugger/declarative/ho2.exp2	30 Dec 2004 10:52:15 -0000
@@ -14,6 +14,7 @@
 q('IntroducedFrom__pred__p__22__1'(3), 3, 27)
 Valid? yes
 Found incorrect contour:
+q('IntroducedFrom__pred__p__22__1'(3), 3, 27)
 p(0, 3, 27)
 Is this a bug? yes
       11:      2  2 EXIT pred ho2.p/3-0 (det) ho2.m:21 (ho2.m:9)
@@ -25,6 +26,7 @@
 p(1, 3, 27)
 Valid? no
 Found incorrect contour:
+q('IntroducedFrom__pred__p__22__1'(3), 3, 27)
 p(1, 3, 27)
 Is this a bug? yes
       21:      7  2 EXIT pred ho2.p/3-0 (det) ho2.m:21 (ho2.m:10)
@@ -38,6 +40,7 @@
 q('IntroducedFrom__pred__p__22__1'(4), 4, 64)
 Valid? yes
 Found incorrect contour:
+q('IntroducedFrom__pred__p__22__1'(4), 4, 64)
 p(2, 4, 64)
 Is this a bug? yes
       31:     12  2 EXIT pred ho2.p/3-0 (det) ho2.m:21 (ho2.m:11)
Index: tests/debugger/declarative/if_then_else.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/if_then_else.exp,v
retrieving revision 1.12
diff -u -r1.12 if_then_else.exp
--- tests/debugger/declarative/if_then_else.exp	15 Dec 2004 06:57:53 -0000	1.12
+++ tests/debugger/declarative/if_then_else.exp	30 Dec 2004 03:53:13 -0000
@@ -16,6 +16,8 @@
 b(1)
 Valid? yes
 Found incorrect contour:
+a(0)
+b(1)
 ite(0, 1)
 Is this a bug? yes
       E3:     C2 EXIT pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:8)
@@ -31,6 +33,7 @@
 No solutions.
 Complete? yes
 Found incorrect contour:
+a(0)
 ite(1, 0)
 Is this a bug? yes
       E5:     C3 EXIT pred if_then_else.ite/2-0 (det) if_then_else.m:22 (if_then_else.m:12)
Index: tests/debugger/declarative/ignore.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ignore.exp,v
retrieving revision 1.1
diff -u -r1.1 ignore.exp
--- tests/debugger/declarative/ignore.exp	19 Nov 2004 11:54:34 -0000	1.1
+++ tests/debugger/declarative/ignore.exp	30 Dec 2004 03:53:13 -0000
@@ -41,6 +41,7 @@
 q(5, 10) = 15
 Valid? y
 Found incorrect contour:
+fold(q, [1, 2, 3, 4, 5], 0) = 15
 p(15)
 Is this a bug? y
       E6:     C4 EXIT pred ignore.p/1-0 (det)
Index: tests/debugger/declarative/ignore.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ignore.exp2,v
retrieving revision 1.1
diff -u -r1.1 ignore.exp2
--- tests/debugger/declarative/ignore.exp2	19 Nov 2004 11:54:35 -0000	1.1
+++ tests/debugger/declarative/ignore.exp2	30 Dec 2004 10:52:15 -0000
@@ -17,6 +17,7 @@
 q(5, 10) = 15
 Valid? n
 Found incorrect contour:
++(5, 10) = 15
 q(5, 10) = 15
 Is this a bug? y
       E4:     C3 EXIT func ignore.q/2-0 (det)
@@ -38,6 +39,7 @@
 q(4, 6) = 10
 Valid? y
 Found incorrect contour:
++(5, 10) = 15
 q(5, 10) = 15
 Is this a bug? y
       E7:     C5 EXIT func ignore.q/2-0 (det)
Index: tests/debugger/declarative/inadmissible.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/inadmissible.exp,v
retrieving revision 1.1
diff -u -r1.1 inadmissible.exp
--- tests/debugger/declarative/inadmissible.exp	19 Nov 2004 11:54:37 -0000	1.1
+++ tests/debugger/declarative/inadmissible.exp	30 Dec 2004 03:53:13 -0000
@@ -34,6 +34,8 @@
 oset_max([2, 3, 1], 1)
 Valid? [inadmissible] yes
 Found incorrect contour:
+list_to_set([2, 3, 1], [2, 3, 1])
+oset_max([2, 3, 1], 1)
 gtmax(2, [2, 3, 1])
 Is this a bug? yes
       E3:     C2 EXIT pred inadmissible.gtmax/2-0 (semidet)
Index: tests/debugger/declarative/input_term_dep.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/input_term_dep.exp,v
retrieving revision 1.7
diff -u -r1.7 input_term_dep.exp
--- tests/debugger/declarative/input_term_dep.exp	19 Nov 2004 11:54:38 -0000	1.7
+++ tests/debugger/declarative/input_term_dep.exp	30 Dec 2004 03:53:13 -0000
@@ -48,6 +48,9 @@
 qc([[2, ...], [], [1]], [[2, ...], [], [1]])
 Valid? yes
 Found incorrect contour:
+qa([[1], [2, 3]])
+qb([])
+qc([[2, ...], [], [1]], [[2, ...], [], [1]])
 q([[2, 3], [], [1]])
 Is this a bug? yes
       E5:     C3 EXIT pred input_term_dep.q/1-0 (semidet) input_term_dep.m:69 (input_term_dep.m:58)
Index: tests/debugger/declarative/io_stream_test.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/io_stream_test.exp,v
retrieving revision 1.4
diff -u -r1.4 io_stream_test.exp
--- tests/debugger/declarative/io_stream_test.exp	19 Nov 2004 05:46:19 -0000	1.4
+++ tests/debugger/declarative/io_stream_test.exp	30 Dec 2004 03:53:13 -0000
@@ -21,47 +21,22 @@
 mdb> print
 test(stream(0, input, text, file("tabled_read_decl.data")), 1123, _, _)
 mdb> dd -a
-test(stream(0, input, text, file("tabled_read_decl.data")), 1123, _, _)
-4 io actions:
-read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
-read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
-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)
+test(stream(0, input, text, file("tabled_read_decl.data")), 1456, _, _)
 Valid? print 1-2
 stream(0, input, text, file("tabled_read_decl.data"))
-1123
-test(stream(0, input, text, file("tabled_read_decl.data")), 1123, _, _)
-4 io actions:
-read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
-read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
-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)
+1456
+test(stream(0, input, text, file("tabled_read_decl.data")), 1456, _, _)
 Valid? p io 1-2
-read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
-read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
-test(stream(0, input, text, file("tabled_read_decl.data")), 1123, _, _)
-4 io actions:
-read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
-read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
-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)
+No such IO action.
+test(stream(0, input, text, file("tabled_read_decl.data")), 1456, _, _)
 Valid? no
-test_2(stream(0, input, text, file("tabled_read_decl.data")), 1, 1123, _, _)
-4 io actions:
-read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
-read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
-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)
+test_2(stream(0, input, text, file("tabled_read_decl.data")), 1, 1456, _, _)
 Valid? yes
 Found incorrect contour:
-test(stream(0, input, text, file("tabled_read_decl.data")), 1123, _, _)
-4 io actions:
-read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
-read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
-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)
+test_2(stream(0, input, text, file("tabled_read_decl.data")), 1, 1456, _, _)
+test(stream(0, input, text, file("tabled_read_decl.data")), 1456, _, _)
 Is this a bug? yes
       E3:     C2 EXIT pred io_stream_test.test/4-0 (det)
 mdb> c -n -S
-1123
-1456
+1789
+142
Index: tests/debugger/declarative/io_stream_test.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/io_stream_test.exp2,v
retrieving revision 1.4
diff -u -r1.4 io_stream_test.exp2
--- tests/debugger/declarative/io_stream_test.exp2	19 Nov 2004 05:46:20 -0000	1.4
+++ tests/debugger/declarative/io_stream_test.exp2	30 Dec 2004 10:52:15 -0000
@@ -21,21 +21,53 @@
 mdb> print
 test(stream(0, input, text, file("tabled_read_decl.data")), 1123, _, _)
 mdb> dd -a
-test(stream(0, input, text, file("tabled_read_decl.data")), 1456, _, _)
+test(stream(0, input, text, file("tabled_read_decl.data")), 1123, _, _)
+4 io actions:
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
+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)
 Valid? print 1-2
 stream(0, input, text, file("tabled_read_decl.data"))
-1456
-test(stream(0, input, text, file("tabled_read_decl.data")), 1456, _, _)
+1123
+test(stream(0, input, text, file("tabled_read_decl.data")), 1123, _, _)
+4 io actions:
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
+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)
 Valid? p io 1-2
-No such IO action.
-test(stream(0, input, text, file("tabled_read_decl.data")), 1456, _, _)
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
+test(stream(0, input, text, file("tabled_read_decl.data")), 1123, _, _)
+4 io actions:
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
+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)
 Valid? no
-test_2(stream(0, input, text, file("tabled_read_decl.data")), 1, 1456, _, _)
+test_2(stream(0, input, text, file("tabled_read_decl.data")), 1, 1123, _, _)
+4 io actions:
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
+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)
 Valid? yes
 Found incorrect contour:
-test(stream(0, input, text, file("tabled_read_decl.data")), 1456, _, _)
+test_2(stream(0, input, text, file("tabled_read_decl.data")), 1, 1123, _, _)
+4 io actions:
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
+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)
+test(stream(0, input, text, file("tabled_read_decl.data")), 1123, _, _)
+4 io actions:
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 49)
+read_char_code(stream(0, input, text, file("tabled_read_decl.data")), 50)
+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 EXIT pred io_stream_test.test/4-0 (det)
 mdb> c -n -S
-1789
-142
+1123
+1456
Index: tests/debugger/declarative/ite_2.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ite_2.exp,v
retrieving revision 1.4
diff -u -r1.4 ite_2.exp
--- tests/debugger/declarative/ite_2.exp	15 Dec 2004 06:57:53 -0000	1.4
+++ tests/debugger/declarative/ite_2.exp	30 Dec 2004 03:53:13 -0000
@@ -25,6 +25,7 @@
 c(1, 1)
 Valid? yes
 Found incorrect contour:
+c(1, 1)
 ite(a, 1, 1)
 Is this a bug? yes
       11:      2  2 EXIT pred ite_2.ite/3-0 (det) ite_2.m:27 (ite_2.m:9)
@@ -48,6 +49,7 @@
 	b(1, 1)
 Complete? yes
 Found incorrect contour:
+c(1, 1)
 ite(b, 1, 1)
 Is this a bug? yes
       29:      6  2 EXIT pred ite_2.ite/3-1 (multi) ite_2.m:27 (ite_2.m:10)
Index: tests/debugger/declarative/ite_2.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/ite_2.exp2,v
retrieving revision 1.2
diff -u -r1.2 ite_2.exp2
--- tests/debugger/declarative/ite_2.exp2	15 Dec 2004 06:57:53 -0000	1.2
+++ tests/debugger/declarative/ite_2.exp2	30 Dec 2004 10:52:15 -0000
@@ -25,6 +25,7 @@
 c(1, 1)
 Valid? yes
 Found incorrect contour:
+c(1, 1)
 ite(a, 1, 1)
 Is this a bug? yes
       13:      2  2 EXIT pred ite_2.ite/3-0 (det) ite_2.m:27 (ite_2.m:9)
@@ -48,6 +49,7 @@
 	b(1, 1)
 Complete? yes
 Found incorrect contour:
+c(1, 1)
 ite(b, 1, 1)
 Is this a bug? yes
       35:      7  2 EXIT pred ite_2.ite/3-1 (multi) ite_2.m:27 (ite_2.m:10)
Index: tests/debugger/declarative/lpe_example.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/lpe_example.exp,v
retrieving revision 1.8
diff -u -r1.8 lpe_example.exp
--- tests/debugger/declarative/lpe_example.exp	17 Jan 2003 05:57:01 -0000	1.8
+++ tests/debugger/declarative/lpe_example.exp	30 Dec 2004 03:53:13 -0000
@@ -18,6 +18,8 @@
 r(3, 13)
 Valid? yes
 Found incorrect contour:
+q(3)
+r(3, 13)
 p(1, 13)
 Is this a bug? yes
       10:      2  2 EXIT pred lpe_example.p/2-0 (nondet)
@@ -31,6 +33,8 @@
 r(3, 23)
 Valid? yes
 Found incorrect contour:
+q(3)
+r(3, 23)
 p(1, 23)
 Is this a bug? yes
       15:      2  2 EXIT pred lpe_example.p/2-0 (nondet)
@@ -42,6 +46,7 @@
 p(1, 3)
 Valid? no
 Found incorrect contour:
+q(3)
 p(1, 3)
 Is this a bug? yes
       20:      2  2 EXIT pred lpe_example.p/2-0 (nondet)
Index: tests/debugger/declarative/lpe_example.exp2
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/lpe_example.exp2,v
retrieving revision 1.9
diff -u -r1.9 lpe_example.exp2
--- tests/debugger/declarative/lpe_example.exp2	30 Jan 2003 05:59:28 -0000	1.9
+++ tests/debugger/declarative/lpe_example.exp2	30 Dec 2004 10:52:15 -0000
@@ -18,6 +18,8 @@
 r(3, 13)
 Valid? yes
 Found incorrect contour:
+q(3)
+r(3, 13)
 p(1, 13)
 Is this a bug? yes
       13:      3  3 EXIT pred lpe_example.p/2-0 (nondet)
@@ -31,6 +33,8 @@
 r(3, 23)
 Valid? yes
 Found incorrect contour:
+q(3)
+r(3, 23)
 p(1, 23)
 Is this a bug? yes
       20:      3  3 EXIT pred lpe_example.p/2-0 (nondet)
@@ -42,6 +46,7 @@
 p(1, 3)
 Valid? no
 Found incorrect contour:
+q(3)
 p(1, 3)
 Is this a bug? yes
       25:      3  3 EXIT pred lpe_example.p/2-0 (nondet)
Index: tests/debugger/declarative/lpe_example.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/lpe_example.exp3,v
retrieving revision 1.1
diff -u -r1.1 lpe_example.exp3
--- tests/debugger/declarative/lpe_example.exp3	19 Nov 2004 11:54:38 -0000	1.1
+++ tests/debugger/declarative/lpe_example.exp3	31 Dec 2004 06:03:24 -0000
@@ -18,6 +18,8 @@
 r(3, 13)
 Valid? yes
 Found incorrect contour:
+q(3)
+r(3, 13)
 p(1, 13)
 Is this a bug? yes
       22:      8  5 EXIT pred lpe_example.p/2-0 (nondet)
@@ -31,6 +33,8 @@
 r(3, 23)
 Valid? yes
 Found incorrect contour:
+q(3)
+r(3, 23)
 p(1, 23)
 Is this a bug? yes
       45:      8  5 EXIT pred lpe_example.p/2-0 (nondet)
@@ -42,6 +46,7 @@
 p(1, 3)
 Valid? no
 Found incorrect contour:
+q(3)
 p(1, 3)
 Is this a bug? yes
       66:      8  5 EXIT pred lpe_example.p/2-0 (nondet)
Index: tests/debugger/declarative/oracle_db.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/oracle_db.exp,v
retrieving revision 1.9
diff -u -r1.9 oracle_db.exp
--- tests/debugger/declarative/oracle_db.exp	17 Jan 2003 05:57:01 -0000	1.9
+++ tests/debugger/declarative/oracle_db.exp	30 Dec 2004 03:53:13 -0000
@@ -14,6 +14,9 @@
 b(99)
 Valid? yes
 Found incorrect contour:
+b(99)
+b(99)
+b(99)
 a(99, 99, 99)
 Is this a bug? yes
       10:      2  2 EXIT pred oracle_db.a/3-0 (semidet) oracle_db.m:19 (oracle_db.m:9)
Index: tests/debugger/declarative/output_term_dep.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/output_term_dep.exp,v
retrieving revision 1.8
diff -u -r1.8 output_term_dep.exp
--- tests/debugger/declarative/output_term_dep.exp	16 Nov 2004 00:16:42 -0000	1.8
+++ tests/debugger/declarative/output_term_dep.exp	30 Dec 2004 03:53:13 -0000
@@ -29,6 +29,9 @@
 pc(13)
 Valid? yes
 Found incorrect contour:
+pa(5)
+pb(8)
+pc(13)
 p(5, 8, 13)
 Is this a bug? yes
       E3:     C2 EXIT pred output_term_dep.p/3-0 (det)
@@ -50,6 +53,9 @@
 qc([99])
 Valid? yes
 Found incorrect contour:
+qa([1, 2, 3])
+qb([])
+qc([99])
 q([[1, ...], [], [99]])
 Is this a bug? yes
       E5:     C3 EXIT pred output_term_dep.q/1-0 (det)
@@ -81,6 +87,7 @@
 No solutions.
 Complete? yes
 Found incorrect contour:
+ra(2)
 r(2, 43)
 Is this a bug? yes
       E9:     C5 EXIT pred output_term_dep.r/2-0 (det)
@@ -100,6 +107,9 @@
 rb(3)
 Valid? yes
 Found incorrect contour:
+ra(3)
+rb(3)
+rc(57)
 r(3, 57)
 Is this a bug? yes
      E11:     C6 EXIT pred output_term_dep.r/2-0 (det)
@@ -118,6 +128,7 @@
 No solutions.
 Complete? yes
 Found incorrect contour:
+rd(-1)
 r(4, -1)
 Is this a bug? yes
      E13:     C7 EXIT pred output_term_dep.r/2-0 (det)
@@ -227,6 +238,7 @@
 No solutions.
 Complete? yes
 Found incorrect contour:
+tb(77)
 t(1, 77)
 Is this a bug? yes
      E33:    C12 EXIT pred output_term_dep.t/2-0 (semidet)
Index: tests/debugger/declarative/propositional.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/propositional.exp,v
retrieving revision 1.12
diff -u -r1.12 propositional.exp
--- tests/debugger/declarative/propositional.exp	16 Nov 2004 00:16:42 -0000	1.12
+++ tests/debugger/declarative/propositional.exp	30 Dec 2004 03:53:13 -0000
@@ -16,6 +16,7 @@
 c
 Valid? yes
 Found incorrect contour:
+c
 a
 Is this a bug? yes
       E3:     C2 EXIT pred propositional.a/0-0 (semidet) propositional.m:27 (propositional.m:10)
@@ -31,6 +32,7 @@
 i
 Valid? yes
 Found incorrect contour:
+i
 f
 Is this a bug? yes
       E6:     C4 EXIT pred propositional.f/0-0 (semidet) propositional.m:35 (propositional.m:29)
Index: tests/debugger/declarative/remember_modes.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/remember_modes.exp,v
retrieving revision 1.2
diff -u -r1.2 remember_modes.exp
--- tests/debugger/declarative/remember_modes.exp	16 Nov 2004 00:16:42 -0000	1.2
+++ tests/debugger/declarative/remember_modes.exp	30 Dec 2004 03:53:13 -0000
@@ -14,6 +14,10 @@
 p(1, 2)
 Valid? yes
 Found incorrect contour:
+p(1, 2)
+p(1, 2)
+p(1, 2)
+p(1, 2)
 q(1, 1, 2, 1, 2)
 Is this a bug? yes
       E3:     C2 EXIT pred remember_modes.q/5-0 (semidet)
Index: tests/debugger/declarative/revise.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/revise.exp,v
retrieving revision 1.1
diff -u -r1.1 revise.exp
--- tests/debugger/declarative/revise.exp	3 Feb 2003 05:19:32 -0000	1.1
+++ tests/debugger/declarative/revise.exp	30 Dec 2004 03:53:13 -0000
@@ -20,6 +20,8 @@
 b("foo", "foo")
 Valid? yes
 Found incorrect contour:
+a("foo", "foo")
+b("foo", "foo")
 r("foo", "foo")
 Is this a bug? no
 r("foo", "foo")
@@ -27,6 +29,9 @@
 s("foo", "foo")
 Valid? yes
 Found incorrect contour:
+q("foo", "foo")
+r("foo", "foo")
+s("foo", "foo")
 p("foo", "foo")
 Is this a bug? no
 p("foo", "foo")
Index: tests/debugger/declarative/shallow.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/shallow.exp,v
retrieving revision 1.3
diff -u -r1.3 shallow.exp
--- tests/debugger/declarative/shallow.exp	17 Jan 2003 05:57:02 -0000	1.3
+++ tests/debugger/declarative/shallow.exp	30 Dec 2004 03:53:13 -0000
@@ -25,6 +25,7 @@
 b("t1", 1, 5)
 Valid? yes
 Found incorrect contour:
+b("t1", 1, 5)
 p("t1", 5, 1)
 Is this a bug? yes
       14:      3  3 EXIT pred shallow_2.p/3-0 (det) shallow_2.m:16 (shallow.m:29)
@@ -51,6 +52,7 @@
 b("t2", 1, 5)
 Valid? yes
 Found incorrect contour:
+b("t2", 1, 5)
 p("t2", 37, -11)
 Is this a bug? yes
       28:      7  3 EXIT pred shallow_2.p/3-0 (det) shallow_2.m:16 (shallow.m:29)
@@ -92,6 +94,7 @@
 a("t4", -1, -1)
 Valid? yes
 Found incorrect contour:
+a("t4", -1, -1)
 q("t4", -1, 11)
 Is this a bug? yes
       47:     14  3 EXIT pred shallow_2.q/3-0 (det) shallow_2.m:30 (shallow.m:29)
@@ -118,6 +121,7 @@
 b("t5", 3, 5)
 Valid? yes
 Found incorrect contour:
+b("t5", 3, 5)
 r("t5", 3, 23)
 Is this a bug? yes
       61:     17  3 EXIT pred shallow_2.r/3-0 (det) shallow_2.m:40 (shallow.m:29)
Index: tests/debugger/declarative/skip.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/skip.exp,v
retrieving revision 1.1
diff -u -r1.1 skip.exp
--- tests/debugger/declarative/skip.exp	19 Nov 2004 11:54:41 -0000	1.1
+++ tests/debugger/declarative/skip.exp	30 Dec 2004 03:53:13 -0000
@@ -18,6 +18,9 @@
 a(1, 70)
 Valid? n
 Found incorrect contour:
+b(1, 70)
+c(70, 70)
+d(70, 70)
 a(1, 70)
 Is this a bug? y
       E3:     C2 EXIT pred skip.a/2-0 (det)
@@ -71,6 +74,8 @@
 e(72, 72)
 Valid? y
 Found incorrect contour:
+e(72, 72)
+f(72, 72)
 c(72, 72)
 Is this a bug? y
       E9:     C6 EXIT pred skip.c/2-0 (det)
@@ -102,6 +107,9 @@
 d(72, 72)
 Valid? y
 Found incorrect contour:
+b(3, 72)
+c(72, 72)
+d(72, 72)
 a(3, 72)
 Is this a bug? y
       E8:     C5 EXIT pred skip.a/2-0 (det)
Index: tests/debugger/declarative/solutions.exp3
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/solutions.exp3,v
retrieving revision 1.1
diff -u -r1.1 solutions.exp3
--- tests/debugger/declarative/solutions.exp3	19 Nov 2004 11:54:42 -0000	1.1
+++ tests/debugger/declarative/solutions.exp3	31 Dec 2004 06:03:24 -0000
@@ -33,6 +33,7 @@
 	q(1, 3)
 Complete? yes
 Found incorrect contour:
+solutions(q(1), [1, 2, 3])
 p(1, [1, 2, 3])
 Is this a bug? yes
      233:      2  2 EXIT pred solutions.p/2-0 (det)
Index: tests/debugger/declarative/special_term_dep.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/special_term_dep.exp,v
retrieving revision 1.5
diff -u -r1.5 special_term_dep.exp
--- tests/debugger/declarative/special_term_dep.exp	19 Nov 2004 11:54:42 -0000	1.5
+++ tests/debugger/declarative/special_term_dep.exp	30 Dec 2004 03:53:13 -0000
@@ -17,6 +17,7 @@
 pa([2, 3])
 Valid? yes
 Found incorrect contour:
+pa([2, 3])
 p([2, 3])
 Is this a bug? yes
       E3:     C2 EXIT pred special_term_dep.p/1-0 (det) special_term_dep.m:29 (special_term_dep.m:22)
Index: tests/debugger/declarative/tabled_read_decl.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/tabled_read_decl.exp,v
retrieving revision 1.11
diff -u -r1.11 tabled_read_decl.exp
--- tests/debugger/declarative/tabled_read_decl.exp	19 Nov 2004 05:46:20 -0000	1.11
+++ tests/debugger/declarative/tabled_read_decl.exp	30 Dec 2004 03:53:13 -0000
@@ -74,6 +74,12 @@
 read_char_code('<<c_pointer>>', 10)
 Valid? yes
 Found incorrect contour:
+test_2('<<c_pointer>>', 1, 1123, _, _)
+4 io actions:
+read_char_code('<<c_pointer>>', 49)
+read_char_code('<<c_pointer>>', 50)
+read_char_code('<<c_pointer>>', 51)
+read_char_code('<<c_pointer>>', 10)
 test('<<c_pointer>>', 1123, _, _)
 4 io actions:
 read_char_code('<<c_pointer>>', 49)
Index: tests/debugger/declarative/trust.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/trust.exp,v
retrieving revision 1.6
diff -u -r1.6 trust.exp
--- tests/debugger/declarative/trust.exp	29 Nov 2004 11:34:35 -0000	1.6
+++ tests/debugger/declarative/trust.exp	30 Dec 2004 03:53:13 -0000
@@ -75,6 +75,8 @@
 dostuff(w("aaabbb"), '=')
 Valid? n
 Found incorrect contour:
+w_cmp('=', w("aaB"), w("aAB"))
+concat(w("aaa"), w("bbb"), w("aaabbb"))
 dostuff(w("aaabbb"), '=')
 Is this a bug? y
       E3:     C2 EXIT pred trust.dostuff/2-0 (cc_multi)
Index: tests/debugger/declarative/untraced_subgoal.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/untraced_subgoal.exp,v
retrieving revision 1.4
diff -u -r1.4 untraced_subgoal.exp
--- tests/debugger/declarative/untraced_subgoal.exp	17 Jan 2003 05:57:02 -0000	1.4
+++ tests/debugger/declarative/untraced_subgoal.exp	30 Dec 2004 03:53:13 -0000
@@ -55,6 +55,9 @@
 r(2, 2)
 Valid? yes
 Found incorrect contour:
+r(1, 1)
+r(2, 2)
+s(2)
 p(2, 2)
 Is this a bug? yes
       29:      3  2 EXIT pred untraced_subgoal.p/2-0 (nondet) untraced_subgoal.m:28 (untraced_subgoal.m:18)
--------------------------------------------------------------------------
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