aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChantal Keller <Chantal.Keller@lri.fr>2016-04-26 17:02:12 +0200
committerChantal Keller <Chantal.Keller@lri.fr>2016-04-26 17:02:12 +0200
commitdc6e8ccbc2f2596d832db44a322703575e0146c7 (patch)
treeb68a45b537c7d8b7d1e4d5d61105535e6b261359 /src
parent9f9699c8134ed0ded42aad64e00cfb9f0a60c914 (diff)
downloadsmtcoq-dc6e8ccbc2f2596d832db44a322703575e0146c7.tar.gz
smtcoq-dc6e8ccbc2f2596d832db44a322703575e0146c7.zip
Make the tactic available for 8.5
Diffstat (limited to 'src')
-rw-r--r--src/trace/smt_tactic.ml416
-rw-r--r--src/versions/native/structures.ml2
-rw-r--r--src/versions/standard/structures.ml2
-rw-r--r--src/zchaff/zchaff.ml2
4 files changed, 13 insertions, 9 deletions
diff --git a/src/trace/smt_tactic.ml4 b/src/trace/smt_tactic.ml4
index efac23b..c3cae79 100644
--- a/src/trace/smt_tactic.ml4
+++ b/src/trace/smt_tactic.ml4
@@ -15,9 +15,9 @@
(* Uncomment for 8.5 *)
-(* DECLARE PLUGIN "SMTCoq_plugin" *)
+(* DECLARE PLUGIN "trace/smt_tactic" *)
-VERNAC COMMAND EXTEND Parse_certif_zchaff
+VERNAC COMMAND EXTEND Vernac_zchaff
| [ "Parse_certif_zchaff"
ident(dimacs) ident(trace) string(fdimacs) string(fproof) ] ->
[
@@ -33,7 +33,7 @@ VERNAC COMMAND EXTEND Parse_certif_zchaff
]
END
-VERNAC COMMAND EXTEND Parse_certif_verit
+VERNAC COMMAND EXTEND Vernac_verit
| [ "Parse_certif_verit"
ident(t_i) ident(t_func) ident(t_atom) ident(t_form) ident(root) ident(used_roots) ident(trace) string(fsmt) string(fproof) ] ->
[
@@ -49,11 +49,11 @@ VERNAC COMMAND EXTEND Parse_certif_verit
]
END
-(* Comment for 8.5 *)
-TACTIC EXTEND zchaff
-| [ "zchaff" ] -> [ Zchaff.tactic ]
+
+TACTIC EXTEND Tactic_zchaff
+| [ "zchaff" ] -> [ Structures.mk_tactic Zchaff.tactic ]
END
-TACTIC EXTEND verit
-| [ "verit" ] -> [ Verit.tactic ]
+TACTIC EXTEND Tactic_verit
+| [ "verit" ] -> [ Structures.mk_tactic Verit.tactic ]
END
diff --git a/src/versions/native/structures.ml b/src/versions/native/structures.ml
index 28ad7e2..62907d1 100644
--- a/src/versions/native/structures.ml
+++ b/src/versions/native/structures.ml
@@ -70,3 +70,5 @@ let vernacentries_interp expr =
let pr_constr_env = Printer.pr_constr_env
let lift = Term.lift
+
+let mk_tactic t = t
diff --git a/src/versions/standard/structures.ml b/src/versions/standard/structures.ml
index 08451c9..93546b3 100644
--- a/src/versions/standard/structures.ml
+++ b/src/versions/standard/structures.ml
@@ -100,3 +100,5 @@ let vernacentries_interp expr =
let pr_constr_env env = Printer.pr_constr_env env Evd.empty
let lift = Vars.lift
+
+let mk_tactic = Proofview.V82.tactic
diff --git a/src/zchaff/zchaff.ml b/src/zchaff/zchaff.ml
index d0737eb..9cde196 100644
--- a/src/zchaff/zchaff.ml
+++ b/src/zchaff/zchaff.ml
@@ -390,7 +390,7 @@ let get_arguments concl =
match args with
| [ty;a;b] when f = Lazy.force ceq && ty = Lazy.force cbool -> a, b
| [a] when f = Lazy.force cis_true -> a, Lazy.force ctrue
- | _ -> failwith ("Zchaff.tactic :can only deal with equality over bool")
+ | _ -> failwith ("Zchaff.get_arguments :can only deal with equality over bool")
(* Check that the result is Unsat, otherwise raise a model *)