aboutsummaryrefslogtreecommitdiff
path: root/plugins/firstorder
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/firstorder')
-rw-r--r--plugins/firstorder/instances.ml5
-rw-r--r--plugins/firstorder/rules.ml5
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/firstorder/instances.ml b/plugins/firstorder/instances.ml
index 8d580d235b..a45d3075fa 100644
--- a/plugins/firstorder/instances.ml
+++ b/plugins/firstorder/instances.ml
@@ -25,6 +25,7 @@ open Formula
open Sequent
open Names
open Libnames
+open Misctypes
let compare_instance inst1 inst2=
match inst1,inst2 with
@@ -181,12 +182,12 @@ let right_instance_tac inst continue seq=
[tclTHENLIST
[introf;
(fun gls->
- split (Glob_term.ImplicitBindings
+ split (ImplicitBindings
[mkVar (Tacmach.pf_nth_hyp_id gls 1)]) gls);
tclSOLVE [wrap 0 true continue (deepen seq)]];
tclTRY assumption]
| Real ((0,t),_) ->
- (tclTHEN (split (Glob_term.ImplicitBindings [t]))
+ (tclTHEN (split (ImplicitBindings [t]))
(tclSOLVE [wrap 0 true continue (deepen seq)]))
| Real ((m,t),_) ->
tclFAIL 0 (Pp.str "not implemented ... yet")
diff --git a/plugins/firstorder/rules.ml b/plugins/firstorder/rules.ml
index b56fe4e509..a226cc4555 100644
--- a/plugins/firstorder/rules.ml
+++ b/plugins/firstorder/rules.ml
@@ -18,6 +18,7 @@ open Declarations
open Formula
open Sequent
open Libnames
+open Locus
type seqtac= (Sequent.t -> tactic) -> Sequent.t -> tactic
@@ -203,8 +204,8 @@ let ll_forall_tac prod backtrack id continue seq=
let constant str = Coqlib.gen_constant "User" ["Init";"Logic"] str
let defined_connectives=lazy
- [all_occurrences,EvalConstRef (destConst (constant "not"));
- all_occurrences,EvalConstRef (destConst (constant "iff"))]
+ [AllOccurrences,EvalConstRef (destConst (constant "not"));
+ AllOccurrences,EvalConstRef (destConst (constant "iff"))]
let normalize_evaluables=
onAllHypsAndConcl