aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChantal Keller <Chantal.Keller@lri.fr>2021-04-01 10:08:40 +0200
committerChantal Keller <Chantal.Keller@lri.fr>2021-04-01 10:08:40 +0200
commit0ea23e5f6226196a0cbc20ff569d3ad9f7faf657 (patch)
tree47f5f854111ecd724b1f50fd8f5620f215b9152b
parentcc56ac68a12d4b8f20aeb43bb4058ee1ae51e4b4 (diff)
parentbc568f070a168135b5a285154a6ed307fa4f0d79 (diff)
downloadsmtcoq-0ea23e5f6226196a0cbc20ff569d3ad9f7faf657.tar.gz
smtcoq-0ea23e5f6226196a0cbc20ff569d3ad9f7faf657.zip
Merge branch 'coq-8.10' of github.com:smtcoq/smtcoq into coq-8.11
-rw-r--r--src/State.v2
-rw-r--r--src/trace/coqTerms.ml5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/State.v b/src/State.v
index 4b0db6d..663b2b3 100644
--- a/src/State.v
+++ b/src/State.v
@@ -17,7 +17,7 @@ Require Import List Bool Int63 PArray Omega.
Local Open Scope int63_scope.
Local Open Scope array_scope.
-Coercion is_true (x: bool) := x = true.
+Coercion is_true : bool >-> Sortclass.
Set Vm Optimize.
diff --git a/src/trace/coqTerms.ml b/src/trace/coqTerms.ml
index a1b6765..9af2b8c 100644
--- a/src/trace/coqTerms.ml
+++ b/src/trace/coqTerms.ml
@@ -23,6 +23,9 @@ let ceq63 = gen_constant Structures.int63_modules "eqb"
(* PArray *)
let carray = gen_constant Structures.parray_modules "array"
+(* is_true *)
+let cis_true = gen_constant Structures.init_modules "is_true"
+
(* nat *)
let cnat = gen_constant Structures.init_modules "nat"
let cO = gen_constant Structures.init_modules "O"
@@ -266,8 +269,6 @@ let cFiff = gen_constant smt_modules "Fiff"
let cFite = gen_constant smt_modules "Fite"
let cFbbT = gen_constant smt_modules "FbbT"
-let cis_true = gen_constant smt_modules "is_true"
-
let cvalid_sat_checker = gen_constant [["SMTCoq";"Trace";"Sat_Checker"]] "valid"
let cinterp_var_sat_checker = gen_constant [["SMTCoq";"Trace";"Sat_Checker"]] "interp_var"