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 /kernel/environ.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 'kernel/environ.mli')
-rw-r--r-- | kernel/environ.mli | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel/environ.mli b/kernel/environ.mli index 28eecc7ef..61a4f7327 100644 --- a/kernel/environ.mli +++ b/kernel/environ.mli @@ -128,10 +128,12 @@ val lookup_constant : constant -> env -> constant_body val evaluable_constant : constant -> env -> bool (** New-style polymorphism *) -val polymorphic_constant : pconstant -> env -> bool +val polymorphic_constant : constant -> env -> bool +val polymorphic_pconstant : pconstant -> env -> bool (** Old-style polymorphism *) -val template_polymorphic_constant : pconstant -> env -> bool +val template_polymorphic_constant : constant -> env -> bool +val template_polymorphic_pconstant : pconstant -> env -> bool (** {6 ... } *) (** [constant_value env c] raises [NotEvaluableConst Opaque] if @@ -173,10 +175,12 @@ val add_mind : mutual_inductive -> mutual_inductive_body -> env -> env val lookup_mind : mutual_inductive -> env -> mutual_inductive_body (** New-style polymorphism *) -val polymorphic_ind : pinductive -> env -> bool +val polymorphic_ind : inductive -> env -> bool +val polymorphic_pind : pinductive -> env -> bool (** Old-style polymorphism *) -val template_polymorphic_ind : pinductive -> env -> bool +val template_polymorphic_ind : inductive -> env -> bool +val template_polymorphic_pind : pinductive -> env -> bool (** {5 Modules } *) |