From 62fb849cf9410ddc2d9f355570f4fb859f3044c3 Mon Sep 17 00:00:00 2001 From: Matthieu Sozeau Date: Tue, 25 Mar 2014 18:29:28 +0100 Subject: Adapt universe polymorphic branch to new handling of futures for delayed proofs. --- kernel/mod_typing.ml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'kernel/mod_typing.ml') diff --git a/kernel/mod_typing.ml b/kernel/mod_typing.ml index b20fe9671..cab3276c3 100644 --- a/kernel/mod_typing.ml +++ b/kernel/mod_typing.ml @@ -72,8 +72,8 @@ let rec check_with_def env struc (idl,c) mp equiv = (* In the spirit of subtyping.check_constant, we accept any implementations of parameters and opaques terms, as long as they have the right type *) - let env' = Environ.add_constraints - (Univ.UContext.constraints (Future.force cb.const_universes)) env' in + let ccst = Declareops.constraints_of_constant cb in + let env' = Environ.add_constraints ccst env' in let c',cst = match cb.const_body with | Undef _ | OpaqueDef _ -> let j = Typeops.infer env' c in @@ -84,10 +84,9 @@ let rec check_with_def env struc (idl,c) mp equiv = | Def cs -> let cst = Reduction.infer_conv env' (Environ.universes env') c (Mod_subst.force_constr cs) in - let cst = + let cst = (*FIXME MS: what to check here? subtyping of polymorphic constants... *) if cb.const_polymorphic then cst - else (*FIXME MS: computed above *) - (Univ.UContext.constraints (Future.force cb.const_universes)) +++ cst + else ccst +++ cst in c, cst in -- cgit v1.2.3