Imported Upstream snapshot 8.3~beta0+13298

1 files changed, 33 insertions, 37 deletions

diff --git a/kernel/modops.mli b/kernel/modops.mli
index 2d8b21ad..3488a312 100644
--- a/kernel/modops.mli
+++ b/kernel/modops.mli
@@ -6,7 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: modops.mli 10664 2008-03-14 11:27:37Z soubiran $ i*)
+(*i $Id$ i*)
 
 (*i*)
 open Util
@@ -20,46 +20,40 @@ open Mod_subst
 
 (* Various operations on modules and module types *)
 
-(* make the environment entry out of type *)
-val module_body_of_type : module_type_body -> module_body
 
-val  module_type_of_module : module_path option -> module_body -> 
-  module_type_body 
+val module_body_of_type : module_path -> module_type_body  -> module_body 
 
-val destr_functor : 
-  env -> struct_expr_body -> mod_bound_id * module_type_body * struct_expr_body
+val module_type_of_module : env -> module_path option -> module_body -> 
+  module_type_body
 
-val subst_modtype : substitution -> module_type_body -> module_type_body
-val subst_structure : substitution -> structure_body -> structure_body
+val destr_functor :
+  env -> struct_expr_body -> mod_bound_id * module_type_body * struct_expr_body
 
 val subst_struct_expr :  substitution -> struct_expr_body -> struct_expr_body
 
-val subst_signature_msid :
-  mod_self_id -> module_path -> 
-  structure_body -> structure_body
+val subst_signature : substitution -> structure_body -> structure_body
 
-val subst_structure : substitution -> structure_body -> structure_body
+val add_signature :
+  module_path -> structure_body -> delta_resolver -> env -> env
 
-(* Evaluation functions *)
-val eval_struct : env -> struct_expr_body -> struct_expr_body
+(* adds a module and its components, but not the constraints *)
+val add_module : module_body -> env -> env
 
-val type_of_mb : env -> module_body -> struct_expr_body
+val check_modpath_equiv : env -> module_path -> module_path -> unit
 
-(* [add_signature mp sign env] assumes that the substitution [msid]
-   $\mapsto$ [mp] has already been performed (or is not necessary, like
-   when [mp = MPself msid]) *)
-val add_signature : 
-  module_path -> structure_body -> env -> env
+val strengthen : env -> module_type_body -> module_path -> module_type_body
 
-(* adds a module and its components, but not the constraints *)
-val add_module :
-  module_path -> module_body -> env -> env
+val complete_inline_delta_resolver :
+  env -> module_path -> mod_bound_id -> module_type_body ->
+  delta_resolver -> delta_resolver
 
-val check_modpath_equiv : env -> module_path -> module_path -> unit
+val strengthen_and_subst_mb : module_body -> module_path -> env -> bool 
+  -> module_body
 
-val strengthen : env -> struct_expr_body -> module_path -> struct_expr_body
+val subst_modtype_and_resolver : module_type_body -> module_path -> env ->
+  module_type_body
 
-val update_subst : env -> module_body -> module_path -> bool * substitution
+val clean_bounded_mod_expr : struct_expr_body -> struct_expr_body
 
 val error_existing_label : label -> 'a
 
@@ -69,13 +63,13 @@ val error_application_to_not_path : module_struct_entry -> 'a
 
 val error_not_a_functor :  module_struct_entry -> 'a
 
-val error_incompatible_modtypes : 
+val error_incompatible_modtypes :
   module_type_body -> module_type_body -> 'a
 
 val error_not_equal : module_path -> module_path -> 'a
 
 val error_not_match : label -> structure_field_body -> 'a
-  
+
 val error_incompatible_labels : label -> label -> 'a
 
 val error_no_such_label : label -> 'a
@@ -84,15 +78,17 @@ val error_result_must_be_signature : unit -> 'a
 
 val error_signature_expected : struct_expr_body -> 'a
 
-val error_no_module_to_end : unit -> 'a 
+val error_no_module_to_end : unit -> 'a
 
 val error_no_modtype_to_end : unit -> 'a
 
-val error_not_a_modtype_loc : loc -> string -> 'a 
+val error_not_a_modtype_loc : loc -> string -> 'a
 
-val error_not_a_module_loc : loc -> string -> 'a 
+val error_not_a_module_loc : loc -> string -> 'a
 
-val error_not_a_module : string -> 'a 
+val error_not_a_module_or_modtype_loc : loc -> string -> 'a
+
+val error_not_a_module : string -> 'a
 
 val error_not_a_constant : label -> 'a
 
@@ -102,9 +98,9 @@ val error_a_generative_module_expected : label -> 'a
 
 val error_local_context : label option -> 'a
 
-val error_no_such_label_sub : label->string->string->'a
+val error_no_such_label_sub : label->string->'a
+
+val error_with_in_module : unit -> 'a
 
-val resolver_of_environment :
-  mod_bound_id -> module_type_body -> module_path -> substitution 
-  -> env -> resolver
+val error_application_to_module_type : unit -> 'a