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 /interp/constrintern.mli | |
| 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 'interp/constrintern.mli')
| -rw-r--r-- | interp/constrintern.mli | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/interp/constrintern.mli b/interp/constrintern.mli index 9ce6ec779..1331fd968 100644 --- a/interp/constrintern.mli +++ b/interp/constrintern.mli @@ -91,13 +91,13 @@ val intern_context : bool -> env -> internalization_env -> local_binder list -> (** Main interpretation functions expecting evars to be all resolved *) val interp_constr : evar_map -> env -> ?impls:internalization_env -> - constr_expr -> constr Univ.in_universe_context_set + constr_expr -> constr Evd.in_evar_universe_context val interp_casted_constr : evar_map -> env -> ?impls:internalization_env -> - constr_expr -> types -> constr Univ.in_universe_context_set + constr_expr -> types -> constr Evd.in_evar_universe_context val interp_type : evar_map -> env -> ?impls:internalization_env -> - constr_expr -> types Univ.in_universe_context_set + constr_expr -> types Evd.in_evar_universe_context (** Main interpretation function expecting evars to be all resolved *) @@ -142,7 +142,8 @@ val interp_reference : ltac_sign -> reference -> glob_constr (** Interpret binders *) -val interp_binder : evar_map -> env -> Name.t -> constr_expr -> types Univ.in_universe_context_set +val interp_binder : evar_map -> env -> Name.t -> constr_expr -> + types Evd.in_evar_universe_context val interp_binder_evars : evar_map ref -> env -> Name.t -> constr_expr -> types |