1.1 --- a/test/Tools/isac/Interpret/inform.sml	Wed Dec 05 15:29:36 2012 +0100
     1.2 +++ b/test/Tools/isac/Interpret/inform.sml	Wed Dec 05 15:56:38 2012 +0100
     1.3 @@ -45,9 +45,9 @@
     1.4  "--------- appendFormula: on Res + equ_nrls ----------------------";
     1.5  "--------- appendFormula: on Res + equ_nrls ----------------------";
     1.6  
     1.7 - val Script sc = (#scr o get_met) ["Test","squ-equ-test-subpbl1"];
     1.8 + val Prog sc = (#scr o get_met) ["Test","squ-equ-test-subpbl1"];
     1.9   (writeln o term2str) sc;
    1.10 - val Script sc = (#scr o get_met) ["Test","solve_linear"];
    1.11 + val Prog sc = (#scr o get_met) ["Test","solve_linear"];
    1.12   (writeln o term2str) sc;
    1.13  
    1.14   states:=[];
    1.15 @@ -874,7 +874,7 @@
    1.16  val (res, inf) =
    1.17    (str2term "d_d x (x ^^^ 2) + d_d x (sin (x ^^^ 4))",
    1.18     str2term "d_d x (x ^^^ 2) + cos (4 * x ^^^ 3)");
    1.19 -val {errpats, nrls = rls, scr = Script prog, ...} = get_met ["diff", "differentiate_on_R"]
    1.20 +val {errpats, nrls = rls, scr = Prog prog, ...} = get_met ["diff", "differentiate_on_R"]
    1.21  
    1.22  val env = [(str2term "v_v", str2term "x")];
    1.23  val errpats =
    1.24 @@ -937,7 +937,7 @@
    1.25  val msg_calcstate' = compare_step ([], [], (pt, pos_pred)) f_in
    1.26  val ("no derivation found", calcstate') = msg_calcstate';
    1.27  			                 val pp = par_pblobj pt p
    1.28 -			                 val {errpats, nrls, scr = Script prog, ...} = get_met (get_obj g_metID pt pp)
    1.29 +			                 val {errpats, nrls, scr = Prog prog, ...} = get_met (get_obj g_metID pt pp)
    1.30  			                 val ScrState (env, _, _, _, _, _) = get_istate pt pos;
    1.31                   case check_error_patterns (f_pred, f_in) (prog, env) (errpats, nrls) of
    1.32  			                   SOME errpatID => ("error pattern #" ^ errpatID ^ "#", calcstate')
    1.33 @@ -976,7 +976,7 @@
    1.34  "~~~~~ fun find_fillpatterns, args:"; val ((pt, pos as (p, _)), errpatID) = ((pt, pos), errpatID);
    1.35  	    val f_curr = get_curr_formula (pt, pos); (* = "d_d x (x ^^^ 2) + d_d x (sin (x ^^^ 4))"*)
    1.36      val pp = par_pblobj pt p
    1.37 -			    val {errpats, scr = Script prog, ...} = get_met (get_obj g_metID pt pp)
    1.38 +			    val {errpats, scr = Prog prog, ...} = get_met (get_obj g_metID pt pp)
    1.39      val ScrState (env, _, _, _, _, _) = get_istate pt pos
    1.40      val subst = get_bdv_subst prog env
    1.41      val errpatthms = errpats