1.1 --- a/src/HOL/BNF/Tools/bnf_fp_rec_sugar_tactics.ML	Wed Sep 18 20:43:55 2013 +0200
     1.2 +++ b/src/HOL/BNF/Tools/bnf_fp_rec_sugar_tactics.ML	Wed Sep 18 20:44:10 2013 +0200
     1.3 @@ -13,8 +13,10 @@
     1.4    val mk_primcorec_ctr_of_dtr_tac: Proof.context -> int -> thm -> thm -> thm list -> tactic
     1.5    val mk_primcorec_ctr_or_sel_tac: Proof.context -> thm list -> thm -> int -> int ->
     1.6      thm list list list -> thm list -> thm list -> thm list -> tactic
     1.7 +  val mk_primcorec_disc_of_ctr_tac: thm -> thm -> tactic;
     1.8    val mk_primcorec_disc_tac: Proof.context -> thm list -> thm -> int -> int -> thm list list list ->
     1.9      tactic
    1.10 +  val mk_primcorec_sel_of_ctr_tac: thm -> thm -> tactic;
    1.11    val mk_primrec_tac: Proof.context -> int -> thm list -> thm list -> thm list -> thm -> tactic
    1.12  end;
    1.13  
    1.14 @@ -51,23 +53,29 @@
    1.15  fun mk_primcorec_prelude ctxt defs thm =
    1.16    unfold_thms_tac ctxt defs THEN HEADGOAL (rtac thm) THEN unfold_thms_tac ctxt @{thms split};
    1.17  
    1.18 -fun mk_primcorec_disc_tac ctxt defs disc k m exclsss =
    1.19 -  mk_primcorec_prelude ctxt defs disc THEN mk_primcorec_cases_tac ctxt k m exclsss;
    1.20 +fun mk_primcorec_disc_tac ctxt defs disc_corec k m exclsss =
    1.21 +  mk_primcorec_prelude ctxt defs disc_corec THEN mk_primcorec_cases_tac ctxt k m exclsss;
    1.22  
    1.23 -fun mk_primcorec_ctr_or_sel_tac ctxt defs eq_thm k m exclsss maps map_idents map_comps =
    1.24 -  mk_primcorec_prelude ctxt defs (eq_thm RS trans) THEN
    1.25 +fun mk_primcorec_ctr_or_sel_tac ctxt defs f_eq k m exclsss maps map_idents map_comps =
    1.26 +  mk_primcorec_prelude ctxt defs (f_eq RS trans) THEN
    1.27    mk_primcorec_cases_tac ctxt k m exclsss THEN
    1.28    unfold_thms_tac ctxt (@{thms if_if_True if_if_False if_True if_False if_cancel[of _ True]
    1.29      if_cancel[of _ False] o_def split_def sum.cases} @ maps @ map_comps @ map_idents) THEN
    1.30    HEADGOAL (rtac refl);
    1.31  
    1.32 -fun mk_primcorec_ctr_of_dtr_tac ctxt m collapse disc sels =
    1.33 -  HEADGOAL (rtac (collapse RS sym RS trans) THEN' rtac disc THEN' REPEAT_DETERM_N m o atac) THEN
    1.34 -  unfold_thms_tac ctxt sels THEN HEADGOAL (rtac refl);
    1.35 +fun mk_primcorec_ctr_of_dtr_tac ctxt m collapse disc_f sel_fs =
    1.36 +  HEADGOAL (rtac (collapse RS sym RS trans) THEN' rtac disc_f THEN' REPEAT_DETERM_N m o atac) THEN
    1.37 +  unfold_thms_tac ctxt sel_fs THEN HEADGOAL (rtac refl);
    1.38  
    1.39 -fun mk_primcorec_code_of_ctr_case_tac ctxt m ctr_thm =
    1.40 +fun mk_primcorec_disc_of_ctr_tac discI f_ctr =
    1.41 +  HEADGOAL (rtac discI THEN' rtac f_ctr) THEN ALLGOALS atac;
    1.42 +
    1.43 +fun mk_primcorec_sel_of_ctr_tac sel f_ctr =
    1.44 +  HEADGOAL (etac (f_ctr RS arg_cong RS trans) THEN' rtac sel);
    1.45 +
    1.46 +fun mk_primcorec_code_of_ctr_case_tac ctxt m f_ctr =
    1.47    HEADGOAL (REPEAT o rtac @{thm eq_ifI}) THEN
    1.48 -  mk_primcorec_prelude ctxt [] (ctr_thm RS trans) THEN
    1.49 +  mk_primcorec_prelude ctxt [] (f_ctr RS trans) THEN
    1.50    REPEAT_DETERM_N m (mk_primcorec_assumption_tac ctxt) THEN
    1.51    HEADGOAL (asm_simp_tac (ss_only @{thms if_True if_False not_False_eq_True} ctxt));
    1.52