diff options
| author | Pierre-Marie Pédrot | 2016-06-27 20:47:43 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2016-06-27 20:47:43 +0200 |
| commit | 663a8647bbc32e11243091de80f9953ed5fb7eff (patch) | |
| tree | 7fba0a308daee7586221f752e233dd8fa9c8f5f5 /tactics/eauto.ml | |
| parent | d4725f692a5f202ca4c5d6341b586b0e377f6973 (diff) | |
| parent | a7ea32fbf3829d1ce39ce9cc24b71791727090c5 (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'tactics/eauto.ml')
| -rw-r--r-- | tactics/eauto.ml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tactics/eauto.ml b/tactics/eauto.ml index 2cae9b7946..93c201bf18 100644 --- a/tactics/eauto.ml +++ b/tactics/eauto.ml @@ -108,7 +108,7 @@ open Auto (***************************************************************************) let priority l = List.map snd (List.filter (fun (pr,_) -> Int.equal pr 0) l) - + let unify_e_resolve poly flags (c,clenv) = Proofview.Goal.nf_enter { enter = begin fun gl -> let clenv', c = connect_hint_clenv poly c clenv gl in @@ -128,11 +128,12 @@ let hintmap_of hdc concl = (* FIXME: should be (Hint_db.map_eauto hdc concl db) *) let e_exact poly flags (c,clenv) = - let (c, _, _) = c in - let clenv', subst = - if poly then Clenv.refresh_undefined_univs clenv - else clenv, Univ.empty_level_subst - in e_give_exact (* ~flags *) (Vars.subst_univs_level_constr subst c) + Proofview.Goal.enter { enter = begin fun gl -> + let clenv', c = connect_hint_clenv poly c clenv gl in + Tacticals.New.tclTHEN + (Proofview.Unsafe.tclEVARUNIVCONTEXT (Evd.evar_universe_context clenv'.evd)) + (e_give_exact c) + end } let rec e_trivial_fail_db db_list local_db = let next = Proofview.Goal.nf_enter { enter = begin fun gl -> |
