- Typing -> Safe_typing

 - proofs/Typing_ev -> pretyping/Typing
 - env -> sign
 - fonctions var_context


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

4 files changed, 6 insertions, 5 deletions

diff --git a/library/declare.ml b/library/declare.ml
index 5d7d62412..0dcdf3dd2 100644
--- a/library/declare.ml
+++ b/library/declare.ml
@@ -213,7 +213,7 @@ let global_operator sp id =
 let global_reference kind id =
   let sp = Nametab.sp_of_id kind id in
   let (oper,_) = global_operator sp id in
-  let hyps = get_globals (Global.context ()) in
+  let hyps = Global.var_context () in
   let ids = ids_of_sign hyps in
   DOPN(oper, Array.of_list (List.map (fun id -> VAR id) ids))
 
diff --git a/library/global.ml b/library/global.ml
index 9238b6e85..0fc1852cb 100644
--- a/library/global.ml
+++ b/library/global.ml
@@ -6,7 +6,7 @@ open Generic
 open Term
 open Instantiate
 open Sign
-open Typing
+open Safe_typing
 open Summary
 
 (* We introduce here the global environment of the system, and we declare it
@@ -28,6 +28,7 @@ let _ =
 
 let universes () = universes !global_env
 let context () = context !global_env
+let var_context () = var_context !global_env
 
 let push_var idc = global_env := push_var idc !global_env
 let push_rel nac = global_env := push_rel nac !global_env
diff --git a/library/global.mli b/library/global.mli
index 22623424b..3e557b350 100644
--- a/library/global.mli
+++ b/library/global.mli
@@ -9,7 +9,7 @@ open Sign
 open Constant
 open Inductive
 open Environ
-open Typing
+open Safe_typing
 (*i*)
 
 (* This module defines the global environment of Coq. 
@@ -21,6 +21,7 @@ val unsafe_env : unit -> unsafe_env
 
 val universes : unit -> universes
 val context : unit -> context
+val var_context : unit -> var_context
 
 val push_var : identifier * constr -> unit
 val push_rel : name * constr -> unit
diff --git a/library/impargs.ml b/library/impargs.ml
index a8fe59cc8..8fe93b97c 100644
--- a/library/impargs.ml
+++ b/library/impargs.ml
@@ -7,7 +7,6 @@ open Term
 open Reduction
 open Constant
 open Inductive
-open Typing
 
 type implicits =
   | Impl_auto of int list
@@ -18,7 +17,7 @@ let implicit_args = ref false
 
 let auto_implicits ty =
   if !implicit_args then
-    let genv = unsafe_env_of_env (Global.env()) in
+    let genv = Global.unsafe_env() in
     Impl_auto (poly_args genv Evd.empty ty)
   else
     No_impl