[m-rev.] trivial diff: fix failing debugger test cases

[Julien Fischer]

Estimated hours taken: 0.5
Branches: main

Fix debugger test cases that have been failing due to the recent changes to
std_util.

tests/debugger/declarative/args.m:
	Disambiguate a call to semidet_fail.

tests/debugger/declarative/condition_bug.m:
	Update the expected output as the line numbers in term_to_xml have
	changed.

tests/debugger/declarative/lpe_example.m:
	Import solutions rather than std_util.  Calling the (obsolete) version
	of solutions/2 in std_util results in different event numbers now.

tests/debugger/declarative/typed_unify.m:
	Update the expected output as the line numbers in std_util have
	changed.

Julien.

Index: args.m
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/args.m,v
retrieving revision 1.3
diff -u -r1.3 args.m
--- args.m	24 Mar 2006 04:40:55 -0000	1.3
+++ args.m	25 Mar 2006 05:03:36 -0000
@@ -8,7 +8,7 @@
 main -->
 	(
 		{ p(1, X, 3, Y, 5) },
-		{ semidet_fail }
+		{ library_forwarding.semidet_fail }
 	->
 		io__write_int(X),
 		io__nl,
Index: condition_bug.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/condition_bug.exp,v
retrieving revision 1.1
diff -u -r1.1 condition_bug.exp
--- condition_bug.exp	21 Mar 2006 02:12:18 -0000	1.1
+++ condition_bug.exp	25 Mar 2006 06:28:49 -0000
@@ -13,9 +13,9 @@
 <?xml version="1.0"?>
 <translations>
 	<word>
-		<      E2:     C2 CALL pred io.write_string/3-0 (det) io.m:6325 (term_to_xml.m:1299)
+		<      E2:     C2 CALL pred io.write_string/3-0 (det) io.m:6326 (term_to_xml.m:1266)
 mdb> finish
-english      E3:     C2 EXIT pred io.write_string/3-0 (det) io.m:6325 (term_to_xml.m:1299)
+english      E3:     C2 EXIT pred io.write_string/3-0 (det) io.m:6326 (term_to_xml.m:1266)
 mdb> dd
 write_string("english", _, _)
 1 tabled IO action:
@@ -41,5 +41,5 @@
 to the subterm in the atom is 2/1/3/1/1.
 dd> quit
 Diagnosis aborted.
-      E3:     C2 EXIT pred io.write_string/3-0 (det) io.m:6325 (term_to_xml.m:1299)
+      E3:     C2 EXIT pred io.write_string/3-0 (det) io.m:6326 (term_to_xml.m:1266)
 mdb> quit -y
Index: lpe_example.m
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/lpe_example.m,v
retrieving revision 1.1
diff -u -r1.1 lpe_example.m
--- lpe_example.m	6 Jan 2000 05:15:06 -0000	1.1
+++ lpe_example.m	25 Mar 2006 06:09:43 -0000
@@ -3,7 +3,7 @@
 :- import_module io.
 :- pred main(io__state::di, io__state::uo) is det.
 :- implementation.
-:- import_module std_util, int.
+:- import_module solutions, int.

 main -->
 	{ solutions(p(1), Ss) },
Index: typed_unify.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/typed_unify.exp,v
retrieving revision 1.1
diff -u -r1.1 typed_unify.exp
--- typed_unify.exp	7 Dec 2005 16:07:16 -0000	1.1
+++ typed_unify.exp	25 Mar 2006 06:05:25 -0000
@@ -4,15 +4,15 @@
 mdb> table_io start
 I/O tabling started.
 mdb> step
-      E2:     C2 CALL func std_util.univ/1-1 (det) std_util.m:1652 (typed_unify.m:14)
+      E2:     C2 CALL func std_util.univ/1-1 (det) std_util.m:488 (typed_unify.m:14)
 mdb> finish
-      E3:     C2 EXIT func std_util.univ/1-1 (det) std_util.m:1652 (typed_unify.m:14)
+      E3:     C2 EXIT func std_util.univ/1-1 (det) std_util.m:488 (typed_unify.m:14)
 mdb> step
       E4:     C1 COND pred typed_unify.main/2-0 (det) c4;?; typed_unify.m:15
 mdb> step
-      E5:     C3 CALL pred std_util.type_to_univ/2-2 (semidet) std_util.m:1676 (typed_unify.m:15)
+      E5:     C3 CALL pred std_util.type_to_univ/2-2 (semidet) std_util.m:512 (typed_unify.m:15)
 mdb> finish
-      E6:     C3 EXIT pred std_util.type_to_univ/2-2 (semidet) std_util.m:1676 (typed_unify.m:15)
+      E6:     C3 EXIT pred std_util.type_to_univ/2-2 (semidet) std_util.m:512 (typed_unify.m:15)
 mdb> untrust 0
 mdb> dd
 type_to_univ(1, univ_cons(1))
@@ -21,12 +21,12 @@
 1
 type_to_univ(_, univ_cons(1))
 Valid? info
-Context of current question : std_util.m:1670 (std_util.m:1652)
-Search mode                 : top down
+Context of current question : std_util.m:506 (std_util.m:488)
+Search mode                 : top down
 The current question was chosen because the marked subterm was bound by
 the untraced call inside the predicate std_util.type_to_univ/2
-(std_util.m:1672). The path to the subterm in the atom is 2/2.
+(std_util.m:508). The path to the subterm in the atom is 2/2.
 dd> quit
 Diagnosis aborted.
-      E6:     C3 EXIT pred std_util.type_to_univ/2-2 (semidet) std_util.m:1676 (typed_unify.m:15)
+      E6:     C3 EXIT pred std_util.type_to_univ/2-2 (semidet) std_util.m:512 (typed_unify.m:15)
 mdb> quit -y
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------