1.1 --- a/test/Tools/isac/OLDTESTS/scriptnew.sml Wed Dec 05 15:29:36 2012 +0100
1.2 +++ b/test/Tools/isac/OLDTESTS/scriptnew.sml Wed Dec 05 15:56:38 2012 +0100
1.3 @@ -123,7 +123,7 @@
1.4 "boolTestFind v_i_"];
1.5 val (dI',pI',mI') = ("Test",["met_testeq","tests"],
1.6 ["Test","testeq1"]);
1.7 -val Script sc = (#scr o get_met) ["Test","testeq1"];
1.8 +val Prog sc = (#scr o get_met) ["Test","testeq1"];
1.9 atomt sc;
1.10 (*val p = e_pos'; val c = [];
1.11 val nxt = ("Init_Proof",Init_Proof (fmz, (dI',pI',mI')));
1.12 @@ -176,7 +176,7 @@
1.13 \ e_e)\
1.14 \in [e_::bool])"
1.15 ));
1.16 -val Script sc = (#scr o get_met) ["Test","testlet"];
1.17 +val Prog sc = (#scr o get_met) ["Test","testlet"];
1.18 writeln(term2str sc);
1.19 val fmz = ["boolTestGiven (sqrt a = 0)",
1.20 "boolTestFind v_i_"];
1.21 @@ -211,7 +211,7 @@
1.22 val (dI',pI',mI') =
1.23 ("Test",["sqroot-test","univariate","equation","test"],
1.24 ["Test","sqrt-equ-test"]);
1.25 -val Script sc = (#scr o get_met) ["Test","sqrt-equ-test"];
1.26 +val Prog sc = (#scr o get_met) ["Test","sqrt-equ-test"];
1.27 writeln(term2str sc);
1.28
1.29 "--- s1 ---";
1.30 @@ -315,7 +315,7 @@
1.31 val (dI',pI',mI') =
1.32 ("Test",["sqroot-test","univariate","equation","test"],
1.33 ["Test","sqrt-equ-test"]);
1.34 - val Script sc = (#scr o get_met) ["Test","sqrt-equ-test"];
1.35 + val Prog sc = (#scr o get_met) ["Test","sqrt-equ-test"];
1.36 (writeln o term2str) sc;
1.37 "--- s1 ---";
1.38 (*val p = e_pos'; val c = [];
1.39 @@ -485,7 +485,7 @@
1.40
1.41
1.42 (*GoOn.5.03. script with Map, Subst (biquadr.equ.)
1.43 -val scr = Script (((inst_abs thy) o term_of o the o (parse thy))
1.44 +val scr = Prog (((inst_abs thy) o term_of o the o (parse thy))
1.45 "Script Biquadrat_poly (e_e::bool) (v_::real) = \
1.46 \(let e_e = Substitute [(v_^^^4, v_0_^^^2),(v_^^^2, v_0_)] e_; \
1.47 \ L_0_ = (SubProblem (PolyEq_,[univariate,equation], [no_met]) \