* internal.h (rb_big_float_cmp): declared.

* bignum.c (rb_big_float_cmp): extracted from rb_big_cmp and big_op.
  (rb_big_cmp): use rb_big_float_cmp.
  (big_op): ditto.

* numeric.c (flo_cmp): use rb_big_float_cmp.
  (flo_gt): ditto.
  (flo_ge): ditto.
  (flo_lt): ditto.
  (flo_le): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 30 insertions, 14 deletions

diff --git a/numeric.c b/numeric.c
index 42e923fe5a..cf4fc3f181 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1128,12 +1128,12 @@ flo_cmp(VALUE x, VALUE y)
 	break;
 
       case T_BIGNUM:
-	if (isinf(a)) {
-	    if (a > 0.0) return INT2FIX(1);
-	    else return INT2FIX(-1);
-	}
-	b = rb_big2dbl(y);
-	break;
+      {
+        VALUE rel = rb_big_float_cmp(y, x);
+        if (FIXNUM_P(rel))
+            return INT2FIX(-FIX2INT(rel));
+        return rel;
+      }
 
       case T_FLOAT:
 	b = RFLOAT_VALUE(y);
@@ -1173,8 +1173,12 @@ flo_gt(VALUE x, VALUE y)
 	break;
 
       case T_BIGNUM:
-	b = rb_big2dbl(y);
-	break;
+      {
+        VALUE rel = rb_big_float_cmp(y, x);
+        if (FIXNUM_P(rel))
+            return -FIX2INT(rel) > 0 ? Qtrue : Qfalse;
+        return Qfalse;
+      }
 
       case T_FLOAT:
 	b = RFLOAT_VALUE(y);
@@ -1212,8 +1216,12 @@ flo_ge(VALUE x, VALUE y)
 	break;
 
       case T_BIGNUM:
-	b = rb_big2dbl(y);
-	break;
+      {
+        VALUE rel = rb_big_float_cmp(y, x);
+        if (FIXNUM_P(rel))
+            return -FIX2INT(rel) >= 0 ? Qtrue : Qfalse;
+        return Qfalse;
+      }
 
       case T_FLOAT:
 	b = RFLOAT_VALUE(y);
@@ -1250,8 +1258,12 @@ flo_lt(VALUE x, VALUE y)
 	break;
 
       case T_BIGNUM:
-	b = rb_big2dbl(y);
-	break;
+      {
+        VALUE rel = rb_big_float_cmp(y, x);
+        if (FIXNUM_P(rel))
+            return -FIX2INT(rel) < 0 ? Qtrue : Qfalse;
+        return Qfalse;
+      }
 
       case T_FLOAT:
 	b = RFLOAT_VALUE(y);
@@ -1289,8 +1301,12 @@ flo_le(VALUE x, VALUE y)
 	break;
 
       case T_BIGNUM:
-	b = rb_big2dbl(y);
-	break;
+      {
+        VALUE rel = rb_big_float_cmp(y, x);
+        if (FIXNUM_P(rel))
+            return -FIX2INT(rel) <= 0 ? Qtrue : Qfalse;
+        return Qfalse;
+      }
 
       case T_FLOAT:
 	b = RFLOAT_VALUE(y);