[m-rev.] diff: fix failing decldebug tests

[Julien Fischer]

Branches: master, 13.05

Fix failing decldebug tests.

tests/debugger/declarative/builtin_call_rep.exp:
The current definition of the proc_defn_rep structure has
an additional field.

tests/debugger/declarative/condition_bug.m:
Replace the use of the now-deleted svmap module.

tests/debugger/declarative/condition_bug.exp:
Update this to confrom to the current definition of the
I/O state in C grades.

Julien.

diff --git a/tests/debugger/declarative/builtin_call_rep.exp
b/tests/debugger/declarative/builtin_call_rep.exp
index 00612c1..eebb44a 100644
--- a/tests/debugger/declarative/builtin_call_rep.exp
+++ b/tests/debugger/declarative/builtin_call_rep.exp
@@ -5,7 +5,7 @@ Command echo enabled.
 mdb> step
       E2:     C2 CALL func int.+/2-0 (det)
 mdb> print proc_body
- proc_defn_rep([head_var_rep(1, var_mode_rep/2), head_var_rep(2,
var_mode_rep/2), head_var_rep(3, var_mode_rep/2)],
goal_rep(atomic_goal_rep("int.m", NN, [|]/2, builtin_call_rep/3), det_rep,
unit), empty, det_rep)
+ proc_defn_rep([head_var_rep(1, var_mode_rep/2), head_var_rep(2,
var_mode_rep/2), head_var_rep(3, var_mode_rep/2)],
goal_rep(atomic_goal_rep("int.m", NN, [|]/2, builtin_call_rep/3), det_rep,
unit), empty, no, det_rep)
 mdb> browse proc_body
 browser> cd 2
 browser> ls
diff --git a/tests/debugger/declarative/condition_bug.exp
b/tests/debugger/declarative/condition_bug.exp
index 1bb296e..31f299a 100644
--- a/tests/debugger/declarative/condition_bug.exp
+++ b/tests/debugger/declarative/condition_bug.exp
@@ -17,7 +17,7 @@ mdb> continue
 mdb> finish
 english      E3:     C2 EXIT pred stream.put/4-0 (det) (term_to_xml.m:NNNN)
 mdb> dd
-put(stream(1, output, preopen, stdout), "english", _,
state(c_pointer(0x1)))
+put(stream(1, output, preopen, stdout), "english", _, '<<foreign>>')
 1 tabled IO action:
 write_string_2(stream(1, output, preopen, stdout), "english")
 Valid? browse 2
diff --git a/tests/debugger/declarative/condition_bug.m
b/tests/debugger/declarative/condition_bug.m
index 5b8f81e..2f839e9 100644
--- a/tests/debugger/declarative/condition_bug.m
+++ b/tests/debugger/declarative/condition_bug.m
@@ -8,14 +8,14 @@

 :- implementation.

-:- import_module list, int, string, map, svmap, term_to_xml, assoc_list,
+:- import_module list, int, string, map, term_to_xml, assoc_list,
  pair.

 main(!IO) :-
  some [!Map] (
  map.init(!:Map),
- svmap.set("mission", "missie", !Map),
- svmap.set("critical", "kritiek", !Map),
+ map.set("mission", "missie", !Map),
+ map.set("critical", "kritiek", !Map),
  FinalMap = !.Map
  ),
  write_xml_doc(io.stdout_stream, translation(FinalMap), !IO),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurylang.org/archives/reviews/attachments/20130503/60264622/attachment.html>