Encore quelques rangements dans Nametab + petits trucs

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3039 85f007b7-540e-0410-9357-904b9bb8a0f7

2 files changed, 62 insertions, 62 deletions

diff --git a/library/declaremods.ml b/library/declaremods.ml
index 4169fa56fe..397104d7b5 100644
--- a/library/declaremods.ml
+++ b/library/declaremods.ml
@@ -344,6 +344,7 @@ let classify_modtype (_,(_,substobjs)) =
 let (in_modtype,out_modtype) =
     declare_object {(default_object "MODULE TYPE") with
       cache_function = cache_modtype;
+      open_function = open_modtype;
       load_function = load_modtype;
       subst_function = subst_modtype;
       classify_function = classify_modtype;
diff --git a/library/nametab.ml b/library/nametab.ml
index 9bd42b388f..c0812c2d2d 100755
--- a/library/nametab.ml
+++ b/library/nametab.ml
@@ -91,80 +91,79 @@ struct
 
   let empty = Idmap.empty
 		
-  (* [push_many] is used to register [Until vis] visibility and 
-     [push_one] to [Exactly vis] and [push_tree] chooses the right one*)
-
-  let push_many vis tab dir uname o = 
-    let rec push level (current,dirmap) = function
-      | modid :: path as dir ->
-	  let mc = 
-	    try ModIdmap.find modid dirmap
-	    with Not_found -> (Nothing, ModIdmap.empty)
-	  in
-	  let this =
-            if level >= vis then
-	      match current with
-		| Absolute (n,_) -> 
-		    (* This is an absolute name, we must keep it otherwise it may
-		       become unaccessible forever *)
-		    warning ("Trying to mask the absolute name \"" 
-			     ^ U.to_string n ^ "\"!"); 
-		    current
-		| Nothing
-		| Relative _ -> Relative (uname,o)
-            else current 
-	  in
-	    (this, ModIdmap.add modid (push (level+1) mc path) dirmap)
-      | [] -> 
-	  match current with
-	    | Absolute (n,_) -> 
-		(* This is an absolute name, we must keep it otherwise it may
-		   become unaccessible forever *)
-		(* But ours is also absolute! This is an error! *)
-		error ("Trying to mask an absolute name \""
-  		       ^ U.to_string n ^ "\"!")
-	    | Nothing
-	    | Relative _ -> Absolute (uname,o), dirmap
-    in
-      push 0 tab dir
-
-let push_one vis tab dir uname o =
-  let rec push level (current,dirmap) = function
+  (* [push_until] is used to register [Until vis] visibility and 
+     [push_exactly] to [Exactly vis] and [push_tree] chooses the right one*)
+
+  let rec push_until uname o level (current,dirmap) = function
     | modid :: path as dir ->
 	let mc = 
 	  try ModIdmap.find modid dirmap
 	  with Not_found -> (Nothing, ModIdmap.empty)
 	in
-          if level = vis then
-	    let this =
-	      match current with
-		| Absolute _ -> 
-	(* This is an absolute name, we must keep it otherwise it may
-           become unaccessible forever *)
-		    error "Trying to mask an absolute name!"
-		| Nothing
-		| Relative _ -> Relative (uname,o)
-	    in
-	      (this, dirmap)
-	  else
-	    (current, ModIdmap.add modid (push (level+1) mc path) dirmap)
-    | [] -> anomaly "We should never come to this point"
-  in
-    push 0 tab dir
-
-
-let push_tree = function 
-  | Until i -> push_many (i-1)
-  | Exactly i -> push_one (i-1)
+	let this =
+          if level <= 0 then
+	    match current with
+	      | Absolute (n,_) -> 
+		  (* This is an absolute name, we must keep it 
+		     otherwise it may become unaccessible forever *)
+		  warning ("Trying to mask the absolute name \"" 
+			   ^ U.to_string n ^ "\"!"); 
+		  current
+	      | Nothing
+	      | Relative _ -> Relative (uname,o)
+          else current 
+	in
+	let ptab' = push_until uname o (level-1) mc path in
+	  (this, ModIdmap.add modid ptab' dirmap)
+    | [] -> 
+	match current with
+	  | Absolute (n,_) -> 
+	      (* This is an absolute name, we must keep it otherwise it may
+		 become unaccessible forever *)
+	      (* But ours is also absolute! This is an error! *)
+	      error ("Cannot mask an absolute name \""
+  		     ^ U.to_string n ^ "\"!")
+	  | Nothing
+	  | Relative _ -> Absolute (uname,o), dirmap
+
+
+let rec push_exactly uname o level (current,dirmap) = function
+  | modid :: path as dir ->
+      let mc = 
+	try ModIdmap.find modid dirmap
+	with Not_found -> (Nothing, ModIdmap.empty)
+      in
+        if level = 0 then
+	  let this =
+	    match current with
+	      | Absolute (n,_) -> 
+		  (* This is an absolute name, we must keep it 
+		     otherwise it may become unaccessible forever *)
+		  warning ("Trying to mask an absolute name \""
+  			   ^ U.to_string n ^ "\"!");
+		  current
+	      | Nothing
+	      | Relative _ -> Relative (uname,o)
+	  in
+	    (this, dirmap)
+	else (* not right level *)
+	  let ptab' = push_exactly uname o (level-1) mc path in
+	    (current, ModIdmap.add modid ptab' dirmap)
+  | [] -> 
+      anomaly "Prefix longer than path! Impossible!"
 
 
 let push visibility uname o tab =
   let id,dir = U.repr uname in
-  let modtab =
+  let ptab =
     try Idmap.find id tab
     with Not_found -> (Nothing, ModIdmap.empty) 
   in
-    Idmap.add id (push_tree visibility modtab dir uname o) tab
+  let ptab' = match visibility with
+    | Until i -> push_until uname o (i-1) ptab dir
+    | Exactly i -> push_exactly uname o (i-1) ptab dir
+  in
+    Idmap.add id ptab' tab
 
 
 let rec search (current,modidtab) = function