diff options
Diffstat (limited to 'library')
| -rw-r--r-- | library/declaremods.ml | 4 | ||||
| -rw-r--r-- | library/declaremods.mli | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/library/declaremods.ml b/library/declaremods.ml index 305024c3d7..579182a605 100644 --- a/library/declaremods.ml +++ b/library/declaremods.ml @@ -429,9 +429,9 @@ let rec get_some_body mty env = match mty with let intern_args interp_modtype (env,oldargs) (idl,arg) = let lib_dir = Lib.library_dp() in - let mbids = List.map (fun id -> make_mbid lib_dir (string_of_id id)) idl in + let mbids = List.map (fun (_,id) -> make_mbid lib_dir (string_of_id id)) idl in let mty = interp_modtype env arg in - let dirs = List.map (fun id -> make_dirpath [id]) idl in + let dirs = List.map (fun (_,id) -> make_dirpath [id]) idl in let mps = List.map (fun mbid -> MPbound mbid) mbids in let substobjs = get_modtype_substobjs mty in let substituted's = diff --git a/library/declaremods.mli b/library/declaremods.mli index 94144d625b..ff32688984 100644 --- a/library/declaremods.mli +++ b/library/declaremods.mli @@ -9,6 +9,7 @@ (*i $Id$ i*) (*i*) +open Util open Names open Entries open Environ @@ -38,12 +39,12 @@ open Lib val declare_module : (env -> 'modtype -> module_type_entry) -> (env -> 'modexpr -> module_expr) -> identifier -> - (identifier list * 'modtype) list -> ('modtype * bool) option -> + (identifier located list * 'modtype) list -> ('modtype * bool) option -> 'modexpr option -> unit val start_module : (env -> 'modtype -> module_type_entry) -> identifier -> - (identifier list * 'modtype) list -> ('modtype * bool) option -> + (identifier located list * 'modtype) list -> ('modtype * bool) option -> unit val end_module : identifier -> unit @@ -53,10 +54,10 @@ val end_module : identifier -> unit (*s Module types *) val declare_modtype : (env -> 'modtype -> module_type_entry) -> - identifier -> (identifier list * 'modtype) list -> 'modtype -> unit + identifier -> (identifier located list * 'modtype) list -> 'modtype -> unit val start_modtype : (env -> 'modtype -> module_type_entry) -> - identifier -> (identifier list * 'modtype) list -> unit + identifier -> (identifier located list * 'modtype) list -> unit val end_modtype : identifier -> unit |