1.1 --- a/src/Tools/isac/ProgLang/scrtools.sml	Tue Sep 28 08:58:06 2010 +0200
     1.2 +++ b/src/Tools/isac/ProgLang/scrtools.sml	Tue Sep 28 09:06:56 2010 +0200
     1.3 @@ -145,9 +145,9 @@
     1.4  (**.construct scr-env from scr(created automatically) and Rewrite_Set.**)
     1.5  
     1.6  fun one_scr_arg (Const _ $ arg $ _) = arg
     1.7 -  | one_scr_arg t = raise error ("one_scr_arg: called by "^(term2str t));
     1.8 +  | one_scr_arg t = error ("one_scr_arg: called by "^(term2str t));
     1.9  fun two_scr_arg (Const _ $ a1 $ a2 $ _) = (a1, a2)
    1.10 -  | two_scr_arg t = raise error ("two_scr_arg: called by "^(term2str t));
    1.11 +  | two_scr_arg t = error ("two_scr_arg: called by "^(term2str t));
    1.12  
    1.13  
    1.14  (**.generate calc from a script.**)
    1.15 @@ -167,7 +167,7 @@
    1.16  datatype stacexpr = STac of term | Expr of term
    1.17  fun rep_stacexpr (STac t ) = t
    1.18    | rep_stacexpr (Expr t) = 
    1.19 -    raise error ("rep_stacexpr called with t= "^(term2str t));
    1.20 +    error ("rep_stacexpr called with t= "^(term2str t));
    1.21  
    1.22  type env = (term * term) list;
    1.23  
    1.24 @@ -300,7 +300,7 @@
    1.25    | is_calc _ = false;
    1.26  fun op_of_calc (Const ("Script.Calculate",_) $ Free (op_,_)) = op_
    1.27    | op_of_calc (Const ("Script.Calculate",_) $ Free (op_,_) $ _) = op_
    1.28 -  | op_of_calc t = raise error ("op_of_calc called with"^term2str t);
    1.29 +  | op_of_calc t = error ("op_of_calc called with"^term2str t);
    1.30  (*
    1.31   val Script sc = (#scr o rep_rls) Test_simplify;
    1.32   val stacs = stacpbls sc;
    1.33 @@ -440,7 +440,7 @@
    1.34    | contain_bdv (Rls_ rls ::rs) = 
    1.35      contain_bdv (get_rules rls) orelse contain_bdv rs
    1.36    | contain_bdv (r::_) = 
    1.37 -    raise error ("contain_bdv called with ["^(id_rule r)^",...]");
    1.38 +    error ("contain_bdv called with ["^(id_rule r)^",...]");
    1.39  
    1.40  fun rules2scr_Rls calc rules = (*WN100816 t_ -> t_t like "Script Stepwise..*)
    1.41      if contain_bdv rules
    1.42 @@ -461,7 +461,7 @@
    1.43     # generate a script for stepwise execution of the rls
    1.44     # filter the operators for Calc out of the script
    1.45     !!!use this function in ruleset' := !!! .*)
    1.46 -fun prep_rls Erls = raise error "prep_rls not impl. for Erls"
    1.47 +fun prep_rls Erls = error "prep_rls not impl. for Erls"
    1.48    | prep_rls (Rls {id,preconds,rew_ord,erls,srls,calc,rules,...}) = 
    1.49      let val sc = (rules2scr_Rls (!calclist') rules)
    1.50      in Rls {id=id,preconds=preconds,rew_ord=rew_ord,erls=erls,
    1.51 @@ -482,7 +482,7 @@
    1.52  	 rules=rules,
    1.53  	 scr = Script sc} end
    1.54    | prep_rls (Rrls {id,...}) = 
    1.55 -    raise error ("prep_rls not required for Rrls \""^id^"\"");
    1.56 +    error ("prep_rls not required for Rrls \""^id^"\"");
    1.57  (*
    1.58   val Script sc = (#scr o rep_rls o prep_rls) isolate_root;
    1.59   (tracing o term2str) sc;