aboutsummaryrefslogtreecommitdiff
path: root/kernel/entries.ml
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2019-06-24 13:27:55 +0200
committerEmilio Jesus Gallego Arias2019-06-24 13:27:55 +0200
commitd2abcce128c0ba9f62fed66a1bca9c294be0c9c0 (patch)
tree987f9ce8d3522e1c5f610b82ca2b4c953251126d /kernel/entries.ml
parentee1717a5ac72373acddf1bbe913eebe8943f3c18 (diff)
parentb3bfb59281b35fc2a48e5293727977cc260d44c0 (diff)
Merge PR #10406: Desynchronize the type of proof and kernel entries
Reviewed-by: ejgallego Reviewed-by: gares
Diffstat (limited to 'kernel/entries.ml')
-rw-r--r--kernel/entries.ml18
1 files changed, 14 insertions, 4 deletions
diff --git a/kernel/entries.ml b/kernel/entries.ml
index de1ce609fd..2d29c3ee19 100644
--- a/kernel/entries.ml
+++ b/kernel/entries.ml
@@ -60,15 +60,14 @@ type mutual_inductive_entry = {
type 'a proof_output = constr Univ.in_universe_context_set * 'a
type 'a const_entry_body = 'a proof_output Future.computation
-type 'a definition_entry = {
- const_entry_body : 'a const_entry_body;
+type definition_entry = {
+ const_entry_body : constr Univ.in_universe_context_set;
(* List of section variables *)
const_entry_secctx : Constr.named_context option;
(* State id on which the completion of type checking is reported *)
const_entry_feedback : Stateid.t option;
const_entry_type : types option;
const_entry_universes : universes_entry;
- const_entry_opaque : bool;
const_entry_inline_code : bool }
type section_def_entry = {
@@ -78,6 +77,16 @@ type section_def_entry = {
secdef_type : types option;
}
+type 'a opaque_entry = {
+ opaque_entry_body : 'a;
+ (* List of section variables *)
+ opaque_entry_secctx : Constr.named_context option;
+ (* State id on which the completion of type checking is reported *)
+ opaque_entry_feedback : Stateid.t option;
+ opaque_entry_type : types;
+ opaque_entry_universes : universes_entry;
+}
+
type inline = int option (* inlining level, None for no inlining *)
type parameter_entry =
@@ -90,7 +99,8 @@ type primitive_entry = {
}
type 'a constant_entry =
- | DefinitionEntry of 'a definition_entry
+ | DefinitionEntry of definition_entry
+ | OpaqueEntry of 'a const_entry_body opaque_entry
| ParameterEntry of parameter_entry
| PrimitiveEntry of primitive_entry