diff options
| author |  Matthieu Sozeau <mattam@mattam.org> | 2013-11-08 11:31:22 +0100 |
|---|---|---|
| committer | Matthieu Sozeau <mattam@mattam.org> | 2014-05-06 09:58:58 +0200 |
| commit | 1ed00e4f8cded2a2024b66c3f7f4deee6ecd7c83 (patch) | |
| tree | 471afc13a25bfe689d30447a6042c9f62c72f92e /pretyping/pretyping.ml | |
| parent | 62fb849cf9410ddc2d9f355570f4fb859f3044c3 (diff) | |
- Fix bug preventing apply from unfolding Fixpoints.
- Remove Universe Polymorphism flags everywhere.
- Properly infer, discharge template arities and fix substitution inside them
(kernel code to check for correctness).
- Fix tactics that were supposing universe polymorphic constants/inductives to
be parametric on that status. Required to make interp_constr* return the whole evar
universe context now.
- Fix the univ/level/instance hashconsing to respect the fact that marshalling doesn't preserve sharing,
sadly losing most of its benefits.
Short-term solution is to add hashes to these for faster comparison, longer term requires rewriting
all serialization code.
Conflicts:
kernel/univ.ml
tactics/tactics.ml
theories/Logic/EqdepFacts.v
Diffstat (limited to 'pretyping/pretyping.ml')
| -rw-r--r-- | pretyping/pretyping.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pretyping/pretyping.ml b/pretyping/pretyping.ml index 3f14de282..18b96e765 100644 --- a/pretyping/pretyping.ml +++ b/pretyping/pretyping.ml @@ -875,7 +875,7 @@ let understand_judgment_tcc evdref env c = let ise_pretype_gen_ctx flags sigma env lvar kind c = let evd, c = ise_pretype_gen flags sigma env lvar kind c in let evd, f = Evarutil.nf_evars_and_universes evd in - f c, Evd.get_universe_context_set evd + f c, Evd.evar_universe_context evd (** Entry points of the high-level type synthesis algorithm *) |