1.1 --- a/src/Tools/isac/BaseDefinitions/rule-set.sml	Tue Apr 28 19:39:06 2020 +0200
     1.2 +++ b/src/Tools/isac/BaseDefinitions/rule-set.sml	Wed Apr 29 09:03:01 2020 +0200
     1.3 @@ -96,7 +96,7 @@
     1.4  	    preconds = union (op =) pc1 pc2,	    
     1.5  	    erls = merge (merge_ids er1 er2) er1 er2,
     1.6  	    srls = merge (merge_ids sr1 sr2) sr1 sr2,
     1.7 -	    calc = union Exec_Def.calc_eq ca1 ca2,
     1.8 +	    calc = union Eval_Def.calc_eq ca1 ca2,
     1.9  		  rules = union Rule.equal rs1 rs2,
    1.10        errpatts = union (op =) eps1 eps2}
    1.11    | merge id
    1.12 @@ -109,7 +109,7 @@
    1.13  	    preconds = union (op =) pc1 pc2,	    
    1.14  	    erls = merge (merge_ids er1 er2) er1 er2,
    1.15  	    srls = merge (merge_ids sr1 sr2) sr1 sr2,
    1.16 -	    calc = union Exec_Def.calc_eq ca1 ca2,
    1.17 +	    calc = union Eval_Def.calc_eq ca1 ca2,
    1.18  		  rules = union Rule.equal rs1 rs2,
    1.19        errpatts = union (op =) eps1 eps2}
    1.20    | merge id _ _ = error ("merge: \"" ^ id ^