1.1 --- a/test/Tools/isac/Interpret/ctree.sml	Mon Mar 21 00:32:53 2011 +0100
     1.2 +++ b/test/Tools/isac/Interpret/ctree.sml	Mon Apr 04 11:05:07 2011 +0200
     1.3 @@ -64,17 +64,17 @@
     1.4  "this build should be detailed each time a test fails later    \
     1.5  \i.e. all the tests should be caught here first                \
     1.6  \and linked with a reference to the respective test environment";
     1.7 -val fmz = ["equality (x+1=2)",
     1.8 -	   "solveFor x","solutions L"];
     1.9 +val fmz = ["equality (x+1=(2::int))",
    1.10 +	   "solveFor (x::int)","solutions L"];
    1.11  val (dI',pI',mI') =
    1.12    ("Test",["sqroot-test","univariate","equation","test"],
    1.13     ["Test","squ-equ-test-subpbl1"]);
    1.14  val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
    1.15 -val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.16 +val (p,_,f,(nxt,tacx),_,pt) = me nxt p [1] pt;
    1.17  (* nxt = Add_Given "equality (x + 1 = 2)"
    1.18     (writeln o (itms2str_ ctxt)) (get_obj g_pbl pt (fst p));
    1.19     *)
    1.20 -val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.21 +val (p,_,f,nxt,_,pt) = me (nxt,tacx) p [1] pt;
    1.22  (* (writeln o (itms2str_ ctxt)) (get_obj g_pbl pt (fst p));
    1.23     *)
    1.24  val (p,_,f,nxt,_,pt) = me nxt p [1] pt;
    1.25 @@ -92,7 +92,7 @@
    1.26  "ctree.sml-------------- cut_tree new (from ptree above)----------";
    1.27  val (pt', cuts) = cut_tree pt ([1],Frm);
    1.28  "ctree.sml-------------- cappend on complete ctree from above ----";
    1.29 -val (pt', cuts) = cappend_form pt [1] e_istate (str2term "Inform[1]");
    1.30 +val (pt', cuts) = cappend_form pt [1] (e_istate, e_ctxt) (str2term "Inform[1]");
    1.31  "----------------------------------------------------------------/";
    1.32  (*========== inhibit exn WN110319 ==============================================
    1.33  val (p,_,f,nxt,_,pt) = me nxt p [1] pt(*cappend_form: pos =[1]*);