# HG changeset patch # User desharna # Date 1412595225 -7200 # Node ID 62aa83edad7e76c7b02f7a79850d30cce860651e # Parent 97cefa5ef0bed0dd88dc977596c6786bd76d1229 add 'set_sels' to 'fp_sugar' diff -r 97cefa5ef0be -r 62aa83edad7e src/HOL/Tools/BNF/bnf_fp_def_sugar.ML --- 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' diff -r 97cefa5ef0be -r 62aa83edad7e src/HOL/Tools/BNF/bnf_fp_n2m_sugar.ML --- a/src/HOL/Tools/BNF/bnf_fp_n2m_sugar.ML Mon Oct 06 13:33:36 2014 +0200 +++ b/src/HOL/Tools/BNF/bnf_fp_n2m_sugar.ML Mon Oct 06 13:33:45 2014 +0200 @@ -294,7 +294,7 @@ fun mk_target_fp_sugar T X kk pre_bnf absT_info ctrXs_Tss ctr_defs ctr_sugar co_rec co_rec_def map_thms co_inducts co_rec_thms co_rec_disc_thms co_rec_sel_thmss ({fp_bnf_sugar = {map_disc_iffs, map_sels, rel_injects, rel_distincts, rel_sels, - rel_intros, rel_cases, set_thms, ...}, ...} : fp_sugar) = + rel_intros, rel_cases, set_thms, set_sels, ...}, ...} : fp_sugar) = {T = T, BT = T (*wrong but harmless*), X = X, fp = fp, fp_res = fp_res, fp_res_index = kk, pre_bnf = pre_bnf, absT_info = absT_info, fp_nesting_bnfs = fp_nesting_bnfs, live_nesting_bnfs = live_nesting_bnfs, @@ -311,7 +311,8 @@ rel_sels = rel_sels, rel_intros = rel_intros, rel_cases = rel_cases, - set_thms = set_thms}, + set_thms = set_thms, + set_sels = set_sels}, fp_co_induct_sugar = {co_rec = co_rec, common_co_inducts = common_co_inducts, diff -r 97cefa5ef0be -r 62aa83edad7e src/HOL/Tools/BNF/bnf_lfp_basic_sugar.ML --- a/src/HOL/Tools/BNF/bnf_lfp_basic_sugar.ML Mon Oct 06 13:33:36 2014 +0200 +++ b/src/HOL/Tools/BNF/bnf_lfp_basic_sugar.ML Mon Oct 06 13:33:45 2014 +0200 @@ -89,7 +89,8 @@ rel_sels = [], rel_intros = [], rel_cases = [], - set_thms = []}, + set_thms = [], + set_sels = []}, fp_co_induct_sugar = {co_rec = Const (@{const_name case_sum}, map (fn Ts => (Ts ---> C)) ctr_Tss ---> fpT --> C), common_co_inducts = @{thms sum.induct}, @@ -139,7 +140,8 @@ rel_sels = [], rel_intros = [], rel_cases = [], - set_thms = []}, + set_thms = [], + set_sels = []}, fp_co_induct_sugar = {co_rec = Const (@{const_name case_prod}, (ctr_Ts ---> C) --> fpT --> C), common_co_inducts = @{thms prod.induct}, diff -r 97cefa5ef0be -r 62aa83edad7e src/HOL/Tools/BNF/bnf_util.ML --- a/src/HOL/Tools/BNF/bnf_util.ML Mon Oct 06 13:33:36 2014 +0200 +++ b/src/HOL/Tools/BNF/bnf_util.ML Mon Oct 06 13:33:45 2014 +0200 @@ -67,6 +67,8 @@ 'd list * 'e list * 'f list * 'g list * 'h list val split_list9: ('a * 'b * 'c * 'd * 'e * 'f * 'g * 'h * 'i) list -> 'a list * 'b list * 'c list * 'd list * 'e list * 'f list * 'g list * 'h list * 'i list + val split_list10: ('a * 'b * 'c * 'd * 'e * 'f * 'g * 'h * 'i * 'j) list -> 'a list * 'b list * + 'c list * 'd list * 'e list * 'f list * 'g list * 'h list * 'i list * 'j list val mk_TFreess: int list -> Proof.context -> typ list list * Proof.context val mk_Freesss: string -> typ list list list -> Proof.context -> @@ -323,6 +325,12 @@ in (x1 :: xs1, x2 :: xs2, x3 :: xs3, x4 :: xs4, x5 :: xs5, x6 :: xs6, x7 :: xs7, x8 :: xs8, x9 :: xs9) end; +fun split_list10 [] = ([], [], [], [], [], [], [], [], [], []) + | split_list10 ((x1, x2, x3, x4, x5, x6, x7, x8, x9, x10) :: xs) = + let val (xs1, xs2, xs3, xs4, xs5, xs6, xs7, xs8, xs9, xs10) = split_list10 xs; + in (x1 :: xs1, x2 :: xs2, x3 :: xs3, x4 :: xs4, x5 :: xs5, x6 :: xs6, x7 :: xs7, x8 :: xs8, + x9 :: xs9, x10 :: xs10) end; + val parse_type_arg_constrained = Parse.type_ident -- Scan.option (@{keyword "::"} |-- Parse.!!! Parse.sort);