aboutsummaryrefslogtreecommitdiffhomepage
path: root/kernel/environ.ml
diff options
context:
space:
mode:
authorGravatar Matthieu Sozeau <mattam@mattam.org>2014-03-25 18:29:28 +0100
committerGravatar Matthieu Sozeau <mattam@mattam.org>2014-05-06 09:58:58 +0200
commit62fb849cf9410ddc2d9f355570f4fb859f3044c3 (patch)
tree2f350ca302a46e18840638d20e7ff89beaf2b1f0 /kernel/environ.ml
parentca318cd0d21ce157a3042b600ded99df6face25e (diff)
Adapt universe polymorphic branch to new handling of futures for delayed proofs.
Diffstat (limited to 'kernel/environ.ml')
-rw-r--r--kernel/environ.ml8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/environ.ml b/kernel/environ.ml
index ede655702..dd4237b22 100644
--- a/kernel/environ.ml
+++ b/kernel/environ.ml
@@ -207,7 +207,7 @@ let add_constant kn cb env =
add_constant_key kn cb (no_link_info ()) env
let universes_of cb =
- Future.force cb.const_universes
+ cb.const_universes
let universes_and_subst_of cb u =
let univs = universes_of cb in
@@ -234,7 +234,7 @@ let constant_type env (kn,u) =
let constant_context env kn =
let cb = lookup_constant kn env in
- if cb.const_polymorphic then Future.force cb.const_universes
+ if cb.const_polymorphic then cb.const_universes
else Univ.UContext.empty
type const_evaluation_result = NoBody | Opaque | IsProj
@@ -283,7 +283,7 @@ let constant_value_and_type env (kn, u) =
let constant_type_in env (kn,u) =
let cb = lookup_constant kn env in
if cb.const_polymorphic then
- let subst = Univ.make_universe_subst u (Future.force cb.const_universes) in
+ let subst = Univ.make_universe_subst u cb.const_universes in
map_regular_arity (subst_univs_constr subst) cb.const_type
else cb.const_type
@@ -293,7 +293,7 @@ let constant_value_in env (kn,u) =
| Def l_body ->
let b = Mod_subst.force_constr l_body in
if cb.const_polymorphic then
- let subst = Univ.make_universe_subst u (Future.force cb.const_universes) in
+ let subst = Univ.make_universe_subst u cb.const_universes in
subst_univs_constr subst b
else b
| OpaqueDef _ -> raise (NotEvaluableConst Opaque)