add 'rel_co_inducts' to 'fp_sugar'
authordesharna
Mon, 06 Oct 2014 13:36:42 +0200
changeset 58575 629891fd8c51
parent 58574 e66ed9634a74
child 58576 1f4a2d8142fe
add 'rel_co_inducts' to 'fp_sugar'
src/HOL/Tools/BNF/bnf_fp_def_sugar.ML
src/HOL/Tools/BNF/bnf_fp_n2m_sugar.ML
src/HOL/Tools/BNF/bnf_lfp_basic_sugar.ML
--- a/src/HOL/Tools/BNF/bnf_fp_def_sugar.ML	Mon Oct 06 13:35:29 2014 +0200
+++ b/src/HOL/Tools/BNF/bnf_fp_def_sugar.ML	Mon Oct 06 13:36:42 2014 +0200
@@ -41,7 +41,8 @@
      co_rec_selss: thm list list,
      co_rec_codes: thm list,
      co_rec_transfers: thm list,
-     common_rel_co_inducts: thm list}
+     common_rel_co_inducts: thm list,
+     rel_co_inducts: thm list}
 
   type fp_sugar =
     {T: typ,
@@ -209,7 +210,8 @@
    co_rec_selss: thm list list,
    co_rec_codes: thm list,
    co_rec_transfers: thm list,
-   common_rel_co_inducts: thm list};
+   common_rel_co_inducts: thm list,
+   rel_co_inducts: thm list};
 
 type fp_sugar =
   {T: typ,
@@ -243,7 +245,7 @@
 
 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_disc_iffs, co_rec_selss, co_rec_codes, co_rec_transfers,
-    common_rel_co_inducts} : fp_co_induct_sugar) =
+    common_rel_co_inducts, rel_co_inducts} : fp_co_induct_sugar) =
   {co_rec = Morphism.term phi co_rec,
    common_co_inducts = map (Morphism.thm phi) common_co_inducts,
    co_inducts = map (Morphism.thm phi) co_inducts,
@@ -254,7 +256,8 @@
    co_rec_selss = map (map (Morphism.thm phi)) co_rec_selss,
    co_rec_codes = map (Morphism.thm phi) co_rec_codes,
    co_rec_transfers = map (Morphism.thm phi) co_rec_transfers,
-   common_rel_co_inducts = map (Morphism.thm phi) common_rel_co_inducts};
+   common_rel_co_inducts = map (Morphism.thm phi) common_rel_co_inducts,
+   rel_co_inducts = map (Morphism.thm phi) rel_co_inducts};
 
 fun morph_fp_ctr_sugar phi ({ctrXs_Tss, ctr_defs, ctr_sugar, ctr_transfers, case_transfers,
     disc_transfers} : fp_ctr_sugar) =
@@ -334,7 +337,7 @@
     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 set_selss
     set_intross set_casess ctr_transferss case_transferss disc_transferss co_rec_disc_iffss
-    co_rec_codess co_rec_transferss common_rel_co_inducts noted =
+    co_rec_codess co_rec_transferss common_rel_co_inducts rel_co_inductss noted =
   let
     val fp_sugars =
       map_index (fn (kk, T) =>
@@ -372,7 +375,8 @@
             co_rec_selss = nth co_rec_selsss kk,
             co_rec_codes = nth co_rec_codess kk,
             co_rec_transfers = nth co_rec_transferss kk,
-            common_rel_co_inducts = common_rel_co_inducts}}
+            common_rel_co_inducts = common_rel_co_inducts,
+            rel_co_inducts = nth rel_co_inductss kk}}
         |> morph_fp_sugar (substitute_noted_thm noted)) Ts;
   in
     register_fp_sugars_raw fp_sugars
@@ -2220,7 +2224,7 @@
           (replicate nn []) rel_injectss rel_distinctss map_disc_iffss map_selss rel_selss
           rel_intross rel_casess set_thmss set_selss set_intross set_casess ctr_transferss
           case_transferss disc_transferss (replicate nn []) (replicate nn []) rec_transfer_thmss
-          common_rel_induct_thms
+          common_rel_induct_thms rel_induct_thmss
       end;
 
     fun derive_corec_transfer_thms lthy corecs corec_defs =
@@ -2339,7 +2343,7 @@
           corec_sel_thmsss rel_injectss rel_distinctss map_disc_iffss map_selss rel_selss
           rel_intross rel_casess set_thmss set_selss set_intross set_casess ctr_transferss
           case_transferss disc_transferss corec_disc_iff_thmss (map single corec_code_thms)
-          corec_transfer_thmss common_rel_coinduct_thms
+          corec_transfer_thmss common_rel_coinduct_thms rel_coinduct_thmss
       end;
 
     val lthy'' = lthy'
--- a/src/HOL/Tools/BNF/bnf_fp_n2m_sugar.ML	Mon Oct 06 13:35:29 2014 +0200
+++ b/src/HOL/Tools/BNF/bnf_fp_n2m_sugar.ML	Mon Oct 06 13:36:42 2014 +0200
@@ -297,7 +297,7 @@
               fp_bnf_sugar = {map_disc_iffs, map_sels, rel_injects, rel_distincts, rel_sels,
                 rel_intros, rel_cases, set_thms, set_sels, set_intros, set_cases, ...},
               fp_co_induct_sugar = {co_rec_disc_iffs, co_rec_codes, co_rec_transfers,
-                common_rel_co_inducts, ...},
+                common_rel_co_inducts, rel_co_inducts, ...},
               ...} : 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,
@@ -333,7 +333,8 @@
               co_rec_selss = co_rec_sel_thmss,
               co_rec_codes = co_rec_codes,
               co_rec_transfers = co_rec_transfers,
-              common_rel_co_inducts = common_rel_co_inducts}}
+              common_rel_co_inducts = common_rel_co_inducts,
+              rel_co_inducts = rel_co_inducts}}
           |> morph_fp_sugar phi;
 
         val target_fp_sugars =
--- a/src/HOL/Tools/BNF/bnf_lfp_basic_sugar.ML	Mon Oct 06 13:35:29 2014 +0200
+++ b/src/HOL/Tools/BNF/bnf_lfp_basic_sugar.ML	Mon Oct 06 13:36:42 2014 +0200
@@ -107,7 +107,8 @@
         co_rec_selss = [],
         co_rec_codes = [],
         co_rec_transfers = [],
-        common_rel_co_inducts = []}}
+        common_rel_co_inducts = [],
+        rel_co_inducts = []}}
   end;
 
 fun fp_sugar_of_prod ctxt =
@@ -167,7 +168,8 @@
         co_rec_selss = [],
         co_rec_codes = [],
         co_rec_transfers = [],
-        common_rel_co_inducts = []}}
+        common_rel_co_inducts = [],
+        rel_co_inducts = []}}
   end;
 
 val _ = Theory.setup (map_local_theory (fn lthy =>