From 923005cce9890435c92f2ee37d21154135dff9f5 Mon Sep 17 00:00:00 2001
From: herbelin
Date: Wed, 20 Dec 2000 11:00:28 +0000
Subject: Import module force l'ouverture du module même s'il était déjà ouvert
 afin de pouvoir re-rendre visible des noms ayant été cachés depuis
 l'ouverture du module; renommage de open_module en import_module avec cette
 nouvelle spéc

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@1164 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 library/library.ml  | 9 +++++----
 library/library.mli | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'library')

diff --git a/library/library.ml b/library/library.ml
index 6839bdb9ca..a493be0136 100644
--- a/library/library.ml
+++ b/library/library.ml
@@ -128,15 +128,16 @@ let segment_iter f =
 let open_objects decls =
   segment_iter open_object decls
 
-let rec open_module s =
+let rec open_module force s =
   let m = find_module s in
-  if not m.module_opened then begin
-    List.iter (fun (m,_,exp) -> if exp then open_module m) m.module_deps;
+  if force or not m.module_opened then begin
+    List.iter (fun (m,_,exp) -> if exp then open_module force m) m.module_deps;
     open_objects m.module_declarations;
     Nametab.open_module_contents (make_qualid [] s); 
     m.module_opened <- true
   end
 
+let import_module = open_module true
 
 (*s [load_module s] loads the module [s] from the disk, and [find_module s]
    returns the module of name [s], loading it if necessary. 
@@ -190,7 +191,7 @@ let load_module s = function
 let cache_require (_,(name,file,export)) =
   let m = load_module_from name file in
   if export then m.module_exported <- true;
-  open_module name
+  open_module false name
 
 let (in_require, _) =
   declare_object
diff --git a/library/library.mli b/library/library.mli
index 2f9ee2500d..f937e30ab2 100644
--- a/library/library.mli
+++ b/library/library.mli
@@ -14,7 +14,7 @@ open Libobject
    vernacular command [Require]. *)
 
 val load_module : string -> string option -> unit
-val open_module : string -> unit
+val import_module : string -> unit
 
 val module_is_loaded : string -> bool
 val module_is_opened : string -> bool
-- 
cgit v1.2.3