Déplacement de qualid dans Nametab, hors du noyau

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

5 files changed, 11 insertions, 7 deletions

diff --git a/contrib/omega/coq_omega.ml b/contrib/omega/coq_omega.ml
index 00ce6d2078..821c4b2021 100644
--- a/contrib/omega/coq_omega.ml
+++ b/contrib/omega/coq_omega.ml
@@ -217,7 +217,8 @@ let constant dir s =
   try 
     Declare.global_reference_in_absolute_module dir id
   with Not_found ->
-    anomaly ("Coq_omega: cannot find "^(string_of_qualid (make_qualid dir id)))
+    anomaly ("Coq_omega: cannot find "^
+	     (Nametab.string_of_qualid (Nametab.make_qualid dir id)))
 
 let zarith_constant dir = constant ("Zarith"::dir)
 
@@ -373,12 +374,13 @@ let make_coq_path dir s =
   let ref = 
     try Nametab.locate_in_absolute_module dir id 
     with Not_found ->
-      anomaly("Coq_omega: cannot find "^(string_of_qualid(make_qualid dir id)))
+      anomaly("Coq_omega: cannot find "^
+	      (Nametab.string_of_qualid(Nametab.make_qualid dir id)))
   in
   match ref with
     | ConstRef sp -> EvalConstRef sp
     | _ -> anomaly ("Coq_omega: "^
-		    (string_of_qualid (make_qualid dir id))^
+		    (Nametab.string_of_qualid (Nametab.make_qualid dir id))^
 		    " is not a constant")
 
 let sp_Zs = lazy (make_coq_path ["Zarith";"zarith_aux"] "Zs")
diff --git a/contrib/ring/quote.ml b/contrib/ring/quote.ml
index efc8d78d85..ac3af30b8d 100644
--- a/contrib/ring/quote.ml
+++ b/contrib/ring/quote.ml
@@ -118,7 +118,8 @@ let constant dir s =
   try 
     Declare.global_reference_in_absolute_module dir id
   with Not_found ->
-    anomaly ("Quote: cannot find "^(string_of_qualid (make_qualid dir id)))
+    anomaly ("Quote: cannot find "^
+	     (Nametab.string_of_qualid (Nametab.make_qualid dir id)))
 
 let coq_Empty_vm = lazy (constant ["Quote"] "Empty_vm")
 let coq_Node_vm = lazy (constant ["Quote"] "Node_vm")
diff --git a/contrib/ring/ring.ml b/contrib/ring/ring.ml
index 1cfbf965cc..0e200313c7 100644
--- a/contrib/ring/ring.ml
+++ b/contrib/ring/ring.ml
@@ -31,7 +31,8 @@ let constant dir s =
   try 
     Declare.global_reference_in_absolute_module dir id
   with Not_found ->
-    anomaly ("Ring: cannot find "^(string_of_qualid (make_qualid dir id)))
+    anomaly ("Ring: cannot find "^
+	     (Nametab.string_of_qualid (Nametab.make_qualid dir id)))
 
 (* Ring_theory *)
 
diff --git a/contrib/xml/xmlcommand.ml b/contrib/xml/xmlcommand.ml
index 0f55481c32..906cf8b078 100644
--- a/contrib/xml/xmlcommand.ml
+++ b/contrib/xml/xmlcommand.ml
@@ -694,7 +694,7 @@ let pp_cmds_of_inner_types inner_types target_uri =
 let print sp fn =
  let module D = Declarations in
  let module G = Global in
- let module N = Names in
+ let module N = Nametab in
  let module T = Term in
  let module X = Xml in
   let (_,id) = N.repr_qualid sp in
diff --git a/contrib/xml/xmlcommand.mli b/contrib/xml/xmlcommand.mli
index 827cb34f64..1c9b22070a 100644
--- a/contrib/xml/xmlcommand.mli
+++ b/contrib/xml/xmlcommand.mli
@@ -21,7 +21,7 @@
 (* Note: it is printed only (and directly) the most cooked available      *)
 (*       form of the definition (all the parameters are                   *)
 (*       lambda-abstracted, but the object can still refer to variables)  *)
-val print : Names.qualid -> string option -> unit
+val print : Nametab.qualid -> string option -> unit
 
 (* show dest                                                  *)
 (*  where dest is either None (for stdout) or (Some filename) *)