aboutsummaryrefslogtreecommitdiffstats
path: root/src/versions/native
diff options
context:
space:
mode:
Diffstat (limited to 'src/versions/native')
-rw-r--r--src/versions/native/Make48
-rw-r--r--src/versions/native/Makefile56
-rw-r--r--src/versions/native/Structures_native.v20
-rw-r--r--src/versions/native/smtcoq_plugin_native.ml442
-rw-r--r--src/versions/native/structures.ml18
-rw-r--r--src/versions/native/structures.mli23
6 files changed, 180 insertions, 27 deletions
diff --git a/src/versions/native/Make b/src/versions/native/Make
index 69cbbfb..63c95b2 100644
--- a/src/versions/native/Make
+++ b/src/versions/native/Make
@@ -17,14 +17,18 @@
## change CMXSFILES into CMXS and add the same block for CMXA and VCMXS. ##
## 4) Change the "install" target: change CMOFILES into CMXFILES. ##
## 5) Add to the "clean" target: ##
-## - rm -f NSMTCoq* cnf/NSMTCoq* euf/NSMTCoq* lia/NSMTCoq* spl/NSMTCoq* ../unit-tests/NSMTCoq* ../unit-tests/*.vo ../unit-tests/*.zlog ../unit-tests/*.vtlog verit/veritParser.mli verit/veritParser.ml verit/veritLexer.ml smtlib2/smtlib2_parse.mli smtlib2/smtlib2_parse.ml smtlib2/smtlib2_lex.ml ##
+## - rm -f NSMTCoq* cnf/NSMTCoq* euf/NSMTCoq* lia/NSMTCoq* spl/NSMTCoq* ../unit-tests/NSMTCoq* ../unit-tests/*.vo ../unit-tests/*.zlog ../unit-tests/*.vtlog verit/veritParser.mli verit/veritParser.ml verit/veritLexer.ml smtlib2/smtlib2_parse.mli smtlib2/smtlib2_parse.ml smtlib2/smtlib2_lex.ml smtlib2/sExprParser.mli smtlib2/sExprParser.ml smtlib2/sExprLexer.ml lfsc/lfscLexer.ml lfsc/lfscParser.ml lfsc/lfscParser.mli trace/smtcoq.a ##
########################################################################
-R . SMTCoq
+-I bva
+-I classes
+-I array
-I cnf
-I euf
+-I lfsc
-I lia
-I smtlib2
-I trace
@@ -32,15 +36,17 @@
-I zchaff
-I versions/native
+
-custom "cd ../unit-tests; make" "" "test"
-custom "cd ../unit-tests; make zchaff" "" "ztest"
-custom "cd ../unit-tests; make verit" "" "vtest"
+-custom "cd ../unit-tests; make lfsc" "" "lfsctest"
-custom "$(CAMLLEX) $<" "%.mll" "%.ml"
-custom "$(CAMLYACC) $<" "%.mly" "%.ml %.mli"
--custom "" "verit/veritParser.ml verit/veritLexer.ml smtlib2/smtlib2_parse.ml smtlib2/smtlib2_lex.ml" "ml"
+-custom "" "verit/veritParser.ml verit/veritLexer.ml smtlib2/smtlib2_parse.ml smtlib2/smtlib2_lex.ml smtlib2/sExprParser.ml smtlib2/sExprLexer.ml lfsc/lfscParser.ml lfsc/lfscLexer.ml" "ml"
--custom "$(CAMLOPTLINK) $(ZFLAGS) -a -o $@ $^" "versions/native/structures.cmx trace/smtMisc.cmx trace/coqTerms.cmx trace/smtBtype.cmx trace/smtForm.cmx trace/smtCertif.cmx trace/smtTrace.cmx trace/smtCnf.cmx trace/satAtom.cmx trace/smtAtom.cmx zchaff/satParser.cmx zchaff/zchaffParser.cmx zchaff/cnfParser.cmx zchaff/zchaff.cmx smtlib2/smtlib2_util.cmx smtlib2/smtlib2_ast.cmx smtlib2/smtlib2_parse.cmx smtlib2/smtlib2_lex.cmx lia/lia.cmx verit/veritSyntax.cmx verit/veritParser.cmx verit/veritLexer.cmx smtlib2/smtlib2_genConstr.cmx trace/smtCommands.cmx verit/verit.cmx smtcoq_plugin.cmx" "$(CMXA)"
+-custom "$(CAMLOPTLINK) $(ZFLAGS) -a -o $@ $^" "versions/native/structures.cmx trace/smtMisc.cmx trace/coqTerms.cmx trace/smtBtype.cmx trace/smtForm.cmx trace/smtCertif.cmx trace/smtTrace.cmx trace/smtCnf.cmx trace/satAtom.cmx trace/smtAtom.cmx zchaff/satParser.cmx zchaff/zchaffParser.cmx zchaff/cnfParser.cmx zchaff/zchaff.cmx smtlib2/smtlib2_util.cmx smtlib2/smtlib2_ast.cmx smtlib2/smtlib2_parse.cmx smtlib2/smtlib2_lex.cmx smtlib2/sExpr.cmx smtlib2/sExprParser.cmx smtlib2/sExprLexer.cmx smtlib2/smtlib2_solver.cmx lia/lia.cmx verit/veritSyntax.cmx verit/veritParser.cmx verit/veritLexer.cmx lfsc/shashcons.cmx lfsc/hstring.cmx lfsc/type.cmx lfsc/ast.cmx lfsc/builtin.cmx lfsc/tosmtcoq.cmx lfsc/converter.cmx lfsc/lfscParser.cmx lfsc/lfscLexer.cmx smtlib2/smtlib2_genConstr.cmx trace/smtCommands.cmx verit/verit.cmx lfsc/lfsc.cmx smtcoq_plugin.cmx" "$(CMXA)"
-custom "$(CAMLOPTLINK) $(ZFLAGS) -o $@ -linkall -shared $^" "$(CMXA)" "$(CMXS)"
CMXA = smtcoq.cmxa
@@ -49,6 +55,15 @@ VCMXS = "versions/native/NSMTCoq_versions_native_Structures.cmxs NSMTCoq_State.c
CAMLLEX = $(CAMLBIN)ocamllex
CAMLYACC = $(CAMLBIN)ocamlyacc
+bva/BVList.v
+bva/Bva_checker.v
+
+classes/SMT_classes.v
+classes/SMT_classes_instances.v
+
+array/FArray.v
+array/Array_checker.v
+
versions/native/Structures.v
versions/native/structures.ml
versions/native/structures.mli
@@ -84,6 +99,13 @@ smtlib2/smtlib2_genConstr.ml
smtlib2/smtlib2_genConstr.mli
smtlib2/smtlib2_util.ml
smtlib2/smtlib2_util.mli
+smtlib2/sExprParser.ml
+smtlib2/sExprParser.mli
+smtlib2/sExprLexer.ml
+smtlib2/sExpr.ml
+smtlib2/sExpr.mli
+smtlib2/smtlib2_solver.ml
+smtlib2/smtlib2_solver.mli
verit/veritParser.ml
verit/veritParser.mli
@@ -94,6 +116,22 @@ verit/verit.mli
verit/veritSyntax.ml
verit/veritSyntax.mli
+lfsc/shashcons.mli
+lfsc/shashcons.ml
+lfsc/hstring.mli
+lfsc/hstring.ml
+lfsc/lfscParser.ml
+lfsc/lfscLexer.ml
+lfsc/type.ml
+lfsc/ast.ml
+lfsc/ast.mli
+lfsc/translator_sig.mli
+lfsc/builtin.ml
+lfsc/tosmtcoq.ml
+lfsc/tosmtcoq.mli
+lfsc/converter.ml
+lfsc/lfsc.ml
+
zchaff/cnfParser.ml
zchaff/cnfParser.mli
zchaff/satParser.ml
@@ -119,6 +157,10 @@ spl/Operators.v
Conversion_tactics.v
Misc.v
SMTCoq.v
+ReflectFacts.v
+PropToBool.v
+BoolToProp.v
+Tactics.v
SMT_terms.v
State.v
Trace.v
diff --git a/src/versions/native/Makefile b/src/versions/native/Makefile
index 61c8c01..afc5523 100644
--- a/src/versions/native/Makefile
+++ b/src/versions/native/Makefile
@@ -45,16 +45,24 @@ OCAMLLIBS?=-I versions/native\
-I trace\
-I smtlib2\
-I lia\
+ -I lfsc\
-I euf\
- -I cnf
+ -I cnf\
+ -I array\
+ -I classes\
+ -I bva
COQLIBS?=-I versions/native\
-I zchaff\
-I verit\
-I trace\
-I smtlib2\
-I lia\
+ -I lfsc\
-I euf\
- -I cnf -R . SMTCoq
+ -I cnf\
+ -I array\
+ -I classes\
+ -I bva -R . SMTCoq
COQDOCLIBS?=-R . SMTCoq
##########################
@@ -137,6 +145,10 @@ endif
VFILES:=Trace.v\
State.v\
SMT_terms.v\
+ Tactics.v\
+ BoolToProp.v\
+ PropToBool.v\
+ ReflectFacts.v\
SMTCoq.v\
Misc.v\
Conversion_tactics.v\
@@ -147,7 +159,13 @@ VFILES:=Trace.v\
lia/Lia.v\
euf/Euf.v\
cnf/Cnf.v\
- versions/native/Structures.v
+ versions/native/Structures.v\
+ array/Array_checker.v\
+ array/FArray.v\
+ classes/SMT_classes_instances.v\
+ classes/SMT_classes.v\
+ bva/Bva_checker.v\
+ bva/BVList.v
-include $(addsuffix .d,$(VFILES))
.SECONDARY: $(addsuffix .d,$(VFILES))
@@ -170,10 +188,24 @@ MLFILES:=lia/lia.ml\
zchaff/zchaff.ml\
zchaff/satParser.ml\
zchaff/cnfParser.ml\
+ lfsc/lfsc.ml\
+ lfsc/converter.ml\
+ lfsc/tosmtcoq.ml\
+ lfsc/builtin.ml\
+ lfsc/ast.ml\
+ lfsc/type.ml\
+ lfsc/lfscLexer.ml\
+ lfsc/lfscParser.ml\
+ lfsc/hstring.ml\
+ lfsc/shashcons.ml\
verit/veritSyntax.ml\
verit/verit.ml\
verit/veritLexer.ml\
verit/veritParser.ml\
+ smtlib2/smtlib2_solver.ml\
+ smtlib2/sExpr.ml\
+ smtlib2/sExprLexer.ml\
+ smtlib2/sExprParser.ml\
smtlib2/smtlib2_util.ml\
smtlib2/smtlib2_genConstr.ml\
smtlib2/smtlib2_ast.ml\
@@ -199,10 +231,18 @@ MLIFILES:=lia/lia.mli\
zchaff/zchaff.mli\
zchaff/satParser.mli\
zchaff/cnfParser.mli\
+ lfsc/tosmtcoq.mli\
+ lfsc/translator_sig.mli\
+ lfsc/ast.mli\
+ lfsc/hstring.mli\
+ lfsc/shashcons.mli\
verit/veritSyntax.mli\
verit/verit.mli\
verit/veritLexer.mli\
verit/veritParser.mli\
+ smtlib2/smtlib2_solver.mli\
+ smtlib2/sExpr.mli\
+ smtlib2/sExprParser.mli\
smtlib2/smtlib2_util.mli\
smtlib2/smtlib2_genConstr.mli\
smtlib2/smtlib2_ast.mli\
@@ -287,10 +327,10 @@ beautify: $(VFILES:=.beautified)
$(CMXS): $(CMXA)
$(CAMLOPTLINK) $(ZFLAGS) -o $@ -linkall -shared $^
-$(CMXA): versions/native/structures.cmx trace/smtMisc.cmx trace/coqTerms.cmx trace/smtBtype.cmx trace/smtForm.cmx trace/smtCertif.cmx trace/smtTrace.cmx trace/smtCnf.cmx trace/satAtom.cmx trace/smtAtom.cmx zchaff/satParser.cmx zchaff/zchaffParser.cmx zchaff/cnfParser.cmx zchaff/zchaff.cmx smtlib2/smtlib2_util.cmx smtlib2/smtlib2_ast.cmx smtlib2/smtlib2_parse.cmx smtlib2/smtlib2_lex.cmx lia/lia.cmx verit/veritSyntax.cmx verit/veritParser.cmx verit/veritLexer.cmx smtlib2/smtlib2_genConstr.cmx trace/smtCommands.cmx verit/verit.cmx smtcoq_plugin.cmx
+$(CMXA): versions/native/structures.cmx trace/smtMisc.cmx trace/coqTerms.cmx trace/smtBtype.cmx trace/smtForm.cmx trace/smtCertif.cmx trace/smtTrace.cmx trace/smtCnf.cmx trace/satAtom.cmx trace/smtAtom.cmx zchaff/satParser.cmx zchaff/zchaffParser.cmx zchaff/cnfParser.cmx zchaff/zchaff.cmx smtlib2/smtlib2_util.cmx smtlib2/smtlib2_ast.cmx smtlib2/smtlib2_parse.cmx smtlib2/smtlib2_lex.cmx smtlib2/sExpr.cmx smtlib2/sExprParser.cmx smtlib2/sExprLexer.cmx smtlib2/smtlib2_solver.cmx lia/lia.cmx verit/veritSyntax.cmx verit/veritParser.cmx verit/veritLexer.cmx lfsc/shashcons.cmx lfsc/hstring.cmx lfsc/type.cmx lfsc/ast.cmx lfsc/builtin.cmx lfsc/tosmtcoq.cmx lfsc/converter.cmx lfsc/lfscParser.cmx lfsc/lfscLexer.cmx smtlib2/smtlib2_genConstr.cmx trace/smtCommands.cmx verit/verit.cmx lfsc/lfsc.cmx smtcoq_plugin.cmx
$(CAMLOPTLINK) $(ZFLAGS) -a -o $@ $^
-ml: verit/veritParser.ml verit/veritLexer.ml smtlib2/smtlib2_parse.ml smtlib2/smtlib2_lex.ml
+ml: verit/veritParser.ml verit/veritLexer.ml smtlib2/smtlib2_parse.ml smtlib2/smtlib2_lex.ml smtlib2/sExprParser.ml smtlib2/sExprLexer.ml lfsc/lfscParser.ml lfsc/lfscLexer.ml
%.ml %.mli: %.mly
@@ -299,6 +339,9 @@ ml: verit/veritParser.ml verit/veritLexer.ml smtlib2/smtlib2_parse.ml smtlib2/sm
%.ml: %.mll
$(CAMLLEX) $<
+lfsctest:
+ cd ../unit-tests; make lfsc
+
vtest:
cd ../unit-tests; make verit
@@ -374,10 +417,11 @@ clean:
- rm -rf $(CMXS)
- rm -rf $(CMXA)
- rm -rf ml
+ - rm -rf lfsctest
- rm -rf vtest
- rm -rf ztest
- rm -rf test
- - rm -f NSMTCoq* cnf/NSMTCoq* euf/NSMTCoq* lia/NSMTCoq* spl/NSMTCoq* ../unit-tests/NSMTCoq* ../unit-tests/*.vo ../unit-tests/*.zlog ../unit-tests/*.vtlog verit/veritParser.mli verit/veritParser.ml verit/veritLexer.ml smtlib2/smtlib2_parse.mli smtlib2/smtlib2_parse.ml smtlib2/smtlib2_lex.ml
+ - rm -f NSMTCoq* cnf/NSMTCoq* euf/NSMTCoq* lia/NSMTCoq* spl/NSMTCoq* ../unit-tests/NSMTCoq* ../unit-tests/*.vo ../unit-tests/*.zlog ../unit-tests/*.vtlog verit/veritParser.mli verit/veritParser.ml verit/veritLexer.ml smtlib2/smtlib2_parse.mli smtlib2/smtlib2_parse.ml smtlib2/smtlib2_lex.ml smtlib2/sExprParser.mli smtlib2/sExprParser.ml smtlib2/sExprLexer.ml lfsc/lfscLexer.ml lfsc/lfscParser.ml lfsc/lfscParser.mli trace/smtcoq.a
archclean:
rm -f *.cmx *.o
diff --git a/src/versions/native/Structures_native.v b/src/versions/native/Structures_native.v
index 950d7bd..856883b 100644
--- a/src/versions/native/Structures_native.v
+++ b/src/versions/native/Structures_native.v
@@ -1,3 +1,15 @@
+(**************************************************************************)
+(* *)
+(* SMTCoq *)
+(* Copyright (C) 2011 - 2019 *)
+(* *)
+(* See file "AUTHORS" for the list of authors *)
+(* *)
+(* This file is distributed under the terms of the CeCILL-C licence *)
+(* *)
+(**************************************************************************)
+
+
Require Import PArray.
@@ -6,6 +18,9 @@ Section Trace.
(* We use [array array step] to allow bigger trace *)
Definition trace (step:Type) := array (array step).
+ Definition trace_to_list {step:Type} (t:trace step) : list step :=
+ PArray.fold_left (fun res a => List.app res (PArray.to_list a)) nil t.
+
Definition trace_length {step:Type} (t:trace step) : int :=
PArray.fold_left (fun l a => (l + (length a))%int63) 0%int63 t.
@@ -37,3 +52,8 @@ Section Trace.
Admitted.
End Trace.
+
+
+Definition nat_eqb := beq_nat.
+Definition nat_eqb_eq := beq_nat_true_iff.
+Definition nat_eqb_refl := NPeano.Nat.eqb_refl.
diff --git a/src/versions/native/smtcoq_plugin_native.ml4 b/src/versions/native/smtcoq_plugin_native.ml4
index f3c571c..d6954b5 100644
--- a/src/versions/native/smtcoq_plugin_native.ml4
+++ b/src/versions/native/smtcoq_plugin_native.ml4
@@ -1,13 +1,9 @@
(**************************************************************************)
(* *)
(* SMTCoq *)
-(* Copyright (C) 2011 - 2016 *)
+(* Copyright (C) 2011 - 2019 *)
(* *)
-(* Michaël Armand *)
-(* Benjamin Grégoire *)
-(* Chantal Keller *)
-(* *)
-(* Inria - École Polytechnique - Université Paris-Sud *)
+(* See file "AUTHORS" for the list of authors *)
(* *)
(* This file is distributed under the terms of the CeCILL-C licence *)
(* *)
@@ -47,15 +43,39 @@ VERNAC COMMAND EXTEND Vernac_verit
[
Verit.checker fsmt fproof
]
+| [ "Verit_Checker_Debug" string(fsmt) string(fproof) ] ->
+ [
+ Verit.checker_debug fsmt fproof
+ ]
| [ "Verit_Theorem" ident(name) string(fsmt) string(fproof) ] ->
[
Verit.theorem name fsmt fproof
]
END
+VERNAC COMMAND EXTEND Vernac_lfsc
+| [ "Parse_certif_lfsc"
+ ident(t_i) ident(t_func) ident(t_atom) ident(t_form) ident(root) ident(used_roots) ident(trace) string(fsmt) string(fproof) ] ->
+ [
+ Lfsc.parse_certif t_i t_func t_atom t_form root used_roots trace fsmt fproof
+ ]
+| [ "Lfsc_Checker" string(fsmt) string(fproof) ] ->
+ [
+ Lfsc.checker fsmt fproof
+ ]
+| [ "Lfsc_Checker_Debug" string(fsmt) string(fproof) ] ->
+ [
+ Lfsc.checker_debug fsmt fproof
+ ]
+| [ "Lfsc_Theorem" ident(name) string(fsmt) string(fproof) ] ->
+ [
+ Lfsc.theorem name fsmt fproof
+ ]
+END
TACTIC EXTEND Tactic_zchaff
-| [ "zchaff" ] -> [ Zchaff.tactic () ]
+| [ "zchaff_bool" ] -> [ Zchaff.tactic () ]
+| [ "zchaff_bool_no_check" ] -> [ Zchaff.tactic_no_check () ]
END
let lemmas_list = ref []
@@ -67,5 +87,11 @@ END
TACTIC EXTEND Tactic_verit
-| [ "verit_base" constr_list(lpl) ] -> [ Verit.tactic lpl !lemmas_list ]
+| [ "verit_bool_base" constr_list(lpl) ] -> [ Verit.tactic lpl !lemmas_list ]
+| [ "verit_bool_no_check_base" constr_list(lpl) ] -> [ Verit.tactic_no_check lpl !lemmas_list ]
+END
+
+TACTIC EXTEND Tactic_cvc4
+| [ "cvc4_bool" ] -> [ Lfsc.tactic () ]
+| [ "cvc4_bool_no_check" ] -> [ Lfsc.tactic_no_check () ]
END
diff --git a/src/versions/native/structures.ml b/src/versions/native/structures.ml
index 06ca01c..c286f56 100644
--- a/src/versions/native/structures.ml
+++ b/src/versions/native/structures.ml
@@ -1,13 +1,9 @@
(**************************************************************************)
(* *)
(* SMTCoq *)
-(* Copyright (C) 2011 - 2016 *)
+(* Copyright (C) 2011 - 2019 *)
(* *)
-(* Michaël Armand *)
-(* Benjamin Grégoire *)
-(* Chantal Keller *)
-(* *)
-(* Inria - École Polytechnique - Université Paris-Sud *)
+(* See file "AUTHORS" for the list of authors *)
(* *)
(* This file is distributed under the terms of the CeCILL-C licence *)
(* *)
@@ -112,11 +108,11 @@ let destruct_rel_decl (n, _, t) = n, t
let interp_constr env sigma = Constrintern.interp_constr sigma env
-type constr_expr = Topconstr.constr_expr
-
let tclTHEN = Tacticals.tclTHEN
let tclTHENLAST = Tacticals.tclTHENLAST
let assert_before = Tactics.assert_tac
+
+let vm_conv = Reduction.vm_conv
let vm_cast_no_check = Tactics.vm_cast_no_check
let mk_tactic tac gl =
let env = Tacmach.pf_env gl in
@@ -130,6 +126,8 @@ let constrextern_extern_constr =
let env = Global.env () in
Constrextern.extern_constr false env
+let get_rel_dec_name = fun _ -> Names.Anonymous
+
(* Old packaging of plugins *)
module Micromega_plugin_Certificate = Certificate
@@ -138,5 +136,7 @@ module Micromega_plugin_Micromega = Micromega
module Micromega_plugin_Mutils = Mutils
-(* Type of coq tactics *)
+(* Types in the Coq source code *)
type tactic = Proof_type.tactic
+type names_id = Names.identifier
+type constr_expr = Topconstr.constr_expr
diff --git a/src/versions/native/structures.mli b/src/versions/native/structures.mli
index 7c5edfd..b4d9731 100644
--- a/src/versions/native/structures.mli
+++ b/src/versions/native/structures.mli
@@ -1,3 +1,15 @@
+(**************************************************************************)
+(* *)
+(* SMTCoq *)
+(* Copyright (C) 2011 - 2019 *)
+(* *)
+(* See file "AUTHORS" for the list of authors *)
+(* *)
+(* This file is distributed under the terms of the CeCILL-C licence *)
+(* *)
+(**************************************************************************)
+
+
val gen_constant : string list list -> string -> Term.constr lazy_t
val int63_modules : string list list
val mkInt : int -> Term.constr
@@ -25,10 +37,10 @@ val pr_constr_env : Environ.env -> Term.constr -> Pp.std_ppcmds
val lift : int -> Term.constr -> Term.constr
val destruct_rel_decl : Term.rel_declaration -> Names.name * Term.constr
val interp_constr : Environ.env -> Evd.evar_map -> Topconstr.constr_expr -> Term.constr
-type constr_expr = Topconstr.constr_expr
val tclTHEN : Proof_type.tactic -> Proof_type.tactic -> Proof_type.tactic
val tclTHENLAST : Proof_type.tactic -> Proof_type.tactic -> Proof_type.tactic
val assert_before : Names.name -> Term.types -> Proof_type.tactic
+val vm_conv : Reduction.conv_pb -> Term.types Reduction.conversion_function
val vm_cast_no_check : Term.constr -> Proof_type.tactic
val mk_tactic :
(Environ.env ->
@@ -37,8 +49,17 @@ val mk_tactic :
val set_evars_tac : 'a -> Proof_type.tactic
val ppconstr_lsimpleconstr : Ppconstr.precedence
val constrextern_extern_constr : Term.constr -> Topconstr.constr_expr
+val get_rel_dec_name : 'a -> Names.name
+
+
+(* Old packaging of plugins *)
module Micromega_plugin_Certificate = Certificate
module Micromega_plugin_Coq_micromega = Coq_micromega
module Micromega_plugin_Micromega = Micromega
module Micromega_plugin_Mutils = Mutils
+
+
+(* Types in the Coq source code *)
type tactic = Proof_type.tactic
+type names_id = Names.identifier
+type constr_expr = Topconstr.constr_expr
generated by cgit (git 2.34.1) at 2024-07-01 10:53:06 +0000