diff options
| author |  Matthieu Sozeau <mattam@mattam.org> | 2013-10-11 18:30:54 +0200 |
|---|---|---|
| committer | Matthieu Sozeau <mattam@mattam.org> | 2014-05-06 09:58:53 +0200 |
| commit | 57bee17f928fc67a599d2116edb42a59eeb21477 (patch) | |
| tree | f8e1446f5869de08be1dc20c104d61d0e47ce57d /kernel/safe_typing.ml | |
| parent | a4043608f704f026de7eb5167a109ca48e00c221 (diff) | |
Rework handling of universes on top of the STM, allowing for delayed
computation in case of non-polymorphic proofs. Also fix plugins after
forgotten merge conflicts. Still does not compile everything.
Diffstat (limited to 'kernel/safe_typing.ml')
| -rw-r--r-- | kernel/safe_typing.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml index 093797fc0..7d49e452c 100644 --- a/kernel/safe_typing.ml +++ b/kernel/safe_typing.ml @@ -301,7 +301,7 @@ let push_named_def (id,de) senv = | Def c -> Mod_subst.force_constr c | OpaqueDef o -> Opaqueproof.force_proof o | _ -> assert false in - let senv' = push_context de.Entries.const_entry_universes senv in + let senv' = push_context (Future.join de.Entries.const_entry_universes) senv in let env'' = safe_push_named (id,Some c,typ) senv'.env in {senv' with env=env''} |