--- a/src/HOL/Tools/BNF/bnf_fp_def_sugar.ML Mon Oct 06 13:33:36 2014 +0200
+++ b/src/HOL/Tools/BNF/bnf_fp_def_sugar.ML Mon Oct 06 13:33:45 2014 +0200
@@ -22,7 +22,8 @@
rel_sels: thm list,
rel_intros: thm list,
rel_cases: thm list,
- set_thms: thm list}
+ set_thms: thm list,
+ set_sels: thm list}
type fp_co_induct_sugar =
{co_rec: term,
@@ -180,7 +181,8 @@
rel_sels: thm list,
rel_intros: thm list,
rel_cases: thm list,
- set_thms: thm list};
+ set_thms: thm list,
+ set_sels: thm list};
type fp_co_induct_sugar =
{co_rec: term,
@@ -207,7 +209,7 @@
fp_co_induct_sugar: fp_co_induct_sugar};
fun morph_fp_bnf_sugar phi ({map_thms, map_disc_iffs, map_sels, rel_injects, rel_distincts,
- rel_sels, rel_intros, rel_cases, set_thms} : fp_bnf_sugar) =
+ rel_sels, rel_intros, rel_cases, set_thms, set_sels} : fp_bnf_sugar) =
{map_thms = map (Morphism.thm phi) map_thms,
map_disc_iffs = map (Morphism.thm phi) map_disc_iffs,
map_sels = map (Morphism.thm phi) map_sels,
@@ -216,7 +218,8 @@
rel_sels = map (Morphism.thm phi) rel_sels,
rel_intros = map (Morphism.thm phi) rel_intros,
rel_cases = map (Morphism.thm phi) rel_cases,
- set_thms = map (Morphism.thm phi) set_thms};
+ set_thms = map (Morphism.thm phi) set_thms,
+ set_sels = map (Morphism.thm phi) set_sels};
fun morph_fp_co_induct_sugar phi ({co_rec, common_co_inducts, co_inducts, co_rec_def, co_rec_thms,
co_rec_discs, co_rec_selss} : fp_co_induct_sugar) =
@@ -300,7 +303,8 @@
fun interpret_bnfs_register_fp_sugars plugins Ts BTs Xs fp pre_bnfs absT_infos fp_nesting_bnfs
live_nesting_bnfs fp_res ctrXs_Tsss ctr_defss ctr_sugars co_recs co_rec_defs map_thmss
common_co_inducts co_inductss co_rec_thmss co_rec_discss co_rec_selsss rel_injectss
- rel_distinctss map_disc_iffss map_selss rel_selss rel_intross rel_casess set_thmss noted =
+ rel_distinctss map_disc_iffss map_selss rel_selss rel_intross rel_casess set_thmss set_selss
+ noted =
let
val fp_sugars =
map_index (fn (kk, T) =>
@@ -320,7 +324,8 @@
rel_sels = nth rel_selss kk,
rel_intros = nth rel_intross kk,
rel_cases = nth rel_casess kk,
- set_thms = nth set_thmss kk},
+ set_thms = nth set_thmss kk,
+ set_sels = nth set_selss kk},
fp_co_induct_sugar =
{co_rec = nth co_recs kk,
common_co_inducts = common_co_inducts,
@@ -480,7 +485,7 @@
distincts, distinct_discsss, ...} : ctr_sugar)
lthy =
if live = 0 then
- (([], [], [], [], [], [], [], [], []), lthy)
+ (([], [], [], [], [], [], [], [], [], []), lthy)
else
let
val n = length ctr_Tss;
@@ -968,7 +973,8 @@
map subst rel_sel_thms,
map subst rel_intro_thms,
[subst rel_cases_thm],
- map subst set_thms), lthy')
+ map subst set_thms,
+ map subst set_sel_thms), lthy')
end;
type lfp_sugar_thms = (thm list * thm * Token.src list) * (thm list list * Token.src list);
@@ -2072,7 +2078,7 @@
fun wrap_ctrs_derive_map_set_rel_thms_define_co_rec_for_types (wrap_one_etc, lthy) =
fold_map I wrap_one_etc lthy
- |>> apsnd split_list o apfst (apsnd split_list4 o apfst split_list9 o split_list)
+ |>> apsnd split_list o apfst (apsnd split_list4 o apfst split_list10 o split_list)
o split_list;
fun mk_simp_thms ({injects, distincts, case_thms, ...} : ctr_sugar) co_recs map_thms rel_injects
@@ -2107,7 +2113,7 @@
fun derive_note_induct_recs_thms_for_types
((((map_thmss, map_disc_iffss, map_selss, rel_injectss, rel_distinctss, rel_selss,
- rel_intross, rel_casess, set_thmss),
+ rel_intross, rel_casess, set_thmss, set_selss),
(ctrss, _, ctr_defss, ctr_sugars)),
(recs, rec_defs)), lthy) =
let
@@ -2167,7 +2173,7 @@
fp_nesting_bnfs live_nesting_bnfs fp_res ctrXs_Tsss ctr_defss ctr_sugars recs rec_defs
map_thmss [induct_thm] (map single induct_thms) rec_thmss (replicate nn [])
(replicate nn []) rel_injectss rel_distinctss map_disc_iffss map_selss rel_selss
- rel_intross rel_casess set_thmss
+ rel_intross rel_casess set_thmss set_selss
end;
fun derive_corec_transfer_thms lthy corecs corec_defs =
@@ -2187,7 +2193,7 @@
fun derive_note_coinduct_corecs_thms_for_types
((((map_thmss, map_disc_iffss, map_selss, rel_injectss, rel_distinctss, rel_selss,
- rel_intross, rel_casess, set_thmss),
+ rel_intross, rel_casess, set_thmss, set_selss),
(_, _, ctr_defss, ctr_sugars)),
(corecs, corec_defs)), lthy) =
let
@@ -2283,7 +2289,7 @@
map_thmss [coinduct_thm, coinduct_strong_thm]
(transpose [coinduct_thms, coinduct_strong_thms]) corec_thmss corec_disc_thmss
corec_sel_thmsss rel_injectss rel_distinctss map_disc_iffss map_selss rel_selss
- rel_intross rel_casess set_thmss
+ rel_intross rel_casess set_thmss set_selss
end;
val lthy'' = lthy'