1.1 --- a/test/Tools/isac/Interpret/solve.sml Tue Sep 28 08:58:06 2010 +0200
1.2 +++ b/test/Tools/isac/Interpret/solve.sml Tue Sep 28 09:06:56 2010 +0200
1.3 @@ -52,7 +52,7 @@
1.4 (*with "Script SimplifyScript (t_::real) = -----------------
1.5 \ ((Rewrite_Set norm_Rational False) t_)"
1.6 case pt of Nd (PblObj _, [Nd _]) => ((*met only applies norm_Rational*))
1.7 - | _ => raise error "solve.sml: interSteps on norm_Rational 1";
1.8 + | _ => error "solve.sml: interSteps on norm_Rational 1";
1.9 interSteps 1 ([1], Res);
1.10 getFormulaeFromTo 1 ([1], Frm) ([1,12], Res) 99999 false;
1.11 interSteps 1 ([1,3], Res);
1.12 @@ -68,7 +68,7 @@
1.13 --------------------------------------------------------------------*)
1.14
1.15 case pt of Nd (PblObj _, [Nd _, Nd _, Nd _, Nd _, Nd _, Nd _]) => ()
1.16 - | _ => raise error "solve.sml: interSteps on norm_Rational 1";
1.17 + | _ => error "solve.sml: interSteps on norm_Rational 1";
1.18 (*these have been done now by the script ^^^ immediately...
1.19 interSteps 1 ([1], Res);
1.20 getFormulaeFromTo 1 ([1], Frm) ([1,12], Res) 99999 false;
1.21 @@ -84,7 +84,7 @@
1.22 case (term2str form, tac, terms2strs asm) of
1.23 ("1 / 2", Check_Postcond ["rational", "simplification"],
1.24 ["-36 * x + 4 * x ^^^ 3 ~= 0"]) => ()
1.25 - | _ => raise error "solve.sml: interSteps on norm_Rational 2";
1.26 + | _ => error "solve.sml: interSteps on norm_Rational 2";
1.27
1.28
1.29
1.30 @@ -161,7 +161,7 @@
1.31 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.32 (*"(3 + -1 * x) / (3 + x)"*)
1.33 if nxt = ("End_Proof'",End_Proof') then ()
1.34 -else raise error "details.sml, changed behaviour in: without detail";
1.35 +else error "details.sml, changed behaviour in: without detail";
1.36
1.37 val str = pr_ptree pr_short pt;
1.38 writeln str;
1.39 @@ -218,7 +218,7 @@
1.40 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.41 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"(3 - x) / (3 + x)"))
1.42 andalso nxt = ("End_Proof'",End_Proof') then ()
1.43 -else raise error "new behaviour in details.sml, \
1.44 +else error "new behaviour in details.sml, \
1.45 \cancel, rev-rew (cancel) afterwards";
1.46 FIXXXXXME.040216 #####################################################*)
1.47
1.48 @@ -273,7 +273,7 @@
1.49 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.50 (*"(3 + -1 * x) / (3 + x)"*)
1.51 if nxt = ("End_Proof'",End_Proof') then ()
1.52 -else raise error "details.sml, changed behaviour in: cancel_p, without detail";
1.53 +else error "details.sml, changed behaviour in: cancel_p, without detail";
1.54
1.55 "-------------- cancel_p, detail rev-rew (cancel) afterwards ----------";
1.56 "-------------- cancel_p, detail rev-rew (cancel) afterwards ----------";
1.57 @@ -328,7 +328,7 @@
1.58 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.59 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.60 if nxt = ("End_Detail",End_Detail) then ()
1.61 - else raise error "details.sml: new behav. in Detail make_polynomial";
1.62 + else error "details.sml: new behav. in Detail make_polynomial";
1.63 ----------------------------------------------------------------------*)
1.64
1.65 (*---------------
1.66 @@ -346,7 +346,7 @@
1.67 val (p,_,f,nxt,_,pt) = me nxt p [] pt;
1.68 if f = Form' (FormKF (~1,EdUndef,0,Nundef,"(3 + x) / (3 - x)"))
1.69 andalso nxt = ("End_Proof'",End_Proof') then ()
1.70 -else raise error "new behaviour in details.sml, cancel_p afterwards";
1.71 +else error "new behaviour in details.sml, cancel_p afterwards";
1.72
1.73 ----------------*)
1.74
1.75 @@ -401,8 +401,8 @@
1.76 val ("donesteps",_(*,ss*), lastpos) = detailstep pt ip;
1.77 (*case ss of [(_,_,t1),(_,_,t2),(_,_,t3),(_,_,t4),(_,_,t5),(_,_,t6)] =>
1.78 (writeln o terms2str) [t1,t2,t3,t4,t5,t6]
1.79 - | _ => raise error "details.sml: diff.behav. in detail miniscript";*) if lastpos = ([4], Res) then ()
1.80 - else raise error "details.sml: diff.behav. in interSteps'donesteps' 1";
1.81 + | _ => error "details.sml: diff.behav. in detail miniscript";*) if lastpos = ([4], Res) then ()
1.82 + else error "details.sml: diff.behav. in interSteps'donesteps' 1";
1.83
1.84 moveActiveDown 1;
1.85 moveActiveDown 1;
1.86 @@ -414,8 +414,8 @@
1.87 val ("donesteps",_(*,ss*), lastpos) = detailstep pt ip;
1.88 (*case ss of [(_,_,t1),(_,_,t2),(_,_,t3)] =>
1.89 (writeln o terms2str) [t1,t2,t3]
1.90 - | _ => raise error "details.sml: diff.behav. in detail miniscript";*) if lastpos = ([3, 2], Res) then ()
1.91 - else raise error "details.sml: diff.behav. in interSteps'donesteps' 1";
1.92 + | _ => error "details.sml: diff.behav. in detail miniscript";*) if lastpos = ([3, 2], Res) then ()
1.93 + else error "details.sml: diff.behav. in interSteps'donesteps' 1";
1.94
1.95
1.96 (* val [(_,(((pt,_),_),[(_,ip)]))] = !states;
1.97 @@ -446,7 +446,7 @@
1.98 interSteps 1 ([2],Res);
1.99 val [(_,(((pt,_),_),[(_,(p,_))]))] = !states;
1.100 if length (children (get_nd pt p)) = 6 then ()
1.101 - else raise error "details.sml: diff.behav. in interSteps'detailrls' 1";
1.102 + else error "details.sml: diff.behav. in interSteps'detailrls' 1";
1.103
1.104 moveActiveDown 1;
1.105 moveActiveDown 1; refFormula 1 (get_pos 1 1); (* 3,1 Frm, <ISA> -1 + x = 0 </ISA> *);
1.106 @@ -454,7 +454,7 @@
1.107 interSteps 1 ([3,1],Frm) (*<ERROR> first formula on level has NO detail </E*);
1.108 val [(_,(((pt,_),_),[(_,(p,_))]))] = !states;
1.109 if length (children (get_nd pt p)) = 0 then () (*NO detail at ([xxx,1],Frm)*)
1.110 - else raise error "details.sml: diff.behav. in interSteps'detailrls' 2";
1.111 + else error "details.sml: diff.behav. in interSteps'detailrls' 2";
1.112
1.113 moveActiveDown 1;
1.114 refFormula 1 (get_pos 1 1); (* 3,1 Res, <ISA> x = 0 + -1 * -1 </ISA> *)
1.115 @@ -471,7 +471,7 @@
1.116 interSteps 1 ([3,2],Res);
1.117 val [(_,(((pt,_),_),[(_,(p,_))]))] = !states;
1.118 if length (children (get_nd pt p)) = 2 then ()
1.119 - else raise error "details.sml: diff.behav. in interSteps'detailrls' 3";
1.120 + else error "details.sml: diff.behav. in interSteps'detailrls' 3";
1.121
1.122 val ((pt,p),_) = get_calc 1; show_pt pt;
1.123
1.124 @@ -498,7 +498,7 @@
1.125 val ((pt,p),_) = get_calc 1; show_pt pt;
1.126 val (_,_,lastpos) =detailstep pt p;
1.127 if p = ([2], Res) andalso lastpos = ([2, 9], Res) then ()
1.128 -else raise error "solve.sml: diff.beh. after appendFormula x - 1 = 0";
1.129 +else error "solve.sml: diff.beh. after appendFormula x - 1 = 0";
1.130
1.131
1.132 "------ Detail_Set -----------------------------------------------";