aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr>2016-12-17 18:36:59 +0100
committerGravatar Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr>2017-02-14 17:30:44 +0100
commit594ac9654164e377e8598894019cc4445509d570 (patch)
tree6cf5851ab6cfcd8c7b9b6d5c4fe0e68cdff1c540
parent3c1cd2338fcddc4a6c0e97b0af53eb2b2f238c4a (diff)
Removing a subtle nf_enter in Class_tactics.
The underlying hint mode implementation was not using the evar-insensitive API so that it resulted in strange bugs.
-rw-r--r--tactics/class_tactics.ml2
-rw-r--r--tactics/hints.ml4
2 files changed, 3 insertions, 3 deletions
diff --git a/tactics/class_tactics.ml b/tactics/class_tactics.ml
index 8ada9e6a7..8bbef39ad 100644
--- a/tactics/class_tactics.ml
+++ b/tactics/class_tactics.ml
@@ -1180,7 +1180,7 @@ module Search = struct
let search_tac ?(st=full_transparent_state) only_classes dep hints depth =
let open Proofview in
let tac sigma gls i =
- Goal.nf_enter
+ Goal.enter
{ enter = fun gl ->
search_tac_gl ~st only_classes dep hints depth (succ i) sigma gls gl }
in
diff --git a/tactics/hints.ml b/tactics/hints.ml
index 17c81064d..5aacafd6f 100644
--- a/tactics/hints.ml
+++ b/tactics/hints.ml
@@ -524,8 +524,8 @@ struct
match m with
| ModeInput -> not (occur_existential sigma arg)
| ModeNoHeadEvar ->
- Evarutil.(try ignore(head_evar sigma arg); false
- with NoHeadEvar -> true)
+ (try ignore(head_evar sigma arg); false
+ with Evarutil.NoHeadEvar -> true)
| ModeOutput -> true
let matches_mode sigma args mode =