1.1 --- a/src/Tools/isac/BaseDefinitions/rule-set.sml Wed Apr 15 11:11:54 2020 +0200
1.2 +++ b/src/Tools/isac/BaseDefinitions/rule-set.sml Wed Apr 15 11:37:43 2020 +0200
1.3 @@ -47,7 +47,7 @@
1.4 fun dummy_ord (_: (term * term) list) (_: term, _: term) = true;
1.5 val empty =
1.6 Rule_Def.Repeat {id = "empty", preconds = [], rew_ord = ("dummy_ord", dummy_ord), erls = Rule_Def.Empty,
1.7 - srls = Rule_Def.Empty, calc = [], rules = [], errpatts = [], scr = Rule_Def.EmptyScr}
1.8 + srls = Rule_Def.Empty, calc = [], rules = [], errpatts = [], scr = Rule_Def.Empty_Prog}
1.9 (*\------- this will disappear eventually ----------------------------------------------------/*)
1.10
1.11 val id = Rule.set_id;
1.12 @@ -55,7 +55,7 @@
1.13 | rep (Rule_Def.Repeat {id, preconds, rew_ord, erls, srls, calc, errpatts, rules, scr}) =
1.14 {id = id, preconds = preconds, rew_ord = rew_ord, erls = erls, srls = srls, errpats = errpatts,
1.15 calc = calc, rules = rules, scr = scr}
1.16 - | rep (Rule_Def.Seqence {id, preconds, rew_ord, erls, srls, calc, errpatts, rules, scr}) =
1.17 + | rep (Rule_Def.Sequence {id, preconds, rew_ord, erls, srls, calc, errpatts, rules, scr}) =
1.18 {id = id, preconds = preconds, rew_ord = rew_ord, erls = erls, srls = srls, errpats = errpatts,
1.19 calc = calc, rules = rules, scr = scr}
1.20 | rep (Rule_Def.Rrls _) = rep empty
1.21 @@ -65,9 +65,9 @@
1.22 rules = rs, errpatts = errpatts, scr = sc}) r =
1.23 Rule_Def.Repeat {id = id, preconds = pc, rew_ord = ro, erls = er, srls = sr, calc = ca,
1.24 rules = rs @ r, errpatts = errpatts, scr = sc}
1.25 - | append_rules id (Rule_Def.Seqence {id = _, preconds = pc, rew_ord = ro, erls = er, srls = sr, calc = ca,
1.26 + | append_rules id (Rule_Def.Sequence {id = _, preconds = pc, rew_ord = ro, erls = er, srls = sr, calc = ca,
1.27 rules = rs, errpatts = errpatts, scr = sc}) r =
1.28 - Rule_Def.Seqence {id = id, preconds = pc, rew_ord = ro, erls = er, srls = sr, calc = ca,
1.29 + Rule_Def.Sequence {id = id, preconds = pc, rew_ord = ro, erls = er, srls = sr, calc = ca,
1.30 rules = rs @ r, errpatts = errpatts, scr = sc}
1.31 | append_rules id (Rule_Def.Rrls _) _ = raise ERROR ("append_rules: not for reverse-rewrite-rule-set " ^ id);
1.32
1.33 @@ -97,12 +97,12 @@
1.34 rules = union Rule.equal rs1 rs2,
1.35 errpatts = union (op =) eps1 eps2}
1.36 | merge id
1.37 - (Rule_Def.Seqence {preconds = pc1, rew_ord = ro1, erls = er1, srls = sr1, calc = ca1,
1.38 + (Rule_Def.Sequence {preconds = pc1, rew_ord = ro1, erls = er1, srls = sr1, calc = ca1,
1.39 rules = rs1, errpatts = eps1, scr = sc1, ...})
1.40 - (Rule_Def.Seqence {preconds = pc2, erls = er2, srls = sr2, calc = ca2,
1.41 + (Rule_Def.Sequence {preconds = pc2, erls = er2, srls = sr2, calc = ca2,
1.42 rules = rs2, errpatts = eps2, ...})
1.43 =
1.44 - Rule_Def.Seqence {id = id, rew_ord = ro1, scr = sc1,
1.45 + Rule_Def.Sequence {id = id, rew_ord = ro1, scr = sc1,
1.46 preconds = union (op =) pc1 pc2,
1.47 erls = merge (merge_ids er1 er2) er1 er2,
1.48 srls = merge (merge_ids sr1 sr2) sr1 sr2,
1.49 @@ -110,7 +110,7 @@
1.50 rules = union Rule.equal rs1 rs2,
1.51 errpatts = union (op =) eps1 eps2}
1.52 | merge id _ _ = error ("merge: \"" ^ id ^
1.53 - "\"; not for reverse-rewrite-rule-sets and not for mixed Rls -- Rule_Def.Seqence");
1.54 + "\"; not for reverse-rewrite-rule-sets and not for mixed Rls -- Rule_Def.Sequence");
1.55
1.56 (* datastructure for KEStore_Elems, intermediate for thehier *)
1.57 type for_kestore =
1.58 @@ -137,9 +137,9 @@
1.59 errpatts = eps,
1.60 scr = sc}
1.61 | keep_unique_rules id
1.62 - (Rule_Def.Seqence {id = _, preconds = pc, rew_ord = ro, erls = er, srls = sr, calc = ca,
1.63 + (Rule_Def.Sequence {id = _, preconds = pc, rew_ord = ro, erls = er, srls = sr, calc = ca,
1.64 rules = rs, errpatts = eps, scr = sc}) r =
1.65 - Rule_Def.Seqence {id = id, preconds = pc, rew_ord = ro, erls = er, srls = sr, calc = ca,
1.66 + Rule_Def.Sequence {id = id, preconds = pc, rew_ord = ro, erls = er, srls = sr, calc = ca,
1.67 rules = gen_rems Rule.equal (rs, r),
1.68 errpatts = eps,
1.69 scr = sc}
1.70 @@ -148,7 +148,7 @@
1.71
1.72 fun get_rules Rule_Def.Empty = []
1.73 | get_rules (Rule_Def.Repeat {rules, ...}) = rules
1.74 - | get_rules (Rule_Def.Seqence {rules, ...}) = rules
1.75 + | get_rules (Rule_Def.Sequence {rules, ...}) = rules
1.76 | get_rules (Rule_Def.Rrls _) = [];
1.77
1.78 (*/------- this will disappear eventually -----------\*)