Merge from LFSC (#26)

* Showing models as coq counter examples in tactic without constructing coq terms

* also read models when calling cvc4 with a file (deactivated because cvc4 crashes)

* Show counter examples with variables in the order they are quantified in the Coq goal

* Circumvent issue with ocamldep

* fix issue with dependencies

* fix issue with dependencies

* Translation and OCaml support for extract, zero_extend, sign_extend

* Show run times of components

* print time on stdout instead

* Tests now work with new version (master) of CVC4

* fix small printing issue

* look for date on mac os x

* proof of valid_check_bbShl: some cases to prove.

* full proof of "left shift checker".

*  full proof of "rigth shift checker".

* Support translation of terms bvlshr, bvshl but LFSC rules do not exists at the moment
Bug fix for bitvector extract (inverted arguments)

* Typo

* More modularity on the format of traces depending on the version of coq

* More straightforward definitions in Int63Native_standard

* Use the Int31 library with coq-8.5

* Use the most efficient operations of Int31

* Improved performance with coq-8.5

* Uniform treatment of sat and smt tactics

* Hopefully solved the problem with universes for the tactic

* Updated the installation instructions

* Holes for unsupported bit blasting rules

* Cherry-picking from smtcoq/smtcoq

* bug fix hole for bitblast

* Predefined arrays are not required anymore

* fix issue with coq bbT and bitof construction from ocaml

* bug fix in smtAtom for uninterpreted functions
fix verit test file

* fix issue with smtlib2 extract parsing

* It looks like we still need the PArray function instances for some examples (see vmcai_bytes.smt2)

* Solver specific reification:
Each solver has a list of supported theories which is passed to Atom.of_coq, this function creates uninterpreted functions / sorts for unsupported features.

* show counter-examples with const_farray instead of const for constant array definitions

* Vernacular commands to debug checkers.
Verit/Lfsc_Checker_Debug will always fail, reporting the first proof step of the certificate that failed be checked

* Update INSTALL.md

* show smtcoq proof when converting

* (Hopefully) repared the universes problems

* Corrected a bug with holes in proofs

* scripts for tests:
create a folder "work" under "lfsc/tests/", locate the benchmarks there.
create a folder "results" under "lfsc/tests/work/" in which you'll find the results of ./cvc4tocoq.

* make sure to give correct path for your benchs...

* Checker for array extensionality modulo symmetry of equality

* fix oversight with bitvectors larger than 63 bits

* some printing functions for smt2 ast

* handle smtlib2 files with more complicated equivalence with (= ... )

* revert: ./cvc4tocoq does not output lfsc proofs...

* bug fix one input was ignored

* Don't show verit translation of LFSC proof if environment variable DONTSHOWVERIT is set
(e.g. put export DONTSHOWVERIT="" in your .bashrc or .bashprofile)

* Also sort names of introduced variables when showing counter-example

* input files for which SMTCoq retuns false.

* input files for which SMTCoq retuns false.

* use debug checker for debug file

* More efficient debug checker

* better approximate number of failing step of certificate in debug checker

* fix mistake in ml4

* very first attempt to support goals in Prop

* bvs: comparison predicates in Prop and their <-> proofs with the ones in bool
farrays: equality predicate in Prop and its <-> proof with the one in bool.

* unit, Bool, Z, Pos: comparison and equality predicates in Prop.

* a typo fixed.

* an example of array equality in  Prop (converted into Bool by hand)...
TODO: enhance the search space of cvc4 tactic.

* first version of cvc4' tactic: "solves" the goals in Prop.
WARNING: supports only bv and array goals and might not be complete
TODO: add support for lia goals

* cvc4' support for lia
WARNING: might not be complete!

* small fix in cvc4' and some variations of examples

* small fix + support for goals in Bool and Bool = true + use of solve tactical
WARNING: does not support UF and INT63 goals in Prop

* cvc4': better arrangement

* cvc4': Prop2Bool by context search...

* cvc4': solve tactial added -> do not modify unsolved goals.

* developer documentation for the smtcoq repo

* cvc4': rudimentary support for uninterpreted function goals in Prop.

* cvc4': support for goals with Leibniz equality...
WARNING: necessary use of "Grab Existential Variables." to instantiate variable types for farrays!

* cvc4': Z.lt adapted + better support from verit...

* cvc4': support for Z.le, Z.ge, Z.gt.

* Try arrays with default value (with a constructor for constant arrays), but extensionality is not provable

* cvc4': support for equality over uninterpreted types

* lfsc demo: goals in Coq's Prop.

* lfsc demo: goals in Bool.

* Fix issue with existential variables generated by prop2bool.
- prop2bool tactic exported by SMTCoq
- remove useless stuff

* update usage and installation instructions

* Update INSTALL.md

* highlighting

* the tactic: bool2prop.

* clean up

* the tactic smt: very first version.

* smt: return unsolved goals in Prop.

* Show when a certificate cannot be checked when running the tactic instead of at Qed

* Tactic improvements
- Handle negation/True/False in prop/bool conversions tactic.
- Remove alias for farray (this caused problem for matching on this type in tactics).
- Tactic `smt` that combines cvc4 and veriT.
- return subgoals in prop

* test change header

* smt: support for negated goals + some reorganization.

* conflicts resolved + some reorganization.

* a way to solve the issue with ambiguous coercions.

* reorganization.

* small change.

* another small change.

* developer documentation of the tactics.

* developer guide: some improvements.

* developer guide: some more improvements.

* developer guide: some more improvements.

* developer guide: some more improvements.

* pass correct environment for conversion + better error messages

* cleaning

* ReflectFacts added.

* re-organizing developers' guide.

* re-organizing developers' guide.

* re-organizing developers' guide.

* removing unused maps.

* headers.

* artifact readme getting started...

* first attempt

* second...

* third...

* 4th...

* 5th...

* 6th...

* 7th...

* 8th...

* 9th...

* 10th...

* 11th...

* 12th...

* 13th...

* 14th...

* 15th...

* 16th...

* 17th...

* Update artifact.md

Use links to lfsc repository like in the paper

* 18th...

* 19th...

* 20th...

* 21st...

* 22nd...

* 23rd...

* 24th...

* 25th...

* 26th...

* 27th...

* 28th...

* Update artifact.md

Small reorganization

* minor edits

* More minor edits

* revised description of tactics

* Final pass

* typo

* name changed: artifact-readme.md

* file added...

* passwd chaged...

* links...

* removal

* performance statement...

* typos...

* the link to the artifact image updated...

* suggestions by Guy...

* aux files removed...

* clean-up...

* clean-up...

* some small changes...

* small fix...

* additional information on newly created files after running cvc4tocoq script...

* some small fix...

* another small fix...

* typo...

* small fix...

* another small fix...

* fix...

* link to the artifact image...

* We do not want to force vm_cast for the Theorem commands

* no_check variants of the tactics

* TODO: a veriT test does not work anymore

* Compiles with both versions of Coq

* Test of the tactics in real conditions

* Comment on this case study

* an example for the FroCoS paper.

* Fix smt tactic that doesn't return cvc4's subgoals

* readme modifications

* readme modifications 2

* small typo in readme.

* small changes in readme.

* small changes in readme.

* typo in readme.

* Sync with https://github.com/LFSC/smtcoq

* Port to Coq 8.6

* README

* README

* INSTALL

* Missing file

* Yves' proposition for installation instructions

* Updated link to CVC4

* Compiles again with native-coq

* Compiles with both versions of Coq

* Command to bypass typechecking when generating a zchaff theorem

* Solved bug on cuts from Hole

* Counter-models for uninterpreted sorts (improves issue #13)

* OCaml version note (#15)

* update .gitignore

* needs OCaml 4.04.0

* Solving merge issues (under progress)

* Make SmtBtype compile

* Compilation of SmtForm under progress

* Make SmtForm compile

* Make SmtCertif compile

* Make SmtTrace compile

* Make SatAtom compile

* Make smtAtom compile

* Make CnfParser compile

* Make Zchaff compile

* Make VeritSyntax compile

* Make VeritParser compile

* Make lfsc/tosmtcoq compile

* Make smtlib2_genconstr compile

* smtCommand under progress

* smtCommands and verit compile again

* lfsc compiles

* ml4 compiles

* Everything compiles

* All ZChaff unit tests and most verit unit tests (but taut5 and un_menteur) go through

* Most LFSC tests ok; some fail due to the problem of verit; a few fail due to an error "Not_found" to investigate

* Authors and headings

* Compiles with native-coq

* Typo

1 files changed, 96 insertions, 52 deletions

diff --git a/src/trace/smtAtom.mli b/src/trace/smtAtom.mli
index 47734fb..a542ad6 100644
--- a/src/trace/smtAtom.mli
+++ b/src/trace/smtAtom.mli
@@ -1,34 +1,38 @@
 (**************************************************************************)
 (*                                                                        *)
 (*     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     *)
 (*                                                                        *)
 (**************************************************************************)
 
+
 open SmtBtype
 
 (** Operators *)
 
-type cop = 
+type cop =
    | CO_xH
    | CO_Z0
+   | CO_BV of bool list
 
 type uop =
    | UO_xO
    | UO_xI
-   | UO_Zpos 
+   | UO_Zpos
    | UO_Zneg
    | UO_Zopp
-
-type bop = 
+   | UO_BVbitOf of int * int
+   | UO_BVnot of int
+   | UO_BVneg of int
+   | UO_BVextr of int * int * int
+   | UO_BVzextn of int * int
+   | UO_BVsextn of int * int
+
+type bop =
    | BO_Zplus
    | BO_Zminus
    | BO_Zmult
@@ -37,21 +41,37 @@ type bop =
    | BO_Zge
    | BO_Zgt
    | BO_eq of btype
+   | BO_BVand of int
+   | BO_BVor of int
+   | BO_BVxor of int
+   | BO_BVadd of int
+   | BO_BVmult of int
+   | BO_BVult of int
+   | BO_BVslt of int
+   | BO_BVconcat of int * int
+   | BO_BVshl of int
+   | BO_BVshr of int
+   | BO_select of btype * btype
+   | BO_diffarray of btype * btype
+
+type top =
+   | TO_store of btype * btype
 
 type nop =
   | NO_distinct of btype
 
-type indexed_op
-
 type index = Index of int
            | Rel_name of string
 
+type indexed_op
+
 val dummy_indexed_op: index -> btype array -> btype -> indexed_op
 val indexed_op_index : indexed_op -> int
+val debruijn_indexed_op : int -> btype -> indexed_op
 
 module Op :
   sig
-	  
+
     type reify_tbl
 
     val create : unit -> reify_tbl
@@ -61,93 +81,117 @@ module Op :
 
     val of_coq : reify_tbl -> Term.constr -> indexed_op
 
-    val interp_tbl : Term.constr -> 
-      (btype array -> btype -> Term.constr -> Term.constr) -> 
-      reify_tbl -> Term.constr 
+    val interp_tbl : Term.constr ->
+      (btype array -> btype -> Term.constr -> Term.constr) ->
+      reify_tbl -> Term.constr
 
     val to_list : reify_tbl -> (int * (btype array) * btype * indexed_op) list
 
+    val logic_ro : reify_tbl -> SmtMisc.logic
+
   end
 
 
 (** Definition of atoms *)
 
-type hatom 
+type hatom
 
-type atom = 
+type atom =
   | Acop of cop
-  | Auop of uop * hatom 
-  | Abop of bop * hatom * hatom 
+  | Auop of uop * hatom
+  | Abop of bop * hatom * hatom
+  | Atop of top * hatom * hatom * hatom
   | Anop of nop * hatom array
   | Aapp of indexed_op * hatom array
 
 
 
-module Atom : 
-    sig 
+module Atom :
+    sig
 
       type t = hatom
 
-      val equal : hatom -> hatom -> bool
+      val equal : t -> t -> bool
 
-      val index : hatom -> int
+      val index : t -> int
 
-      val atom : hatom -> atom
- 
-      val type_of : hatom -> btype
+      val atom : t -> atom
+
+      val type_of : t -> btype
 
-      val to_string : ?pi:bool -> hatom -> string
-                               
       val to_smt : Format.formatter -> t -> unit
 
       exception NotWellTyped of atom
 
-      type reify_tbl 
+      type reify_tbl
 
       val create : unit -> reify_tbl
 
       val clear : reify_tbl -> unit
 
-      val get : ?declare:bool -> reify_tbl -> atom -> hatom
+      val get : ?declare:bool -> reify_tbl -> atom -> t
 
-      val mk_eq : reify_tbl -> bool -> btype -> hatom -> hatom -> hatom
+      val mk_neg : reify_tbl -> t -> t
 
-      val mk_neg : reify_tbl -> hatom -> hatom
-                                                                    
-      val hash_hatom : reify_tbl -> hatom -> hatom
+      val hash_hatom : reify_tbl -> t -> t
 
       (** for debugging purposes **)
 
       val copy : reify_tbl -> reify_tbl
-                                                        
+
       val print_atoms : reify_tbl -> string -> unit
-                                       
+
       (** Given a coq term, build the corresponding atom *)
       val of_coq : ?hash:bool -> SmtBtype.reify_tbl -> Op.reify_tbl ->
-        reify_tbl -> Environ.env -> Evd.evar_map -> Term.constr -> t
+        reify_tbl -> SmtMisc.logic -> Environ.env -> Evd.evar_map -> Term.constr -> t
+
+      val get_coq_term_op : int -> Term.constr
 
-      val to_coq : hatom -> Term.constr
+      val to_coq : t -> Term.constr
 
       val to_array : reify_tbl -> 'a -> (atom -> 'a) -> 'a array
 
       val interp_tbl : reify_tbl -> Term.constr
 
-      val interp_to_coq : (int, Term.constr) Hashtbl.t ->
+      val interp_to_coq : Term.constr -> (int, Term.constr) Hashtbl.t ->
 	t -> Term.constr
 
+      val logic : t -> SmtMisc.logic
+
       (* Generation of atoms *)
-      val hatom_Z_of_int : reify_tbl -> int -> hatom
-      val hatom_Z_of_bigint : reify_tbl -> Big_int.big_int -> hatom
-
-      val mk_lt : reify_tbl -> bool -> hatom -> hatom -> hatom
-      val mk_le : reify_tbl -> bool -> hatom -> hatom -> hatom
-      val mk_gt : reify_tbl -> bool -> hatom -> hatom -> hatom
-      val mk_ge : reify_tbl -> bool -> hatom -> hatom -> hatom
-      val mk_plus : reify_tbl -> bool -> hatom -> hatom -> hatom
-      val mk_minus : reify_tbl -> bool -> hatom -> hatom -> hatom
-      val mk_mult : reify_tbl -> bool -> hatom -> hatom -> hatom
-      val mk_opp : reify_tbl -> ?declare:bool -> hatom -> hatom
-      val mk_distinct : reify_tbl -> btype -> ?declare:bool -> hatom array -> hatom
+      val hatom_Z_of_int : reify_tbl -> int -> t
+      val hatom_Z_of_bigint : reify_tbl -> Big_int.big_int -> t
+      val mk_eq : reify_tbl -> ?declare:bool -> btype -> t -> t -> t
+      val mk_lt : reify_tbl -> ?declare:bool -> t -> t -> t
+      val mk_le : reify_tbl -> ?declare:bool -> t -> t -> t
+      val mk_gt : reify_tbl -> ?declare:bool -> t -> t -> t
+      val mk_ge : reify_tbl -> ?declare:bool -> t -> t -> t
+      val mk_plus : reify_tbl -> ?declare:bool -> t -> t -> t
+      val mk_minus : reify_tbl -> ?declare:bool -> t -> t -> t
+      val mk_mult : reify_tbl -> ?declare:bool -> t -> t -> t
+      val mk_bvand : reify_tbl -> ?declare:bool -> int -> t -> t -> t
+      val mk_bvor : reify_tbl -> ?declare:bool -> int -> t -> t -> t
+      val mk_bvxor : reify_tbl -> ?declare:bool -> int -> t -> t -> t
+      val mk_bvadd : reify_tbl -> ?declare:bool -> int -> t -> t -> t
+      val mk_bvmult : reify_tbl -> ?declare:bool -> int -> t -> t -> t
+      val mk_bvult : reify_tbl -> ?declare:bool -> int -> t -> t -> t
+      val mk_bvslt : reify_tbl -> ?declare:bool -> int -> t -> t -> t
+      val mk_bvconcat : reify_tbl -> ?declare:bool -> int -> int -> t -> t -> t
+      val mk_opp : reify_tbl -> ?declare:bool -> t -> t
+      val mk_distinct : reify_tbl -> ?declare:bool -> btype -> t array -> t
+      val mk_bitof : reify_tbl -> ?declare:bool -> int -> int -> t -> t
+      val mk_bvnot : reify_tbl -> ?declare:bool -> int -> t -> t
+      val mk_bvneg : reify_tbl -> ?declare:bool -> int -> t -> t
+      val mk_bvconst : reify_tbl -> bool list -> t
+      val mk_bvextr : reify_tbl -> ?declare:bool -> i:int -> n:int -> s:int -> t -> t
+      val mk_bvzextn : reify_tbl -> ?declare:bool -> s:int -> n:int -> t -> t
+      val mk_bvsextn : reify_tbl -> ?declare:bool -> s:int -> n:int -> t -> t
+      val mk_bvshl : reify_tbl -> ?declare:bool -> int -> t -> t -> t
+      val mk_bvshr : reify_tbl -> ?declare:bool -> int -> t -> t -> t
+      val mk_select : reify_tbl -> ?declare:bool -> btype -> btype -> t -> t -> t
+      val mk_diffarray : reify_tbl -> ?declare:bool -> btype -> btype -> t -> t -> t
+      val mk_store :
+        reify_tbl -> ?declare:bool -> btype -> btype -> t -> t -> t -> t
 
     end