diff options
| -rw-r--r-- | src/versions/standard/structures.ml | 10 | ||||
| -rw-r--r-- | unit-tests/Tests_zchaff.v | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/versions/standard/structures.ml b/src/versions/standard/structures.ml index caf2844..bd9e4f4 100644 --- a/src/versions/standard/structures.ml +++ b/src/versions/standard/structures.ml @@ -67,12 +67,16 @@ let mkArray : Term.types * Term.constr array -> Term.constr = let dummy_loc = Loc.ghost let mkConst c = - { const_entry_body = Future.from_val ((c, Univ.ContextSet.empty), Safe_typing.empty_private_constants); + let env = Global.env () in + let evd = Evd.from_env env in + let evd, ty = Typing.type_of env evd c in + { const_entry_body = Future.from_val ((c, Univ.ContextSet.empty), + Safe_typing.empty_private_constants); const_entry_secctx = None; const_entry_feedback = None; - const_entry_type = None; + const_entry_type = Some ty; const_entry_polymorphic = false; - const_entry_universes = Univ.UContext.empty; + const_entry_universes = snd (Evd.universe_context evd); const_entry_opaque = false; const_entry_inline_code = false } diff --git a/unit-tests/Tests_zchaff.v b/unit-tests/Tests_zchaff.v index 1d2cf0c..c452734 100644 --- a/unit-tests/Tests_zchaff.v +++ b/unit-tests/Tests_zchaff.v @@ -17,11 +17,6 @@ Time Zchaff_Checker "hole4.cnf" "hole4.zlog". (* Time Zchaff_Checker "velev-sss-1.0-05.cnf" "velev-sss-1.0-05.zlog". *) -(* Some strange bug (bug 4629) in Coq8.5 forces me to write this for the moment *) -Definition foo:= (@make (array int) 2 (make 0 0)). -Definition bar:= (PArray.set (@make (array int) 2 (make 0 0)) 0 (make 0 0)). - - Time Zchaff_Theorem sat1 "sat1.cnf" "sat1.zlog". Time Zchaff_Theorem sat2 "sat2.cnf" "sat2.zlog". Time Zchaff_Theorem sat3 "sat3.cnf" "sat3.zlog". |