summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Scherer <gabriel.scherer@gmail.com>2014-12-21 12:06:20 +0000
committerGabriel Scherer <gabriel.scherer@gmail.com>2014-12-21 12:06:20 +0000
commit511cef67703f47b8534dd437729875eeec18cd24 (patch)
treeddb18112293c12dc3cda7e03e02d56d986ccdbd4
parent9cf8686210cd713879d57e039f23387ba9a80237 (diff)
PR#6494 backtrack: revert the new 'equal' functions from Num and Big_int
We already have eq_num and eq_big_int. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15733 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--Changes2
-rw-r--r--otherlibs/num/big_int.ml2
-rw-r--r--otherlibs/num/big_int.mli2
-rw-r--r--otherlibs/num/num.ml2
-rw-r--r--otherlibs/num/num.mli4
5 files changed, 1 insertions, 11 deletions
diff --git a/Changes b/Changes
index 07ede2f26..6225bf8ea 100644
--- a/Changes
+++ b/Changes
@@ -30,7 +30,7 @@ Runtime system:
Standard library:
* PR#6494: Add equal function in modules
- Big_int, Bytes, Char, Digest, Int32, Int64, Nativeint, Num and String
+ Bytes, Char, Digest, Int32, Int64, Nativeint, and String
(Romain Calascibetta)
- PR#6577: improve performance of %L, %l, %n, %S, %C format specifiers
(Alain Frisch)
diff --git a/otherlibs/num/big_int.ml b/otherlibs/num/big_int.ml
index 36e40f4dd..847d15832 100644
--- a/otherlibs/num/big_int.ml
+++ b/otherlibs/num/big_int.ml
@@ -70,8 +70,6 @@ let compare_big_int bi1 bi2 =
compare_nat (bi2.abs_value) 0 (num_digits_big_int bi2)
(bi1.abs_value) 0 (num_digits_big_int bi1)
-let equal bi1 bi2 = compare_big_int bi1 bi2 = 0
-
let eq_big_int bi1 bi2 = compare_big_int bi1 bi2 = 0
and le_big_int bi1 bi2 = compare_big_int bi1 bi2 <= 0
and ge_big_int bi1 bi2 = compare_big_int bi1 bi2 >= 0
diff --git a/otherlibs/num/big_int.mli b/otherlibs/num/big_int.mli
index 09f451420..738730a79 100644
--- a/otherlibs/num/big_int.mli
+++ b/otherlibs/num/big_int.mli
@@ -86,8 +86,6 @@ val compare_big_int : big_int -> big_int -> int
(** [compare_big_int a b] returns [0] if [a] and [b] are equal,
[1] if [a] is greater than [b], and [-1] if [a] is smaller
than [b]. *)
-val equal : big_int -> big_int -> bool
- (** The equal function for big ints. @since 4.03.0 *)
val eq_big_int : big_int -> big_int -> bool
val le_big_int : big_int -> big_int -> bool
val ge_big_int : big_int -> big_int -> bool
diff --git a/otherlibs/num/num.ml b/otherlibs/num/num.ml
index 67cc16c0b..67499e267 100644
--- a/otherlibs/num/num.ml
+++ b/otherlibs/num/num.ml
@@ -330,8 +330,6 @@ and le_num num1 num2 = compare_num num1 num2 <= 0
and gt_num num1 num2 = compare_num num1 num2 > 0
and ge_num num1 num2 = compare_num num1 num2 >= 0
-let equal a b = compare_num a b = 0
-
let ( </ ) = lt_num
and ( <=/ ) = le_num
and ( >/ ) = gt_num
diff --git a/otherlibs/num/num.mli b/otherlibs/num/num.mli
index a43929ef2..6425085e6 100644
--- a/otherlibs/num/num.mli
+++ b/otherlibs/num/num.mli
@@ -129,10 +129,6 @@ val compare_num : num -> num -> int
(** Return [-1], [0] or [1] if the first argument is less than,
equal to, or greater than the second argument. *)
-val equal : num -> num -> bool
-(** The equal function for nums.
- @since 4.03.0 *)
-
val max_num : num -> num -> num
(** Return the greater of the two arguments. *)