diff options
| author | Maxime Dénès | 2018-03-09 20:16:08 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2018-03-09 20:16:08 +0100 |
| commit | 1f2a922d52251f79a11d75c2205e6827a07e591b (patch) | |
| tree | 2f8bedc06474b905f22e763a0b1cc66f3d46d9c3 /tactics | |
| parent | 6ba4733a32812e04e831d081737c5665fb12a152 (diff) | |
| parent | 426c9afeb9c85616b89c26aabfe9a6d8cc37c8f0 (diff) | |
Merge PR #6775: Allow using cumulativity without forcing strict constraints.
Diffstat (limited to 'tactics')
| -rw-r--r-- | tactics/tactics.ml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tactics/tactics.ml b/tactics/tactics.ml index 12aef852d0..b111fd1ef8 100644 --- a/tactics/tactics.ml +++ b/tactics/tactics.ml @@ -4824,9 +4824,9 @@ let intros_transitivity n = Tacticals.New.tclTHEN intros (transitivity_gen n) is solved by tac *) (** d1 is the section variable in the global context, d2 in the goal context *) -let interpretable_as_section_decl evd d1 d2 = +let interpretable_as_section_decl env evd d1 d2 = let open Context.Named.Declaration in - let e_eq_constr_univs sigma c1 c2 = match eq_constr_universes !sigma c1 c2 with + let e_eq_constr_univs sigma c1 c2 = match eq_constr_universes env !sigma c1 c2 with | None -> false | Some cstr -> try ignore (Evd.add_universe_constraints !sigma cstr); true @@ -4890,6 +4890,7 @@ let cache_term_by_tactic_then ~opaque ?(goal_type=None) id gk tac tacK = let open Tacmach.New in let open Proofview.Notations in Proofview.Goal.enter begin fun gl -> + let env = Proofview.Goal.env gl in let sigma = Proofview.Goal.sigma gl in let current_sign = Global.named_context_val () and global_sign = Proofview.Goal.hyps gl in @@ -4899,7 +4900,7 @@ let cache_term_by_tactic_then ~opaque ?(goal_type=None) id gk tac tacK = (fun d (s1,s2) -> let id = NamedDecl.get_id d in if mem_named_context_val id current_sign && - interpretable_as_section_decl evdref (lookup_named_val id current_sign) d + interpretable_as_section_decl env evdref (lookup_named_val id current_sign) d then (s1,push_named_context_val d s2) else (Context.Named.add d s1,s2)) global_sign (Context.Named.empty, empty_named_context_val) in |