diff options
| author |  Matthieu Sozeau <mattam@mattam.org> | 2014-03-25 18:29:28 +0100 |
|---|---|---|
| committer | Matthieu Sozeau <mattam@mattam.org> | 2014-05-06 09:58:58 +0200 |
| commit | 62fb849cf9410ddc2d9f355570f4fb859f3044c3 (patch) | |
| tree | 2f350ca302a46e18840638d20e7ff89beaf2b1f0 /kernel/mod_typing.ml | |
| parent | ca318cd0d21ce157a3042b600ded99df6face25e (diff) | |
Adapt universe polymorphic branch to new handling of futures for delayed proofs.
Diffstat (limited to 'kernel/mod_typing.ml')
| -rw-r--r-- | kernel/mod_typing.ml | 9 |
1 files changed, 4 insertions, 5 deletions
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 |