diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/declarations.ml | 17 | ||||
| -rw-r--r-- | kernel/declarations.mli | 19 |
2 files changed, 19 insertions, 17 deletions
diff --git a/kernel/declarations.ml b/kernel/declarations.ml index ee1167b8f4..000305ebe5 100644 --- a/kernel/declarations.ml +++ b/kernel/declarations.ml @@ -160,19 +160,13 @@ and module_type_body = | MTBfunsig of mod_bound_id * module_type_body * module_type_body | MTBsig of mod_self_id * module_signature_body -and module_expr_body = - | MEBident of module_path - | MEBfunctor of mod_bound_id * module_type_body * module_expr_body - | MEBstruct of mod_self_id * module_structure_body - | MEBapply of module_expr_body * module_expr_body - * constraints - and module_specification_body = { msb_modtype : module_type_body; msb_equiv : module_path option; msb_constraints : constraints } -and structure_elem_body = + +type structure_elem_body = | SEBconst of constant_body | SEBmind of mutual_inductive_body | SEBmodule of module_body @@ -180,6 +174,13 @@ and structure_elem_body = and module_structure_body = (label * structure_elem_body) list +and module_expr_body = + | MEBident of module_path + | MEBfunctor of mod_bound_id * module_type_body * module_expr_body + | MEBstruct of mod_self_id * module_structure_body + | MEBapply of module_expr_body * module_expr_body + * constraints + and module_body = { mod_expr : module_expr_body option; mod_user_type : module_type_body option; diff --git a/kernel/declarations.mli b/kernel/declarations.mli index 83ea8c713e..70bd8bb89b 100644 --- a/kernel/declarations.mli +++ b/kernel/declarations.mli @@ -104,21 +104,15 @@ and module_type_body = | MTBfunsig of mod_bound_id * module_type_body * module_type_body | MTBsig of mod_self_id * module_signature_body -and module_expr_body = - | MEBident of module_path - | MEBfunctor of mod_bound_id * module_type_body * module_expr_body - | MEBstruct of mod_self_id * module_structure_body - | MEBapply of module_expr_body * module_expr_body (* (F A) *) - * constraints (* type_of(A) <: input_type_of(F) *) - and module_specification_body = { msb_modtype : module_type_body; msb_equiv : module_path option; msb_constraints : constraints } (* type_of(equiv) <: modtype (if given) + substyping of past With_Module mergers *) - -and structure_elem_body = + + +type structure_elem_body = | SEBconst of constant_body | SEBmind of mutual_inductive_body | SEBmodule of module_body @@ -126,6 +120,13 @@ and structure_elem_body = and module_structure_body = (label * structure_elem_body) list +and module_expr_body = + | MEBident of module_path + | MEBfunctor of mod_bound_id * module_type_body * module_expr_body + | MEBstruct of mod_self_id * module_structure_body + | MEBapply of module_expr_body * module_expr_body (* (F A) *) + * constraints (* type_of(A) <: input_type_of(F) *) + and module_body = { mod_expr : module_expr_body option; mod_user_type : module_type_body option; |