From adfd437f8ae6aaf893119fa4730edecf067dede7 Mon Sep 17 00:00:00 2001 From: Pierre Letouzey Date: Wed, 5 Mar 2014 14:59:16 +0100 Subject: Remove many superfluous 'open' indicated by ocamlc -w +33 With ocaml 4.01, the 'unused open' warning also checks the mli :-) Beware: some open are reported as useless when compiling with camlp5, but are necessary for compatibility with camlp4. These open are now marked with a comment. --- library/libobject.ml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'library/libobject.ml') diff --git a/library/libobject.ml b/library/libobject.ml index 3bbb1e90e..9c46b886d 100644 --- a/library/libobject.ml +++ b/library/libobject.ml @@ -6,10 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -open Util -open Errors open Libnames -open Mod_subst (* The relax flag is used to make it possible to load files while ignoring failures to incorporate some objects. This can be useful when one @@ -32,11 +29,11 @@ type 'a object_declaration = { load_function : int -> object_name * 'a -> unit; open_function : int -> object_name * 'a -> unit; classify_function : 'a -> 'a substitutivity; - subst_function : substitution * 'a -> 'a; + subst_function : Mod_subst.substitution * 'a -> 'a; discharge_function : object_name * 'a -> 'a option; rebuild_function : 'a -> 'a } -let yell s = anomaly (Pp.str s) +let yell s = Errors.anomaly (Pp.str s) let default_object s = { object_name = s; @@ -69,7 +66,7 @@ type dynamic_object_declaration = { dyn_cache_function : object_name * obj -> unit; dyn_load_function : int -> object_name * obj -> unit; dyn_open_function : int -> object_name * obj -> unit; - dyn_subst_function : substitution * obj -> obj; + dyn_subst_function : Mod_subst.substitution * obj -> obj; dyn_classify_function : obj -> obj substitutivity; dyn_discharge_function : object_name * obj -> obj option; dyn_rebuild_function : obj -> obj } -- cgit v1.2.3