Trying to turn .cvsignore into .svnignore.

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

27 files changed, 80 insertions, 12 deletions

diff --git a/.cvsignore b/.cvsignore
index 76ae30ef37..73e4ed6f98 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,8 @@
+## after changing, run "svn propset svn:ignore -F .cvsignore -R ."
 .cvsignore
 .depend
+*.cm*
+*.o
 configure
 ocamlc
 ocamlc.opt
diff --git a/asmcomp/.cvsignore b/asmcomp/.cvsignore
index 31d00178a0..ecab0a1d1c 100644
--- a/asmcomp/.cvsignore
+++ b/asmcomp/.cvsignore
@@ -1,3 +1,6 @@
+## after changing, run "svn propset svn:ignore -F .svnignore ."
+*.cm*
+*.o
 emit.ml
 arch.ml
 proc.ml
diff --git a/asmrun/.cvsignore b/asmrun/.cvsignore
index 55f30ceded..d1b58765ac 100644
--- a/asmrun/.cvsignore
+++ b/asmrun/.cvsignore
@@ -1,3 +1,4 @@
+## after changing, run "svn propset svn:ignore -F .cvsignore ."
 main.c
 misc.c
 freelist.c
diff --git a/boot/.cvsignore b/boot/.cvsignore
index a0a2356c9a..2737706f1a 100644
--- a/boot/.cvsignore
+++ b/boot/.cvsignore
@@ -1,3 +1,5 @@
+*.cm*
+*.o
 Saved
 ocamlrun
 ocamlyacc
diff --git a/boot/ocamlc b/boot/ocamlc
index 82e9a3d555..d2cb7bf13a 100755
--- a/boot/ocamlc
+++ b/boot/ocamlc
diff --git a/bytecomp/.cvsignore b/bytecomp/.cvsignore
index d2f18a85a9..cc4b18ba3d 100644
--- a/bytecomp/.cvsignore
+++ b/bytecomp/.cvsignore
@@ -1,2 +1,5 @@
+## after changing, run "svn propset svn:ignore -F .cvsignore -R ."
 runtimedef.ml
 opcodes.ml
+*.cm*
+*.o
diff --git a/config/.cvsignore b/config/.cvsignore
index df99fdc719..4f63d5524f 100644
--- a/config/.cvsignore
+++ b/config/.cvsignore
@@ -1,3 +1,4 @@
+## after changing, run "svn propset svn:ignore -F .cvsignore ."
 m.h
 s.h
 Makefile
diff --git a/debugger/.cvsignore b/debugger/.cvsignore
index b608cf5532..c70b2d6fd9 100644
--- a/debugger/.cvsignore
+++ b/debugger/.cvsignore
@@ -1,3 +1,5 @@
+*.cm*
+*.o
 lexer.ml
 parser.ml
 parser.mli
diff --git a/lex/.cvsignore b/lex/.cvsignore
index 9f4f308da4..a5ff520af5 100644
--- a/lex/.cvsignore
+++ b/lex/.cvsignore
@@ -1,3 +1,5 @@
+*.cm*
+*.o
 parser.ml
 parser.mli
 lexer.ml
diff --git a/ocamldoc/.cvsignore b/ocamldoc/.cvsignore
index 720ee641a5..114e13404c 100644
--- a/ocamldoc/.cvsignore
+++ b/ocamldoc/.cvsignore
@@ -1,3 +1,5 @@
+*.cm*
+*.o
 ocamldoc
 ocamldoc.opt
 odoc_crc.ml
diff --git a/otherlibs/dynlink/.cvsignore b/otherlibs/dynlink/.cvsignore
index 5ea9775e1d..45484bdd94 100644
--- a/otherlibs/dynlink/.cvsignore
+++ b/otherlibs/dynlink/.cvsignore
@@ -1 +1,3 @@
+*.cm*
+*.o
 extract_crc
