diff options
| author |  Stephane Glondu <steph@glondu.net> | 2013-05-08 18:03:54 +0200 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2013-05-08 18:03:54 +0200 |
| commit | db38bb4ad9aff74576d3b7f00028d48f0447d5bd (patch) | |
| tree | 09dafc3e5c7361d3a28e93677eadd2b7237d4f9f /kernel/mod_typing.mli | |
| parent | 6e34b272d789455a9be589e27ad3a998cf25496b (diff) | |
| parent | 499a11a45b5711d4eaabe84a80f0ad3ae539d500 (diff) | |
Merge branch 'experimental/upstream' into upstream
Diffstat (limited to 'kernel/mod_typing.mli')
| -rw-r--r-- | kernel/mod_typing.mli | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/kernel/mod_typing.mli b/kernel/mod_typing.mli index ec5eb332..0990e36c 100644 --- a/kernel/mod_typing.mli +++ b/kernel/mod_typing.mli @@ -1,36 +1,44 @@ (************************************************************************) (* v * The Coq Proof Assistant / The Coq Development Team *) -(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011 *) +(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2012 *) (* \VV/ **************************************************************) (* // * This file is distributed under the terms of the *) (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(*i $Id: mod_typing.mli 14641 2011-11-06 11:59:10Z herbelin $ i*) - -(*i*) open Declarations open Environ open Entries open Mod_subst open Names -(*i*) - - -val translate_module : env -> module_path -> bool -> module_entry - -> module_body - -val translate_module_type : env -> module_path -> bool -> module_struct_entry -> - module_type_body - -val translate_struct_module_entry : env -> module_path -> bool -> module_struct_entry -> - struct_expr_body * struct_expr_body * delta_resolver * Univ.constraints -val translate_struct_type_entry : env -> bool -> module_struct_entry -> - struct_expr_body * struct_expr_body option * delta_resolver * module_path * Univ.constraints -val translate_struct_include_module_entry : env -> module_path - -> bool -> module_struct_entry -> struct_expr_body * delta_resolver * Univ.constraints +val translate_module : + env -> module_path -> inline -> module_entry -> module_body + +val translate_module_type : + env -> module_path -> inline -> module_struct_entry -> module_type_body + +val translate_struct_module_entry : + env -> module_path -> inline -> module_struct_entry -> + struct_expr_body (* Signature *) + * struct_expr_body option (* Algebraic expr, in fact never None *) + * delta_resolver + * Univ.constraints + +val translate_struct_type_entry : + env -> inline -> module_struct_entry -> + struct_expr_body + * struct_expr_body option + * delta_resolver + * Univ.constraints + +val translate_struct_include_module_entry : + env -> module_path -> inline -> module_struct_entry -> + struct_expr_body + * struct_expr_body option (* Algebraic expr, always None *) + * delta_resolver + * Univ.constraints val add_modtype_constraints : env -> module_type_body -> env |