1.1 --- a/src/Tools/isac/calcelems.sml	Fri Jun 13 09:55:49 2014 +0200
     1.2 +++ b/src/Tools/isac/calcelems.sml	Fri Jun 13 10:29:06 2014 +0200
     1.3 @@ -164,11 +164,11 @@
     1.4      {id : string,          (*for trace_rewrite:=true                 *)
     1.5       preconds : term list, (*unused WN020820                         *)
     1.6       (*WN060616 for efficiency...
     1.7 -      bdvs    : false,       (*set in prep_rls for get_bdvs *)*)
     1.8 +      bdvs    : false,       (*set in prep_rls' for get_bdvs *)*)
     1.9       rew_ord  : rew_ord,   (*for rules*)
    1.10       erls     : rls,       (*for the conditions in rules             *)
    1.11       srls     : rls,       (*for evaluation of list_fns in script    *)
    1.12 -     calc     : calc list, (*for Calculate in scr, set by prep_rls   *)
    1.13 +     calc     : calc list, (*for Calculate in scr, set by prep_rls'   *)
    1.14       rules    : rule list,
    1.15       errpatts : errpatID list,(*dialog-authoring in Build_Thydata.thy*)
    1.16       scr      : scr}       (*Prog term: generating intermed.steps  *)
    1.17 @@ -176,11 +176,11 @@
    1.18      {id : string,          (*for trace_rewrite:=true                 *)
    1.19       preconds : term list, (*unused 20.8.02                          *)
    1.20       (*WN060616 for efficiency...
    1.21 -      bdvs    : false,       (*set in prep_rls for get_bdvs *)*)
    1.22 +      bdvs    : false,       (*set in prep_rls' for get_bdvs *)*)
    1.23       rew_ord  : rew_ord,   (*for rules                               *)
    1.24       erls     : rls,       (*for the conditions in rules             *)
    1.25       srls     : rls,       (*for evaluation of list_fns in script    *)
    1.26 -     calc     : calc list, (*for Calculate in scr, set by prep_rls   *)
    1.27 +     calc     : calc list, (*for Calculate in scr, set by prep_rls'   *)
    1.28       rules    : rule list,
    1.29       errpatts : errpatID list,(*dialog-authoring in Build_Thydata.thy*)
    1.30       scr      : scr}  (*Prog term  (how to restrict type ???)*)
    1.31 @@ -199,7 +199,7 @@
    1.32  		   list,               (* meta-conjunction is or                          *)
    1.33       rew_ord  : rew_ord,   (* for rules                                       *)
    1.34       erls     : rls,       (* for the conditions in rules and preconds        *)
    1.35 -     calc     : calc list, (* for Calculate in scr, set automatic.in prep_rls *)
    1.36 +     calc     : calc list, (* for Calculate in scr, set automatic.in prep_rls' *)
    1.37       errpatts : errpatID list,(*dialog-authoring in Build_Thydata.thy*)
    1.38       scr      : scr};      (* Rfuns {...}  (how to restrict type ???)         *)
    1.39