diff -r 95d956108461 -r 460c24a6a6ba test/Tools/isac/Frontend/interface.sml
--- a/test/Tools/isac/Frontend/interface.sml	Tue Sep 28 08:58:06 2010 +0200
+++ b/test/Tools/isac/Frontend/interface.sml	Tue Sep 28 09:06:56 2010 +0200
@@ -60,10 +60,10 @@
 "--------- encode ^ -> ^^^ ---------------------------------------";
 "--------- encode ^ -> ^^^ ---------------------------------------";
 if encode "a^2+b^2=c^2" = "a^^^2+b^^^2=c^^^2" then ()
-else raise error "interface.sml: diff.behav. in encode ^ -> ^^^ ";
+else error "interface.sml: diff.behav. in encode ^ -> ^^^ ";
 
 if (decode o encode) "a^2+b^2=c^2" = "a^2+b^2=c^2" then ()
-else raise error "interface.sml: diff.behav. in de/encode ^ <-> ^^^ ";
+else error "interface.sml: diff.behav. in de/encode ^ <-> ^^^ ";
 
 ==================================================================*)
 "exported from struct --------------------------------------------";
@@ -167,7 +167,7 @@
  val (Form f, tac, asms) = pt_extract (pt, ip);
      (*exception just above means: 'ModSpec' has been returned: error anyway*)
  if term2str f = "[x = 1]" then () else 
- raise error "FE-Kernel-interface.sml: diff.behav. in solve_linear as rootpbl";
+ error "FE-Kernel-interface.sml: diff.behav. in solve_linear as rootpbl";
 
 
 
