<div dir="ltr"><div>Branches: master, 13.05</div><div><br></div><div>Fix failing decldebug tests.</div><div><br></div><div>tests/debugger/declarative/builtin_call_rep.exp:</div><div><span class="" style="white-space:pre"> </span>The current definition of the proc_defn_rep structure has</div>
<div><span class="" style="white-space:pre"> </span>an additional field.</div><div><br></div><div>tests/debugger/declarative/condition_bug.m:</div><div><span class="" style="white-space:pre"> </span>Replace the use of the now-deleted svmap module.</div>
<div><br></div><div>tests/debugger/declarative/condition_bug.exp:</div><div><span class="" style="white-space:pre"> </span>Update this to confrom to the current definition of the </div><div><span class="" style="white-space:pre"> </span>I/O state in C grades.</div>
<div><br></div><div>Julien.</div><div><br></div><div>diff --git a/tests/debugger/declarative/builtin_call_rep.exp b/tests/debugger/declarative/builtin_call_rep.exp</div><div>index 00612c1..eebb44a 100644</div><div>--- a/tests/debugger/declarative/builtin_call_rep.exp</div>
<div>+++ b/tests/debugger/declarative/builtin_call_rep.exp</div><div>@@ -5,7 +5,7 @@ Command echo enabled.</div><div> mdb> step</div><div> E2: C2 CALL func int.+/2-0 (det)</div><div> mdb> print proc_body</div>
<div>-<span class="" style="white-space:pre"> </span>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)</div>
<div>+<span class="" style="white-space:pre"> </span>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)</div>
<div> mdb> browse proc_body</div><div> browser> cd 2</div><div> browser> ls</div><div>diff --git a/tests/debugger/declarative/condition_bug.exp b/tests/debugger/declarative/condition_bug.exp</div><div>index 1bb296e..31f299a 100644</div>
<div>--- a/tests/debugger/declarative/condition_bug.exp</div><div>+++ b/tests/debugger/declarative/condition_bug.exp</div><div>@@ -17,7 +17,7 @@ mdb> continue</div><div> mdb> finish</div><div> english E3: C2 EXIT pred stream.put/4-0 (det) (term_to_xml.m:NNNN)</div>
<div> mdb> dd</div><div>-put(stream(1, output, preopen, stdout), "english", _, state(c_pointer(0x1)))</div><div>+put(stream(1, output, preopen, stdout), "english", _, '<<foreign>>')</div>
<div> 1 tabled IO action:</div><div> write_string_2(stream(1, output, preopen, stdout), "english")</div><div> Valid? browse 2</div><div>diff --git a/tests/debugger/declarative/condition_bug.m b/tests/debugger/declarative/condition_bug.m</div>
<div>index 5b8f81e..2f839e9 100644</div><div>--- a/tests/debugger/declarative/condition_bug.m</div><div>+++ b/tests/debugger/declarative/condition_bug.m</div><div>@@ -8,14 +8,14 @@</div><div> </div><div> :- implementation.</div>
<div> </div><div>-:- import_module list, int, string, map, svmap, term_to_xml, assoc_list,</div><div>+:- import_module list, int, string, map, term_to_xml, assoc_list,</div><div> <span class="" style="white-space:pre"> </span>pair.</div>
<div> </div><div> main(!IO) :-</div><div> <span class="" style="white-space:pre"> </span>some [!Map] (</div><div> <span class="" style="white-space:pre"> </span>map.init(!:Map),</div><div>-<span class="" style="white-space:pre"> </span>svmap.set("mission", "missie", !Map),</div>
<div>-<span class="" style="white-space:pre"> </span>svmap.set("critical", "kritiek", !Map),</div><div>+<span class="" style="white-space:pre"> </span>map.set("mission", "missie", !Map),</div>
<div>+<span class="" style="white-space:pre"> </span>map.set("critical", "kritiek", !Map),</div><div> <span class="" style="white-space:pre"> </span>FinalMap = !.Map</div><div> <span class="" style="white-space:pre"> </span>),</div>
<div> <span class="" style="white-space:pre"> </span>write_xml_doc(io.stdout_stream, translation(FinalMap), !IO),</div><div><br></div></div>