{T,Opt}opdirs: keep track of loaded objects and archives.

We expose a function to access the information in the
Topdir API since this partially solves ocaml#2.

A small change to misc.mli is needed to avoid exposing
Misc in {T,Opt}optdirs interfaces.

Author: dbuenzli

toplevel/opttopdirs.ml

@@ -73,6 +73,8 @@ let _ = Hashtbl.add directive_table "cd" (Directive_string dir_cd)
 
 (* Load in-core a .cmxs file *)
 
+let loaded_files = ref Stdlib.String.Set.empty
+
 let load_file ppf name0 =
   let name =
     try Some (Load_path.find name0)
@@ -90,7 +92,7 @@ let load_file ppf name0 =
       else
         name,false
     in
-    let success =
+    let loaded =
       (* The Dynlink interface does not allow us to distinguish between
           a Dynlink.Error exceptions raised in the loaded modules
           or a genuine error during dynlink... *)
@@ -105,8 +107,10 @@ let load_file ppf name0 =
         false
     in
     if tmp then (try Sys.remove fn with Sys_error _ -> ());
-    success
+    if loaded then loaded_files := Stdlib.String.Set.add name !loaded_files;
+    loaded
 
+let loaded_files () = !loaded_files
 
 let dir_load ppf name = ignore (load_file ppf name)
 

toplevel/opttopdirs.mli

@@ -31,3 +31,7 @@ type 'a printer_type_old = 'a -> unit
 
 (* For topmain.ml. Maybe shouldn't be there *)
 val load_file : formatter -> string -> bool
+
+val loaded_files : unit -> Set.Make(String).t
+(** [loaded_files ()] is the set of object and archive files that were
+    loaded so far. *)

toplevel/topdirs.ml

@@ -160,17 +160,18 @@ let load_compunit ic filename ppf compunit =
     raise Load_failed
   end
 
-let rec load_file recursive ppf name =
-  let filename =
-    try Some (Load_path.find name) with Not_found -> None
-  in
-  match filename with
-  | None -> fprintf ppf "Cannot find file %s.@." name; false
-  | Some filename ->
-      let ic = open_in_bin filename in
-      Misc.try_finally
-        ~always:(fun () -> close_in ic)
-        (fun () -> really_load_file recursive ppf name filename ic)
+let loaded_files = ref Stdlib.String.Set.empty
+
+let rec load_file recursive ppf name = match Load_path.find name with
+| exception Not_found -> fprintf ppf "Cannot find file %s.@." name; false
+| file ->
+    let ic = open_in_bin file in
+    let loaded =
+      Misc.try_finally ~always:(fun () -> close_in ic)
+        (fun () -> really_load_file recursive ppf name file ic)
+    in
+    (if loaded then loaded_files := Stdlib.String.Set.add file !loaded_files);
+    loaded
 
 and really_load_file recursive ppf name filename ic =
   let buffer = really_input_string ic (String.length Config.cmo_magic_number) in
@@ -236,6 +237,7 @@ let _ = add_directive "load_rec"
     }
 
 let load_file = load_file false
+let loaded_files () = !loaded_files
 
 (* Load commands from a file *)
 

toplevel/topdirs.mli

@@ -34,3 +34,7 @@ type 'a printer_type_old = 'a -> unit
 
 (* For topmain.ml. Maybe shouldn't be there *)
 val load_file : formatter -> string -> bool
+
+val loaded_files : unit -> Set.Make(String).t
+(** [loaded_files ()] is the set of object and archive files that were
+    loaded so far. *)

utils/misc.mli

@@ -166,7 +166,7 @@ module Stdlib : sig
 
   module String : sig
     include module type of String
-    module Set : Set.S with type elt = string
+    module Set : Set.S with type elt = string and type t = Set.Make(String).t
     module Map : Map.S with type key = string
     module Tbl : Hashtbl.S with type key = string