From 55bb1486306dff90e5f4b31f0cc4693d305f861b Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Thu, 6 Nov 1997 17:28:16 +0000
Subject: [PATCH] Retour au code d'origine pour List.iter.  Je veux un seul
 test par iteration, dammit. Suppression de dependances spurieuses dans Array
 et String.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1756 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 stdlib/.depend   | 8 ++++----
 stdlib/array.ml  | 4 ++--
 stdlib/list.ml   | 3 +--
 stdlib/string.ml | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/stdlib/.depend b/stdlib/.depend
index c2d720fe6..a0ec34ad6 100644
--- a/stdlib/.depend
+++ b/stdlib/.depend
@@ -2,8 +2,8 @@ genlex.cmi: stream.cmi
 parsing.cmi: lexing.cmi obj.cmi 
 arg.cmo: array.cmi list.cmi printf.cmi string.cmi sys.cmi arg.cmi 
 arg.cmx: array.cmx list.cmx printf.cmx string.cmx sys.cmx arg.cmi 
-array.cmo: array.cmi list.cmi array.cmi 
-array.cmx: array.cmx list.cmx array.cmi 
+array.cmo: list.cmi array.cmi 
+array.cmx: list.cmx array.cmi 
 callback.cmo: obj.cmi callback.cmi 
 callback.cmx: obj.cmx callback.cmi 
 char.cmo: char.cmi 
@@ -56,8 +56,8 @@ stack.cmo: list.cmi stack.cmi
 stack.cmx: list.cmx stack.cmi 
 stream.cmo: list.cmi obj.cmi string.cmi stream.cmi 
 stream.cmx: list.cmx obj.cmx string.cmx stream.cmi 
-string.cmo: char.cmi list.cmi string.cmi string.cmi 
-string.cmx: char.cmx list.cmx string.cmx string.cmi 
+string.cmo: char.cmi list.cmi string.cmi 
+string.cmx: char.cmx list.cmx string.cmi 
 sys.cmo: sys.cmi 
 sys.cmx: sys.cmi 
 weak.cmo: obj.cmi weak.cmi 
diff --git a/stdlib/array.ml b/stdlib/array.ml
index f6477d1f9..8aef73b8d 100644
--- a/stdlib/array.ml
+++ b/stdlib/array.ml
@@ -140,14 +140,14 @@ let of_list = function
 
 let fold_left f x a =
   let r = ref x in
-  for i = 0 to Array.length a - 1 do
+  for i = 0 to length a - 1 do
     r := f !r (unsafe_get a i)
   done;
   !r
 
 let fold_right f a x =
   let r = ref x in
-  for i = Array.length a - 1 downto 0 do
+  for i = length a - 1 downto 0 do
     r := f (unsafe_get a i) !r
   done;
   !r
diff --git a/stdlib/list.ml b/stdlib/list.ml
index 8cacd1707..bd7041961 100644
--- a/stdlib/list.ml
+++ b/stdlib/list.ml
@@ -52,8 +52,7 @@ let rec map f = function
   | a::l -> let r = f a in r :: map f l
 
 let rec iter f = function
-  | [] -> ()
-  | [a] -> f a
+    [] -> ()
   | a::l -> f a; iter f l
 
 let rec fold_left f accu l =
diff --git a/stdlib/string.ml b/stdlib/string.ml
index 145901c0e..2b2e3e972 100644
--- a/stdlib/string.ml
+++ b/stdlib/string.ml
@@ -138,7 +138,7 @@ let capitalize s = apply1 Char.uppercase s
 let uncapitalize s = apply1 Char.lowercase s
 
 let rec index_from s i c =
-  if i >= String.length s then raise Not_found
+  if i >= length s then raise Not_found
   else if s.[i] = c then i
   else index_from s (i+1) c
 
@@ -149,4 +149,4 @@ let rec rindex_from s i c =
   else if s.[i] = c then i
   else rindex_from s (i-1) c
 
-let rindex s c = rindex_from s (String.length s - 1) c
+let rindex s c = rindex_from s (length s - 1) c