[m-rev.] diff: fix broken debug tests.

[Paul Bone]

Estimated time taken: 0.5
Branches: main

Fix broken declarative debug tests, these where broken by changes to structures
in mdbcomp/program_representation.m

tests/debugger/declarative/builtin_call_rep.exp:
tests/debugger/declarative/dependency.exp:
	Conform to changes in mdbcomp/program_representation.m

Index: tests/debugger/declarative/builtin_call_rep.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/builtin_call_rep.exp,v
retrieving revision 1.5
diff -u -r1.5 builtin_call_rep.exp
--- tests/debugger/declarative/builtin_call_rep.exp	12 Aug 2008 02:51:08 -0000	1.5
+++ tests/debugger/declarative/builtin_call_rep.exp	28 Aug 2008 10:15:39 -0000
@@ -5,11 +5,11 @@
 mdb> step
       E2:     C2 CALL func int.+/2-0 (det)
 mdb> print proc_body
-	proc_defn_rep([1, 2, 3], atomic_goal_rep(det_rep, "int.m", NN, [3], builtin_call_rep/3), empty)
+	proc_defn_rep([1, 2, 3], goal_rep(atomic_goal_rep("int.m", NN, [|]/2, builtin_call_rep/3), det_rep), empty, det_rep)
 mdb> browse proc_body
 browser> cd 2
 browser> ls
-atomic_goal_rep(det_rep, "int.m", NN, [3], builtin_call_rep("int", "+", [1, 2, 3]))
+goal_rep(atomic_goal_rep("int.m", NN, [3], builtin_call_rep("int", "+", [1, 2, 3])), det_rep)
 browser> quit
 mdb> f
       E3:     C2 EXIT func int.+/2-0 (det)
Index: tests/debugger/declarative/dependency.exp
===================================================================
RCS file: /home/mercury1/repository/tests/debugger/declarative/dependency.exp,v
retrieving revision 1.16
diff -u -r1.16 dependency.exp
--- tests/debugger/declarative/dependency.exp	12 Aug 2008 02:51:08 -0000	1.16
+++ tests/debugger/declarative/dependency.exp	28 Aug 2008 10:16:49 -0000
@@ -22,20 +22,24 @@
 	
 proc_defn_rep(
   [|](1, []), 
-  conj_rep(
-    [|](
-      atomic_goal_rep(
-        det_rep, 
-        "dependency.m", 
-        20, 
-        [|](2, []), 
-        plain_call_rep("dependency", "p", [|](2, []))), 
+  goal_rep(
+    conj_rep(
       [|](
-        ite_rep(atomic_goal_rep/5, atomic_goal_rep/5, atomic_goal_rep/5), 
+        goal_rep(
+          atomic_goal_rep(
+            "dependency.m", 
+            20, 
+            [|](2, []), 
+            plain_call_rep("dependency", "p", [|](2, []))), 
+          det_rep), 
         [|](
-          atomic_goal_rep/5, 
-          [|](switch_rep(4, [|]/2), [|](disj_rep/1, [|]/2)))))), 
-  empty)
+          goal_rep(ite_rep(goal_rep/2, goal_rep/2, goal_rep/2), det_rep), 
+          [|](
+            goal_rep(atomic_goal_rep/4, det_rep), 
+            [|](goal_rep/2, [|](goal_rep/2, [|]/2)))))), 
+    cc_multidet_rep), 
+  empty, 
+  cc_multidet_rep)
 mdb> dd -d 3 -n 7
 test([|](1, [|](3, [|](6, [|](1, [|](3, []))))))
 Valid? browse 1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mercurylang.org/archives/reviews/attachments/20080903/f5961c05/attachment.sig>