1.1 --- a/src/HOL/Codatatype/Tools/bnf_fp_sugar_tactics.ML	Fri Sep 14 22:23:10 2012 +0200
     1.2 +++ b/src/HOL/Codatatype/Tools/bnf_fp_sugar_tactics.ML	Fri Sep 14 22:23:10 2012 +0200
     1.3 @@ -13,8 +13,8 @@
     1.4    val mk_fld_iff_unf_tac: Proof.context -> ctyp option list -> cterm -> cterm -> thm -> thm ->
     1.5      tactic
     1.6    val mk_half_distinct_tac: Proof.context -> thm -> thm list -> tactic
     1.7 -  val mk_induct_tac: Proof.context -> int list -> int list list -> (int * int) list list list ->
     1.8 -    thm list -> thm -> thm list -> thm list list -> tactic
     1.9 +  val mk_induct_tac: Proof.context -> int list -> int list list ->
    1.10 +    ((int * int) * int) list list list -> thm list -> thm -> thm list -> thm list list -> tactic
    1.11    val mk_inject_tac: Proof.context -> thm -> thm -> tactic
    1.12    val mk_iter_like_tac: thm list -> thm list -> thm list -> thm -> thm -> Proof.context -> tactic
    1.13  end;
    1.14 @@ -112,30 +112,33 @@
    1.15    @{thms fsts_def[abs_def] snds_def[abs_def] sum_setl_def[abs_def] sum_setr_def[abs_def]};
    1.16  
    1.17  (* TODO: Get rid of the "blast_tac" *)
    1.18 -fun mk_induct_discharge_prem_prems_tac ctxt ppis set_natural's pre_set_defs =
    1.19 -  EVERY' (maps (fn (pp, i) =>
    1.20 -    [(* ### select_prem_tac pp (dtac meta_spec) i, *) dtac meta_spec, rotate_tac ~1, etac meta_mp,
    1.21 +fun mk_induct_discharge_prem_prems_tac ctxt nn ppjjkks set_natural's pre_set_defs =
    1.22 +  EVERY' (maps (fn ((pp, jj), kk) =>
    1.23 +    [select_prem_tac nn (dtac meta_spec) (nn - kk + 1), rotate_tac ~1, etac meta_mp,
    1.24       SELECT_GOAL (Local_Defs.unfold_tac ctxt pre_set_defs), (* ### why on a line of its own? *)
    1.25       SELECT_GOAL (Local_Defs.unfold_tac ctxt (set_natural's @ induct_prem_prem_thms)),
    1.26       SELECT_GOAL (Local_Defs.unfold_tac ctxt
    1.27         (induct_prem_prem_thms_delayed @ induct_prem_prem_thms)),
    1.28 -     TRY o rtac (mk_UnIN pp i), (*#####*)
    1.29 +     TRY o rtac (mk_UnIN pp jj), (*#####*)
    1.30       atac ORELSE'
    1.31       rtac @{thm singletonI} ORELSE'
    1.32       (REPEAT_DETERM o (SELECT_GOAL (Local_Defs.unfold_tac ctxt @{thms Union_iff bex_simps(6)}) THEN'
    1.33            etac @{thm induct_set_step}) THEN'
    1.34 -      (atac ORELSE' blast_tac ctxt))]) (rev ppis)) 1;
    1.35 +      (atac ORELSE' blast_tac ctxt))]) (rev ppjjkks)) 1;
    1.36  
    1.37 -fun mk_induct_discharge_prem_tac ctxt n set_natural's pre_set_defs m k ppis =
    1.38 +fun mk_induct_discharge_prem_tac ctxt nn n set_natural's pre_set_defs m k ppjjkks =
    1.39    EVERY [mk_induct_prepare_prem_tac n m k,
    1.40 -    mk_induct_prepare_prem_prems_tac (length ppis), atac 1,
    1.41 -    mk_induct_discharge_prem_prems_tac ctxt ppis set_natural's pre_set_defs];
    1.42 +    mk_induct_prepare_prem_prems_tac (length ppjjkks), atac 1,
    1.43 +    mk_induct_discharge_prem_prems_tac ctxt nn ppjjkks set_natural's pre_set_defs];
    1.44  
    1.45 -fun mk_induct_tac ctxt ns mss ppisss ctr_defs fld_induct' set_natural's pre_set_defss =
    1.46 -  let val n = Integer.sum ns in
    1.47 +fun mk_induct_tac ctxt ns mss ppjjkksss ctr_defs fld_induct' set_natural's pre_set_defss =
    1.48 +  let
    1.49 +    val nn = length ns;
    1.50 +    val n = Integer.sum ns;
    1.51 +  in
    1.52      mk_induct_prelude_tac ctxt ctr_defs fld_induct' THEN
    1.53 -    EVERY (map4 (EVERY oooo map3 o mk_induct_discharge_prem_tac ctxt n set_natural's)
    1.54 -      pre_set_defss mss (unflat mss (1 upto n)) ppisss)
    1.55 +    EVERY (map4 (EVERY oooo map3 o mk_induct_discharge_prem_tac ctxt nn n set_natural's)
    1.56 +      pre_set_defss mss (unflat mss (1 upto n)) ppjjkksss)
    1.57    end;
    1.58  
    1.59  end;