renommage de min/max

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

1 files changed, 23 insertions, 21 deletions

diff --git a/stdlib/int64.ml b/stdlib/int64.ml
index 7dd519304..84d4d02a0 100644
--- a/stdlib/int64.ml
+++ b/stdlib/int64.ml
@@ -14,24 +14,24 @@
 
 (* Module [Int64]: 64-bit integers *)
 
-external neg: int64 -> int64 = "%int64_neg"
-external add: int64 -> int64 -> int64 = "%int64_add"
-external sub: int64 -> int64 -> int64 = "%int64_sub"
-external mul: int64 -> int64 -> int64 = "%int64_mul"
-external div: int64 -> int64 -> int64 = "%int64_div"
-external rem: int64 -> int64 -> int64 = "%int64_mod"
-external logand: int64 -> int64 -> int64 = "%int64_and"
-external logor: int64 -> int64 -> int64 = "%int64_or"
-external logxor: int64 -> int64 -> int64 = "%int64_xor"
-external shift_left: int64 -> int -> int64 = "%int64_lsl"
-external shift_right: int64 -> int -> int64 = "%int64_asr"
-external shift_right_logical: int64 -> int -> int64 = "%int64_lsr"
-external of_int: int -> int64 = "%int64_of_int"
-external to_int: int64 -> int = "%int64_to_int"
-external of_int32: int32 -> int64 = "%int64_of_int32"
-external to_int32: int64 -> int32 = "%int64_to_int32"
-external of_nativeint: nativeint -> int64 = "%int64_of_nativeint"
-external to_nativeint: int64 -> nativeint = "%int64_to_nativeint"
+external neg : int64 -> int64 = "%int64_neg"
+external add : int64 -> int64 -> int64 = "%int64_add"
+external sub : int64 -> int64 -> int64 = "%int64_sub"
+external mul : int64 -> int64 -> int64 = "%int64_mul"
+external div : int64 -> int64 -> int64 = "%int64_div"
+external rem : int64 -> int64 -> int64 = "%int64_mod"
+external logand : int64 -> int64 -> int64 = "%int64_and"
+external logor : int64 -> int64 -> int64 = "%int64_or"
+external logxor : int64 -> int64 -> int64 = "%int64_xor"
+external shift_left : int64 -> int -> int64 = "%int64_lsl"
+external shift_right : int64 -> int -> int64 = "%int64_asr"
+external shift_right_logical : int64 -> int -> int64 = "%int64_lsr"
+external of_int : int -> int64 = "%int64_of_int"
+external to_int : int64 -> int = "%int64_to_int"
+external of_int32 : int32 -> int64 = "%int64_of_int32"
+external to_int32 : int64 -> int32 = "%int64_to_int32"
+external of_nativeint : nativeint -> int64 = "%int64_of_nativeint"
+external to_nativeint : int64 -> nativeint = "%int64_to_nativeint"
 
 let zero = try of_int 0 with Invalid_argument _ -> Obj.magic Int32.zero
 let one = try of_int 1 with Invalid_argument _ -> Obj.magic Int32.one
@@ -39,11 +39,13 @@ let minus_one = try of_int (-1) with Invalid_argument _ -> Obj.magic Int32.minus
 let succ n = add n one
 let pred n = sub n one
 let abs n = if n >= zero then n else neg n
-let min = try shift_left one 63 with Invalid_argument _ -> Obj.magic Int32.min
-let max = try sub min one with Invalid_argument _ -> Obj.magic Int32.max
+let min_int =
+  try shift_left one 63 with Invalid_argument _ -> Obj.magic Int32.min_int
+let max_int =
+  try sub min_int one with Invalid_argument _ -> Obj.magic Int32.max_int
 let lognot n = logxor n minus_one
 
 external format : string -> int64 -> string = "int64_format"
 let to_string n = format "%d" n
 
-external of_string: string -> int64 = "int64_of_string"
+external of_string : string -> int64 = "int64_of_string"