diff options
| author | Emilio Jesus Gallego Arias | 2017-11-13 19:03:03 +0100 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2017-11-13 19:03:03 +0100 |
| commit | ed0c434a05a929a659e43aed80ab7c8179a7daa3 (patch) | |
| tree | d486bf54f6bbfd6ace8dc9cea52b959699f88ebe /tactics | |
| parent | c571cdbbcac5cb4b4a5a19ab2f7ac51222316292 (diff) | |
[api] Insert miscellaneous API deprecation back to core.
Diffstat (limited to 'tactics')
| -rw-r--r-- | tactics/eauto.ml | 1 | ||||
| -rw-r--r-- | tactics/elimschemes.mli | 2 | ||||
| -rw-r--r-- | tactics/equality.ml | 4 | ||||
| -rw-r--r-- | tactics/tacticals.mli | 3 | ||||
| -rw-r--r-- | tactics/tactics.ml | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/tactics/eauto.ml b/tactics/eauto.ml index 7eae2541e5..239661498b 100644 --- a/tactics/eauto.ml +++ b/tactics/eauto.ml @@ -16,6 +16,7 @@ open EConstr open Proof_type open Tacticals open Tacmach +open Evd open Tactics open Clenv open Auto diff --git a/tactics/elimschemes.mli b/tactics/elimschemes.mli index 9c750e7ad1..50b052f23b 100644 --- a/tactics/elimschemes.mli +++ b/tactics/elimschemes.mli @@ -16,7 +16,7 @@ val optimize_non_type_induction_scheme : Sorts.family -> 'b -> Names.inductive -> - (Constr.constr * Evd.evar_universe_context) * Safe_typing.private_constants + (Constr.constr * UState.t) * Safe_typing.private_constants val rect_scheme_kind_from_prop : individual scheme_kind val ind_scheme_kind_from_prop : individual scheme_kind diff --git a/tactics/equality.ml b/tactics/equality.ml index 7b2445ff56..c36ad980ef 100644 --- a/tactics/equality.ml +++ b/tactics/equality.ml @@ -1824,9 +1824,9 @@ let subst_all ?(flags=default_subst_tactic_flags) () = (* J.F.: added to prevent failure on goal containing x=x as an hyp *) if EConstr.eq_constr sigma x y then Proofview.tclUNIT () else match EConstr.kind sigma x, EConstr.kind sigma y with - | Var x', _ when not (occur_term sigma x y) && not (is_evaluable env (EvalVarRef x')) -> + | Var x', _ when not (dependent sigma x y) && not (is_evaluable env (EvalVarRef x')) -> subst_one flags.rewrite_dependent_proof x' (hyp,y,true) - | _, Var y' when not (occur_term sigma y x) && not (is_evaluable env (EvalVarRef y')) -> + | _, Var y' when not (dependent sigma y x) && not (is_evaluable env (EvalVarRef y')) -> subst_one flags.rewrite_dependent_proof y' (hyp,x,false) | _ -> Proofview.tclUNIT () diff --git a/tactics/tacticals.mli b/tactics/tacticals.mli index f5c209c74b..169ac5c90d 100644 --- a/tactics/tacticals.mli +++ b/tactics/tacticals.mli @@ -9,7 +9,7 @@ open Names open Constr open EConstr -open Tacmach +open Evd open Proof_type open Locus open Misctypes @@ -23,6 +23,7 @@ val tclORELSE0 : tactic -> tactic -> tactic val tclORELSE : tactic -> tactic -> tactic val tclTHEN : tactic -> tactic -> tactic val tclTHENSEQ : tactic list -> tactic +[@@ocaml.deprecated "alias of API.Tacticals.tclTHENLIST"] val tclTHENLIST : tactic list -> tactic val tclTHEN_i : tactic -> (int -> tactic) -> tactic val tclTHENFIRST : tactic -> tactic -> tactic diff --git a/tactics/tactics.ml b/tactics/tactics.ml index 096274c68d..15c25b3467 100644 --- a/tactics/tactics.ml +++ b/tactics/tactics.ml @@ -1476,7 +1476,7 @@ let general_case_analysis_in_context with_evars clear_flag (c,lbindc) = let sort = Tacticals.New.elimination_sort_of_goal gl in let mind = on_snd (fun u -> EInstance.kind sigma u) mind in let (sigma, elim) = - if occur_term sigma c concl then + if dependent sigma c concl then build_case_analysis_scheme env sigma mind true sort else build_case_analysis_scheme_default env sigma mind sort in |