diff --git a/otherlibs/labltk/browser/.cvsignore b/otherlibs/labltk/browser/.cvsignore
index 8ced21de22..b4ef8bac90 100644
--- a/otherlibs/labltk/browser/.cvsignore
+++ b/otherlibs/labltk/browser/.cvsignore
@@ -1,2 +1,4 @@
+*.cm*
+*.o
 ocamlbrowser
 dummy.mli
diff --git a/otherlibs/labltk/camltk/.cvsignore b/otherlibs/labltk/camltk/.cvsignore
index 585067641e..026bf5f5aa 100644
--- a/otherlibs/labltk/camltk/.cvsignore
+++ b/otherlibs/labltk/camltk/.cvsignore
@@ -1,3 +1,8 @@
-*.ml *.mli labltktop labltk
+*.cm*
+*.o
+*.ml
+*.mli
+labltktop
+labltk
 modules
 .depend
diff --git a/otherlibs/labltk/compiler/.cvsignore b/otherlibs/labltk/compiler/.cvsignore
index 060114e624..1bca65e181 100644
--- a/otherlibs/labltk/compiler/.cvsignore
+++ b/otherlibs/labltk/compiler/.cvsignore
@@ -1,3 +1,5 @@
+*.cm*
+*.o
 lexer.ml
 parser.output
 parser.ml
diff --git a/otherlibs/labltk/labltk/.cvsignore b/otherlibs/labltk/labltk/.cvsignore
index 585067641e..026bf5f5aa 100644
--- a/otherlibs/labltk/labltk/.cvsignore
+++ b/otherlibs/labltk/labltk/.cvsignore
@@ -1,3 +1,8 @@
-*.ml *.mli labltktop labltk
+*.cm*
+*.o
+*.ml
+*.mli
+labltktop
+labltk
 modules
 .depend
diff --git a/otherlibs/labltk/lib/.cvsignore b/otherlibs/labltk/lib/.cvsignore
index 80df4415f0..fc095875c3 100644
--- a/otherlibs/labltk/lib/.cvsignore
+++ b/otherlibs/labltk/lib/.cvsignore
@@ -1,4 +1,9 @@
-labltktop labltk mltktop mltk
+*.cm*
+*.o
+labltktop
+labltk
+mltktop
+mltk
 .depend
 *.ml
 *.mli
diff --git a/otherlibs/systhreads/.cvsignore b/otherlibs/systhreads/.cvsignore
index b175e39d68..af116217e2 100644
--- a/otherlibs/systhreads/.cvsignore
+++ b/otherlibs/systhreads/.cvsignore
@@ -1,3 +1,5 @@
+*.cm*
+*.o
 *.x
 thread.ml
 so_locations
diff --git a/otherlibs/threads/.cvsignore b/otherlibs/threads/.cvsignore
index fb2df562de..37c13a8412 100644
--- a/otherlibs/threads/.cvsignore
+++ b/otherlibs/threads/.cvsignore
@@ -1,3 +1,5 @@
+*.cm*
+*.o
 marshal.mli
 pervasives.mli
 unix.mli
diff --git a/otherlibs/unix/.cvsignore b/otherlibs/unix/.cvsignore
index 074dd28a45..9e08463dab 100644
--- a/otherlibs/unix/.cvsignore
+++ b/otherlibs/unix/.cvsignore
@@ -1 +1,3 @@
+*.cm*
+*.o
 so_locations
diff --git a/parsing/.cvsignore b/parsing/.cvsignore
index 5602bf8a2d..ae7610a1bb 100644
--- a/parsing/.cvsignore
+++ b/parsing/.cvsignore
@@ -1,3 +1,5 @@
+*.cm*
+*.o
 parser.ml
 parser.mli
 lexer.ml
diff --git a/stdlib/.cvsignore b/stdlib/.cvsignore
index 343f6abd6a..2a20e6be2a 100644
--- a/stdlib/.cvsignore
+++ b/stdlib/.cvsignore
@@ -1,6 +1,9 @@
+## after changing, run "svn propset svn:ignore -F .cvsignore -R ."
 camlheader
 camlheader_ur
 labelled-*
 caml
 *.annot
 sys.ml
