merge from HEADmultimatch

git-svn-id: http://caml.inria.fr/svn/ocaml/branches/multimatch@5563 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 9 insertions, 0 deletions

diff --git a/typing/ident.ml b/typing/ident.ml
index afa589bad6..8997600d51 100644
--- a/typing/ident.ml
+++ b/typing/ident.ml
@@ -35,6 +35,8 @@ let name i = i.name
 
 let unique_name i = i.name ^ "_" ^ string_of_int i.stamp
 
+let unique_toplevel_name i = i.name ^ "/" ^ string_of_int i.stamp
+
 let persistent i = (i.stamp = 0)
 
 let equal i1 i2 = i1.name = i2.name
@@ -50,6 +52,13 @@ let binding_time i = i.stamp
 let current_time() = !currentstamp
 let set_current_time t = currentstamp := max !currentstamp t
 
+let reinit_level = ref (-1)
+
+let reinit () = 
+  if !reinit_level < 0
+  then reinit_level := !currentstamp
+  else currentstamp := !reinit_level
+
 let hide i =
   { i with stamp = -1 }