1.1 --- a/test/Tools/isac/OLDTESTS/scriptnew.sml	Wed Feb 03 15:21:12 2021 +0100
     1.2 +++ b/test/Tools/isac/OLDTESTS/scriptnew.sml	Wed Feb 03 16:39:44 2021 +0100
     1.3 @@ -30,7 +30,7 @@
     1.4    thy;
     1.5  
     1.6  store_met
     1.7 - (Method.prep_input Test.thy "met_test_simp" [] e_metID
     1.8 + (MethodC.prep_input Test.thy "met_test_simp" [] e_metID
     1.9   (*test for simplification*)
    1.10   (["Test", "met_testterm"]:metID,
    1.11    [("#Given" ,["realTestGiven g_"]),
    1.12 @@ -95,7 +95,7 @@
    1.13    thy;
    1.14  
    1.15  store_met
    1.16 - (Method.prep_input Test.thy "met_test_eq1" [] e_metID
    1.17 + (MethodC.prep_input Test.thy "met_test_eq1" [] e_metID
    1.18   (["Test", "testeq1"]:metID,
    1.19     [("#Given",["boolTestGiven e_e"]),
    1.20     ("#Where" ,[]), 
    1.21 @@ -118,7 +118,7 @@
    1.22  	   "boolTestFind v_i_"];
    1.23  val (dI',pI',mI') = ("Test",["met_testeq", "tests"],
    1.24  		     ["Test", "testeq1"]);
    1.25 -val Prog sc = (#scr o Method.from_store) ["Test", "testeq1"];
    1.26 +val Prog sc = (#scr o MethodC.from_store) ["Test", "testeq1"];
    1.27  atomt sc;
    1.28  val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];
    1.29  val (p,_,f,nxt,_,pt) = me nxt p c pt;
    1.30 @@ -150,7 +150,7 @@
    1.31  " --- test 11.5.02 Testeq: let e_e =... in [e_] --------- ";
    1.32  " --- test 11.5.02 Testeq: let e_e =... in [e_] --------- ";
    1.33  store_met
    1.34 - (Method.prep_input Test.thy "met_test_let" [] e_metID
    1.35 + (MethodC.prep_input Test.thy "met_test_let" [] e_metID
    1.36   (["Test", "testlet"]:metID,
    1.37     [("#Given",["boolTestGiven e_e"]),
    1.38     ("#Where" ,[]), 
    1.39 @@ -168,7 +168,7 @@
    1.40     \   e_e)\
    1.41     \in [e_::bool])"
    1.42     ));
    1.43 -val Prog sc = (#scr o Method.from_store) ["Test", "testlet"];
    1.44 +val Prog sc = (#scr o MethodC.from_store) ["Test", "testlet"];
    1.45  writeln(UnparseC.term sc);
    1.46  val fmz = ["boolTestGiven (sqrt a = 0)",
    1.47  	   "boolTestFind v_i_"];
    1.48 @@ -200,7 +200,7 @@
    1.49  val (dI',pI',mI') =
    1.50    ("Test",["sqroot-test", "univariate", "equation", "test"],
    1.51     ["Test", "sqrt-equ-test"]);
    1.52 -val Prog sc = (#scr o Method.from_store) ["Test", "sqrt-equ-test"];
    1.53 +val Prog sc = (#scr o MethodC.from_store) ["Test", "sqrt-equ-test"];
    1.54  writeln(UnparseC.term sc);
    1.55  
    1.56  "--- s1 ---";
    1.57 @@ -301,7 +301,7 @@
    1.58  val (dI',pI',mI') =
    1.59    ("Test",["sqroot-test", "univariate", "equation", "test"],
    1.60     ["Test", "sqrt-equ-test"]);
    1.61 - val Prog sc = (#scr o Method.from_store) ["Test", "sqrt-equ-test"];
    1.62 + val Prog sc = (#scr o MethodC.from_store) ["Test", "sqrt-equ-test"];
    1.63   (writeln o UnparseC.term) sc;
    1.64  "--- s1 ---";
    1.65  val (p,_,f,nxt,_,pt) = CalcTreeTEST [(fmz, (dI',pI',mI'))];