diff options
| author | Hugo Herbelin | 2014-10-01 20:16:18 +0200 |
|---|---|---|
| committer | Hugo Herbelin | 2014-10-01 20:17:49 +0200 |
| commit | d1c71b1f3b11e2eb29a5898610d6128b7d535337 (patch) | |
| tree | a0e662edaa5c8c0d17feef652876b2a2166288f2 | |
| parent | 785f82ee1ecd9a4500ce3e8f3f42946b8205c065 (diff) | |
Made Tacsubst independent of Auto at linking time so that Tacenv does
not draw Auto.
| -rw-r--r-- | tactics/auto.ml | 4 | ||||
| -rw-r--r-- | tactics/auto.mli | 3 | ||||
| -rw-r--r-- | tactics/tacsubst.ml | 2 | ||||
| -rw-r--r-- | tactics/tactics.mllib | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/tactics/auto.ml b/tactics/auto.ml index a3ce586cff..e06c2b7e00 100644 --- a/tactics/auto.ml +++ b/tactics/auto.ml @@ -769,8 +769,6 @@ let cache_autohint (_,(local,name,hints)) = | AddCut path -> add_cut name path | AddMode (l, m) -> add_mode name l m -let (forward_subst_tactic, extern_subst_tactic) = Hook.make () - let subst_autohint (subst,(local,name,hintlist as obj)) = let subst_key gr = let (lab'', elab') = subst_global subst gr in @@ -803,7 +801,7 @@ let subst_autohint (subst,(local,name,hintlist as obj)) = let ref' = subst_evaluable_reference subst ref in if ref==ref' then data.code else Unfold_nth ref' | Extern tac -> - let tac' = Hook.get forward_subst_tactic subst tac in + let tac' = Tacsubst.subst_tactic subst tac in if tac==tac' then data.code else Extern tac' in let name' = subst_path_atom subst data.name in diff --git a/tactics/auto.mli b/tactics/auto.mli index 5fde1d2de1..26dcee8ccc 100644 --- a/tactics/auto.mli +++ b/tactics/auto.mli @@ -203,9 +203,6 @@ val extern_interp : val extern_intern_tac : (patvar list -> Tacexpr.raw_tactic_expr -> Tacexpr.glob_tactic_expr) Hook.t -val extern_subst_tactic : - (substitution -> Tacexpr.glob_tactic_expr -> Tacexpr.glob_tactic_expr) Hook.t - (** Create a Hint database from the pairs (name, constr). Useful to take the current goal hypotheses as hints; Boolean tells if lemmas with evars are allowed *) diff --git a/tactics/tacsubst.ml b/tactics/tacsubst.ml index 27d0d7e0fd..c66ff74180 100644 --- a/tactics/tacsubst.ml +++ b/tactics/tacsubst.ml @@ -358,5 +358,3 @@ let () = Genintern.register_subst0 wit_sort (fun _ v -> v); Genintern.register_subst0 wit_clause_dft_concl (fun _ v -> v); Genintern.register_subst0 wit_uconstr (fun subst c -> subst_glob_constr subst c) - -let _ = Hook.set Auto.extern_subst_tactic subst_tactic diff --git a/tactics/tactics.mllib b/tactics/tactics.mllib index 69836a6548..e2c0f40fb9 100644 --- a/tactics/tactics.mllib +++ b/tactics/tactics.mllib @@ -10,7 +10,6 @@ Eqschemes Elimschemes Tactics Elim -Auto Equality Contradiction Inv @@ -18,6 +17,7 @@ Leminv Tacsubst Taccoerce Tacenv +Auto Tacintern TacticMatching Tacinterp |