From 6946bbbf2390024b3ded7654814104e709cce755 Mon Sep 17 00:00:00 2001 From: ppedrot Date: Tue, 18 Dec 2012 18:05:56 +0000 Subject: Modulification of mod_bound_id git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16098 85f007b7-540e-0410-9357-904b9bb8a0f7 --- library/declaremods.ml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'library/declaremods.ml') diff --git a/library/declaremods.ml b/library/declaremods.ml index 763aa5ffd..0d9ffb29e 100644 --- a/library/declaremods.ml +++ b/library/declaremods.ml @@ -86,7 +86,7 @@ type 'a annotated = ('a * funct_app_annot) *) type substitutive_objects = - mod_bound_id list * module_path * lib_objects + MBId.t list * module_path * lib_objects (* For each module, we store the following things: @@ -124,7 +124,7 @@ let modtab_objects = is a functor) and declared output type *) let openmod_info = ref ((MPfile(Dir_path.initial),[],None,[]) - : module_path * mod_bound_id list * + : module_path * MBId.t list * (module_struct_entry * int option) option * module_type_body list) @@ -346,7 +346,7 @@ let modtypetab = (* currently started interactive module type. We remember its arguments if it is a functor type *) let openmodtype_info = - ref ([],[] : mod_bound_id list * module_type_body list) + ref ([],[] : MBId.t list * module_type_body list) let _ = Summary.declare_summary "MODTYPE-INFO" { Summary.freeze_function = (fun () -> @@ -529,7 +529,7 @@ let rec seb2mse = function | _ -> failwith "seb2mse: received a non-atomic seb" let process_module_seb_binding mbid seb = - process_module_bindings [id_of_mbid mbid] + process_module_bindings [MBId.to_id mbid] [mbid, (seb2mse seb, { ann_inline = DefaultInline; ann_scope_subst = [] })] @@ -537,7 +537,7 @@ let process_module_seb_binding mbid seb = let intern_args interp_modtype (idl,(arg,ann)) = let inl = inline_annot ann in let lib_dir = Lib.library_dp() in - let mbids = List.map (fun (_,id) -> make_mbid lib_dir id) idl in + let mbids = List.map (fun (_,id) -> MBId.make lib_dir id) idl in let mty = interp_modtype (Global.env()) arg in let dirs = List.map (fun (_,id) -> Dir_path.make [id]) idl in let (mbi,mp_from,objs) = get_modtype_substobjs (Global.env()) -- cgit v1.2.3