From ca7adf2ee2106667f6de91b3a1ee755f69087e54 Mon Sep 17 00:00:00 2001 From: Chantal Keller Date: Wed, 23 Mar 2016 19:30:59 +0100 Subject: Port to 8.5: how to deal with universe constraints --- src/versions/standard/structures.ml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src') 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 } -- cgit