@@ -188,10 +188,10 @@
  moveActiveDown 1;
  moveActiveDown 1;
  if get_pos 1 1 = ([2], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in a inspect 1 with Iterator 2";
+ error "FE-interface.sml: diff.behav. in a inspect 1 with Iterator 2";
  moveActiveDown 1; refFormula 1 ([], Res);
  if get_pos 1 1 = ([], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in b inspect 1 with Iterator 2";
+ error "FE-interface.sml: diff.behav. in b inspect 1 with Iterator 2";
  moveActiveCalcHead 1; refFormula 1 ([],Pbl);
 
 
@@ -317,7 +317,7 @@
  val (Form f, tac, asms) = pt_extract (pt, ip);
      (*exception just above means: 'ModSpec' has been returned: error anyway*)
  if term2str f = "[x = 1]" then () else 
- raise error "FE-interface.sml: diff.behav. in miniscript with mini-subpb";
+ error "FE-interface.sml: diff.behav. in miniscript with mini-subpb";
 
  DEconstrCalcTree 1;
 
@@ -372,7 +372,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "[x = 1]" andalso p = ([], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in miniscript with mini-subpb";
+ error "FE-interface.sml: diff.behav. in miniscript with mini-subpb";
 
  DEconstrCalcTree 1;
 
@@ -397,7 +397,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "[x = 1]" andalso p = ([], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in solve_linear/rt AUTOCALCULATE ";
+ error "FE-interface.sml: diff.behav. in solve_linear/rt AUTOCALCULATE ";
 
 
 "--------- solve_linear as rootpbl AUTOCALC CompleteHead/Calc ----";
@@ -420,7 +420,7 @@
  autoCalculate 1 CompleteCalc; 
  val ((pt,p),_) = get_calc 1;
  if p=([], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in solve_linear AUTOC Head/Calc ";
+ error "FE-interface.sml: diff.behav. in solve_linear AUTOC Head/Calc ";
 
 
 "--------- miniscript with mini-subpbl AUTOCALCULATE CompleteCalc-";
@@ -452,7 +452,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "[x = 1]" andalso p = ([], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in mini-subpbl AUTOCALCULATE 6";
+ error "FE-interface.sml: diff.behav. in mini-subpbl AUTOCALCULATE 6";
 
 
 "--------- miniscript with mini-subpbl AUTO CompleteCalcHead------";
@@ -495,7 +495,7 @@
  if get_obj g_spec pt [] = ("e_domID", 
 			    ["linear", "univariate","equation","test"],
 			    ["Test","solve_linear"]) then ()
- else raise error "FE-interface.sml: diff.behav. in setProblem, setMethod";
+ else error "FE-interface.sml: diff.behav. in setProblem, setMethod";
 
  autoCalculate 1 CompleteCalcHead;
  refFormula 1 (get_pos 1 1); 
@@ -508,7 +508,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "[x = 1]" andalso p = ([], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in mini-subpbl AUTOCALCULATE 6";
+ error "FE-interface.sml: diff.behav. in mini-subpbl AUTOCALCULATE 6";
 
 
 "--------- setContext..Thy ---------------------------------------";
@@ -558,7 +558,7 @@
  writeln str;
  if str = ".    ----- pblobj -----\n1.   x + 1 = 2\n2.   x + 1 + -1 * 2 = 0\n"
  then () else 
- raise error "FE-interface.sml: diff.behav. in mini-subpbl CompleteToSubpbl-1";
+ error "FE-interface.sml: diff.behav. in mini-subpbl CompleteToSubpbl-1";
 
  autoCalculate 1 (Step 1); (*proceeds only, of NOT 1 step before subplb*)
  autoCalculate 1 CompleteToSubpbl;
@@ -570,7 +570,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "[x = 1]" andalso p = ([], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in mini-subpbl CompleteToSubpbl 1";
+ error "FE-interface.sml: diff.behav. in mini-subpbl CompleteToSubpbl 1";
 
 
 
@@ -777,7 +777,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "[x = -1, x = -3]" andalso p = ([], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in tryMatchProblem, tryRefine";
+ error "FE-interface.sml: diff.behav. in tryMatchProblem, tryRefine";
 
 (*------------^^^-inserted-----------------------------------------------*)
 (*WN050904 the fetchProposedTactic's below may not have worked like that
@@ -800,7 +800,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "[x = -1, x = -3]" andalso p = ([], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in tryMatchProblem, tryRefine";
+ error "FE-interface.sml: diff.behav. in tryMatchProblem, tryRefine";
 
 
 "--------- modifyCalcHead, resetCalcHead, modelProblem ------------";
@@ -939,7 +939,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "[x = 1]" andalso p = ([], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in from pbl-hierarchy";
+ error "FE-interface.sml: diff.behav. in from pbl-hierarchy";
  
 
 
@@ -957,7 +957,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "[x = 1]" andalso p = ([], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in algebra system";
+ error "FE-interface.sml: diff.behav. in algebra system";
 
 
 
@@ -1098,7 +1098,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "[x = 1]" andalso p = ([], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in combinations of steps";
+ error "FE-interface.sml: diff.behav. in combinations of steps";
 
 
 "--------- appendFormula label{SOLVE:MANUAL:FORMULA:enter} right--";
@@ -1124,7 +1124,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "-1 + x = 0" andalso p = ([2], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in FORMULA:enter} right";
+ error "FE-interface.sml: diff.behav. in FORMULA:enter} right";
 
 "--------- appendFormula label{SOLVE:MANUAL:FORMULA:enter} other--";
 "--------- appendFormula label{SOLVE:MANUAL:FORMULA:enter} other--";
@@ -1149,7 +1149,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "x - 1 = 0" andalso p = ([2], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in FORMULA:enter} other";
+ error "FE-interface.sml: diff.behav. in FORMULA:enter} other";
 
 "--------- appendFormula label{SOLVE:MANUAL:FORMULA:enter} oth 2--";
 "--------- appendFormula label{SOLVE:MANUAL:FORMULA:enter} oth 2--";
@@ -1175,7 +1175,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "x = 1" andalso p = ([3,2], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in FORMULA:enter} oth 2";
+ error "FE-interface.sml: diff.behav. in FORMULA:enter} oth 2";
 
 
 "--------- appendFormula label{SOLVE:MANUAL:FORMULA:enter} NOTok--";
@@ -1199,7 +1199,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "x + 1 + -1 * 2 = 0" andalso p = ([1], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in FORMULA:enter} NOTok";
+ error "FE-interface.sml: diff.behav. in FORMULA:enter} NOTok";
 
 
 "--------- replaceFormula {SOLVE:MANUAL:FORMULA:replace} right----";
@@ -1222,11 +1222,11 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "-1 + x = 0" andalso p = ([2], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in FORMULA:replace} right 1";
+ error "FE-interface.sml: diff.behav. in FORMULA:replace} right 1";
  if map fst (get_interval ([2],Res) ([],Res) 9999 pt) = 
     [([2], Res), ([3], Pbl), ([3, 1], Frm), ([3, 1], Res), ([3, 2], Res),
      ([3], Res), ([4], Res), ([], Res)] then () (*nothing deleted!*) else
- raise error "FE-interface.sml: diff.behav. in FORMULA:replace} right 2";
+ error "FE-interface.sml: diff.behav. in FORMULA:replace} right 2";
  
 (*WN050211 replaceFormula didn't work on second ctree: thus now tested...*)
  CalcTree
@@ -1245,11 +1245,11 @@
  val p = get_pos 2 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "-1 + x = 0" andalso p = ([2], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in FORMULA:replace} right 1";
+ error "FE-interface.sml: diff.behav. in FORMULA:replace} right 1";
  if map fst (get_interval ([2],Res) ([],Res) 9999 pt) = 
     [([2], Res), ([3], Pbl), ([3, 1], Frm), ([3, 1], Res), ([3, 2], Res),
      ([3], Res), ([4], Res), ([], Res)] then () (*nothing deleted!*) else
- raise error "FE-interface.sml: diff.behav. in FORMULA:replace} right 2b";
+ error "FE-interface.sml: diff.behav. in FORMULA:replace} right 2b";
 
 "--------- replaceFormula {SOLVE:MANUAL:FORMULA:replace} other----";
 "--------- replaceFormula {SOLVE:MANUAL:FORMULA:replace} other----";
@@ -1274,7 +1274,7 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "x - 1 = 0" andalso p = ([2], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in FORMULA:replace} other 1";
+ error "FE-interface.sml: diff.behav. in FORMULA:replace} other 1";
 (* for getting the list in whole length ...
 print_depth 99;map fst (get_interval ([1],Res) ([],Res) 9999 pt);print_depth 3;
    *)
@@ -1284,7 +1284,7 @@
       ([2, 8], Res), ([2, 9], Res), ([2], Res)
 (*WN060727 {cutlevup->test_trans} removed: , 
       ([], Res)(*dropped, if test_trans doesnt stop at PblNd*)*)] then () else
- raise error "FE-interface.sml: diff.behav. in FORMULA:replace} other 2";
+ error "FE-interface.sml: diff.behav. in FORMULA:replace} other 2";
 
 
 
@@ -1314,12 +1314,12 @@
     [([1], Res), ([2], Res), ([3], Pbl), ([3, 1], Frm), ([3, 1], Res),
       ([3, 2, 1], Frm), ([3, 2, 1], Res), ([3, 2, 2], Res), 
       ([3,2],Res)] then () else
- raise error "FE-interface.sml: diff.behav. in FORMULA:replace} oth2 1";
+ error "FE-interface.sml: diff.behav. in FORMULA:replace} oth2 1";
 
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "x = 1" andalso p = ([3,2], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in FORMULA:replace} oth2 2";
+ error "FE-interface.sml: diff.behav. in FORMULA:replace} oth2 2";
 
 
 
@@ -1344,6 +1344,6 @@
  val p = get_pos 1 1;
  val (Form f, tac, asms) = pt_extract (pt, p);
  if term2str f = "-1 + x = 0" andalso p = ([2], Res) then () else 
- raise error "FE-interface.sml: diff.behav. in FORMULA:replace} NOTok";
+ error "FE-interface.sml: diff.behav. in FORMULA:replace} NOTok";