+*.cm*
+*.o
diff --git a/typing/builtin.ml b/typing/builtin.ml
index 19e1e68416..0a43460ebd 100644
--- a/typing/builtin.ml
+++ b/typing/builtin.ml
@@ -149,8 +149,8 @@ let build_initial_env add_type add_exception empty_env =
 
 let builtin_values =
   List.map (fun id -> Ident.make_global id; (Ident.name id, id))
-      [ident_match_failure; ident_out_of_memory; ident_stack_overflow;
-       ident_invalid_argument;
-       ident_failure; ident_not_found; ident_sys_error; ident_end_of_file;
-       ident_division_by_zero; ident_sys_blocked_io;
-       ident_assert_failure; ident_undefined_recursive_module ]
+    [ ident_match_failure; ident_out_of_memory; ident_stack_overflow;
+      ident_invalid_argument;
+      ident_failure; ident_not_found; ident_sys_error; ident_end_of_file;
+      ident_division_by_zero; ident_sys_blocked_io;
+      ident_assert_failure; ident_undefined_recursive_module; ]
diff --git a/typing/env.ml b/typing/env.ml
index a6c32a78ab..cf39908404 100644
--- a/typing/env.ml
+++ b/typing/env.ml
@@ -95,9 +95,7 @@ let empty = {
 let diff_keys is_local tbl1 tbl2 =
   let keys2 = Ident.keys tbl2 in
   List.filter
-    (fun id ->
-      is_local (Ident.find_same id tbl2) &&
-      try ignore (Ident.find_same id tbl1); false with Not_found -> true)
+    (fun id -> is_local (Ident.find_same id tbl2) && Ident.mem id tbl1)
     keys2
 
 let is_ident = function
diff --git a/typing/ident.ml b/typing/ident.ml
index 89a343c31e..c5728804cc 100644
--- a/typing/ident.ml
+++ b/typing/ident.ml
@@ -150,6 +150,22 @@ let rec find_stamp s = function
   | Some k ->
       if k.ident.stamp = s then k.data else find_stamp s k.previous
 
+let rec mem_stamp s = function
+  | None ->
+      false
+  | Some k ->
+      k.ident.stamp = s || mem_stamp s k.previous
+
+let rec mem id = function
+  | Empty -> false
+  | Node(l, k, r, _) ->
+      let c = compare id.name k.ident.name in
+      if c = 0 then
+        id.stamp = k.ident.stamp ||
+        mem_stamp id.stamp k.previous
+      else
+        mem id (if c < 0 then l else r)
+
 let rec find_same id = function
     Empty ->
       raise Not_found
diff --git a/typing/ident.mli b/typing/ident.mli
index 486fc64082..5e18c61039 100644
--- a/typing/ident.mli
+++ b/typing/ident.mli
@@ -54,6 +54,7 @@ type 'a tbl
 
 val empty: 'a tbl
 val add: t -> 'a -> 'a tbl -> 'a tbl
+val mem: t -> 'a tbl -> bool
 val find_same: t -> 'a tbl -> 'a
 val find_name: string -> 'a tbl -> 'a
 val keys: 'a tbl -> t list
diff --git a/typing/typecore.ml b/typing/typecore.ml
index 6c5762c85b..7f29007320 100644
--- a/typing/typecore.ml
+++ b/typing/typecore.ml
@@ -554,7 +554,7 @@ let find_constructor_qualifier env clauses =
     | Ppat_lazy spat -> find_qualifier_spat spat
     (* Rem:
        For real completeness, we could also treat all other cases of
-       patterns, but this would also add complexity to the function
+       patterns, but this would also add some complexity to the function
        rewrite_ppat_desc; is it worth the burden ?
 
        For instance, if we admit that we only propagate the qualification of
diff --git a/utils/.cvsignore b/utils/.cvsignore
index 25b6d3bc86..ce69773aeb 100644
--- a/utils/.cvsignore
+++ b/utils/.cvsignore
@@ -1 +1,3 @@
+*.cm*
+*.o
 config.ml