X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FeliminationTactics.ml;h=17d416ea98405720fbcebb3e1303f2c6501b2394;hb=1a40d93d10be4ee71ae9474384af931d70918690;hp=bb269411ede2ec4749dba9a456d8dbc020a7fc56;hpb=8b55faddb06e3c4b0a13839210bb49170939b33e;p=helm.git diff --git a/helm/ocaml/tactics/eliminationTactics.ml b/helm/ocaml/tactics/eliminationTactics.ml index bb269411e..17d416ea9 100644 --- a/helm/ocaml/tactics/eliminationTactics.ml +++ b/helm/ocaml/tactics/eliminationTactics.ml @@ -30,7 +30,6 @@ module S = ProofEngineStructuralRules module F = FreshNamesGenerator module E = ProofEngineTypes module H = ProofEngineHelpers -module Q = MetadataQuery (* let induction_tac ~term status = @@ -103,16 +102,19 @@ let elim_clear_tac ~mk_fresh_name_callback ~types ~what = (* elim type ****************************************************************) -let elim_type_tac ?(mk_fresh_name_callback = F.mk_fresh_name ~subst:[]) - ?depth ?using what = - let elim what = P.elim_intros_simpl_tac ?using ?depth ~mk_fresh_name_callback what in - let elim_type_tac status = - let tac = T.thens ~start: (P.cut_tac what) - ~continuations:[elim (C.Rel 1); T.id_tac] - in - E.apply_tactic tac status - in - E.mk_tactic elim_type_tac +let elim_type_tac ?(mk_fresh_name_callback = F.mk_fresh_name ~subst:[]) ?depth + ?using what += + let elim what = + P.elim_intros_simpl_tac ?using ?depth ~mk_fresh_name_callback what + in + let elim_type_tac status = + let tac = + T.thens ~start: (P.cut_tac what) ~continuations:[elim (C.Rel 1); T.id_tac] + in + E.apply_tactic tac status + in + E.mk_tactic elim_type_tac (* decompose ****************************************************************) @@ -144,7 +146,7 @@ let decompose_tac ?(mk_fresh_name_callback = F.mk_fresh_name ~subst:[]) let (proof, goal) = status in let _, metasenv,_,_ = proof in let _, context, _ = CicUtil.lookup_meta goal metasenv in - let types = List.rev_append user_types (Q.decomposables dbd) in + let types = List.rev_append user_types (FwdQueries.decomposables dbd) in let tactic = elim_clear_tac ~mk_fresh_name_callback ~types in let old_context_length = List.length context in let tac = T.then_ ~start:(tactic ~what)