diff options
| author | ckeller <ckeller@users.noreply.github.com> | 2019-02-14 20:09:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 20:09:40 +0100 |
| commit | ec41af7ac01cef7c30785e6dd704381f31e7c2d3 (patch) | |
| tree | 13d51483c50d7b5a668d90b8b67a8b99ef0fbe56 /src/lia | |
| parent | ba22fad2fb46962eef5f30d976e9eaeb587023a0 (diff) | |
| download | smtcoq-ec41af7ac01cef7c30785e6dd704381f31e7c2d3.tar.gz smtcoq-ec41af7ac01cef7c30785e6dd704381f31e7c2d3.zip | |
V8.7 (#36)
Port SMTCoq to Coq-8.7
Diffstat (limited to 'src/lia')
| -rw-r--r-- | src/lia/Lia.v | 2 | ||||
| -rw-r--r-- | src/lia/lia.ml | 9 | ||||
| -rw-r--r-- | src/lia/lia.mli | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/lia/Lia.v b/src/lia/Lia.v index cafac1b..8c5a597 100644 --- a/src/lia/Lia.v +++ b/src/lia/Lia.v @@ -10,7 +10,7 @@ (**************************************************************************) -Require Import Bool List Int63 PArray. +Require Import Bool List Int63 PArray ZArith. Require Import Misc State SMT_terms Euf. Require Import RingMicromega ZMicromega Tauto Psatz. diff --git a/src/lia/lia.ml b/src/lia/lia.ml index adeed4e..d8ed560 100644 --- a/src/lia/lia.ml +++ b/src/lia/lia.ml @@ -11,11 +11,6 @@ (*** Linking SMT Terms to Micromega Terms ***) -open Term -open Coqlib -open Declare -open Decl_kinds -open Entries open Util open Structures.Micromega_plugin_Micromega open Structures.Micromega_plugin_Coq_micromega @@ -114,7 +109,7 @@ let smt_binop_to_micromega_formula tbl op ha hb = let rhs = smt_Atom_to_micromega_pExpr tbl hb in {flhs = lhs; fop = op; frhs = rhs } -let rec smt_Atom_to_micromega_formula tbl ha = +let smt_Atom_to_micromega_formula tbl ha = match Atom.atom ha with | Abop (op,ha,hb) -> smt_binop_to_micromega_formula tbl op ha hb | _ -> Structures.error @@ -122,7 +117,7 @@ let rec smt_Atom_to_micromega_formula tbl ha = (* specialized fold *) -let default_constr = mkInt 0 +let default_constr = Structures.econstr_of_constr (mkInt 0) let default_tag = Structures.Micromega_plugin_Mutils.Tag.from 0 (* morphism for general formulas *) diff --git a/src/lia/lia.mli b/src/lia/lia.mli index 93361f2..9d4ee6b 100644 --- a/src/lia/lia.mli +++ b/src/lia/lia.mli @@ -12,7 +12,7 @@ val pos_of_int : int -> Structures.Micromega_plugin_Micromega.positive val z_of_int : int -> Structures.Micromega_plugin_Micromega.z -type my_tbl = { tbl : (SmtAtom.hatom, int) Hashtbl.t; mutable count : int; } +type my_tbl val get_atom_var : my_tbl -> SmtAtom.hatom -> int val create_tbl : int -> my_tbl val smt_Atom_to_micromega_pos : @@ -36,8 +36,6 @@ val smt_Atom_to_micromega_formula : SmtAtom.hatom -> Structures.Micromega_plugin_Micromega.z Structures.Micromega_plugin_Micromega.formula -val default_constr : Term.constr -val default_tag : Structures.Micromega_plugin_Mutils.Tag.t val binop_array : ('a -> 'b -> 'c) -> 'a -> ('c -> 'c -> 'c) -> 'c -> 'b array -> 'c val smt_Form_to_coq_micromega_formula : |