From 2116da4220acde3fdf11ac0ef0100e0166729bcd Mon Sep 17 00:00:00 2001 From: Pierre Weis Date: Thu, 28 Dec 2000 13:07:42 +0000 Subject: Getting rid of obsolete boolean operators & and or git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3359 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02 --- stdlib/array.ml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'stdlib/array.ml') diff --git a/stdlib/array.ml b/stdlib/array.ml index 58e3f7ed9..38d99c066 100644 --- a/stdlib/array.ml +++ b/stdlib/array.ml @@ -84,7 +84,7 @@ let concat al = in find_init al let sub a ofs len = - if ofs < 0 or len < 0 or ofs + len > length a then invalid_arg "Array.sub" + if ofs < 0 || len < 0 || ofs + len > length a then invalid_arg "Array.sub" else if len = 0 then [||] else begin let r = create len (unsafe_get a ofs) in @@ -93,13 +93,13 @@ let sub a ofs len = end let fill a ofs len v = - if ofs < 0 or len < 0 or ofs + len > length a + if ofs < 0 || len < 0 || ofs + len > length a then invalid_arg "Array.fill" else for i = ofs to ofs + len - 1 do unsafe_set a i v done let blit a1 ofs1 a2 ofs2 len = - if len < 0 or ofs1 < 0 or ofs1 + len > length a1 - or ofs2 < 0 or ofs2 + len > length a2 + if len < 0 || ofs1 < 0 || ofs1 + len > length a1 + || ofs2 < 0 || ofs2 + len > length a2 then invalid_arg "Array.blit" else if ofs1 < ofs2 then (* Top-down copy *) -- cgit v1.2.3-70-g09d2