1.1 --- a/test/Tools/isac/Interpret/script.sml Mon Sep 06 14:48:38 2010 +0200
1.2 +++ b/test/Tools/isac/Interpret/script.sml Mon Sep 06 15:09:37 2010 +0200
1.3 @@ -26,7 +26,7 @@
1.4 "Script BiegelinieScript \
1.5 \(l_::real) (q__::real) (v_::real) (b_::real=>real) \
1.6 \(rb_::bool list) (rm_::bool list) = \
1.7 -\ (let q___ = Take (M_b v_ = q__); \
1.8 +\ (let q___ = Take (M_b v_v = q__); \
1.9 \ (M1__::bool) = ((Substitute [v_ = 0])) q___ \
1.10 \ in True)";
1.11 val sc' = ((inst_abs thy) o term_of o the o (parse thy)) str;
1.12 @@ -35,7 +35,7 @@
1.13 "Script BiegelinieScript \
1.14 \(l_::real) (q__::real) (v_::real) (b_::real=>real) \
1.15 \(rb_::bool list) (rm_::bool list) = \
1.16 -\ (let q___ = Take (q_ v_ = q__); \
1.17 +\ (let q___ = Take (q_ v_v = q__); \
1.18 \ (M1__::bool) = ((Substitute [v_ = 0]) @@ \
1.19 \ (Substitute [M_b 0 = 0])) q___ \
1.20 \ in True)";(*..doesnt find Substitute with ..@@ !!!!!!!!!!!!!!!!!!!!!*)
1.21 @@ -44,7 +44,7 @@
1.22 "Script BiegelinieScript \
1.23 \(l_::real) (q__::real) (v_::real) (b_::real=>real) \
1.24 \(rb_::bool list) (rm_::bool list) = \
1.25 -\ (let q___ = Take (q_ v_ = q__); \
1.26 +\ (let q___ = Take (q_ v_v = q__); \
1.27 \ (M1__::bool) = Substitute [v_ = 0] q___ ; \
1.28 \ M1__ = Substitute [M_b 0 = 0] M1__ \
1.29 \ in True)"
1.30 @@ -53,7 +53,7 @@
1.31 "Script BiegelinieScript \
1.32 \(l_::real) (q__::real) (v_::real) (b_::real=>real) \
1.33 \(rb_::bool list) (rm_::bool list) = \
1.34 -\ (let q___ = Take (q_ v_ = q__); \
1.35 +\ (let q___ = Take (q_ v_v = q__); \
1.36 \ (M1__::bool) = Substitute [v_ = 0] q___ ; \
1.37 \ M1__ = Substitute [v_ = 1] q___ ; \
1.38 \ M1__ = Substitute [v_ = 2] q___ ; \
1.39 @@ -65,7 +65,7 @@
1.40 "Script BiegelinieScript \
1.41 \(l_::real) (q__::real) (v_::real) (b_::real=>real) \
1.42 \(rb_::bool list) (rm_::bool list) = \
1.43 -\ (let q___ = Take (M_b v_ = q__); \
1.44 +\ (let q___ = Take (M_b v_v = q__); \
1.45 \ (M1__::bool) = Substitute [v_ = 0] q___ ; \
1.46 \ M2__ = Take q___ ; \
1.47 \ M2__ = Substitute [v_ = 2] q___ \
1.48 @@ -125,7 +125,7 @@
1.49 \(l_::real) (q__::real) (v_::real) (b_::real=>real) \
1.50 \(rb_::bool list) (rm_::bool list) = "^
1.51 (*begin after the 2nd integrate*)
1.52 -" (let M__ = Take (M_b v_ = q__); \
1.53 +" (let M__ = Take (M_b v_v = q__); \
1.54 \ e1__ = nth_ 1 rm_ ; \
1.55 \ (x1__::real) = argument_in (lhs e1__); \
1.56 \ (M1__::bool) = Substitute [v_ = x1__] M__; \
1.57 @@ -141,7 +141,7 @@
1.58 \(l_::real) (q__::real) (v_::real) (b_::real=>real) \
1.59 \(rb_::bool list) (rm_::bool list) = "^
1.60 (*begin after the 2nd integrate*)
1.61 -" (let M__ = Take (M_b v_ = q__); \
1.62 +" (let M__ = Take (M_b v_v = q__); \
1.63 \ e1__ = nth_ 1 rm_ ; \
1.64 \ (x1__::real) = argument_in (lhs e1__); \
1.65 \ (M1__::bool) = ((Substitute [v_ = x1__]) @@ \