From 984729ba3016a1fd4b371edef71fcb8b7f3956b4 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 16 Jul 2012 08:44:32 +0000 Subject: [PATCH] * bignum.c (rb_big_float_cmp): support fixnum for argument x. * numeric.c (fix_equal): use rb_big_float_cmp. (fix_cmp): ditto. (fix_gt): ditto. (fix_ge): ditto. (fix_lt): ditto. (fix_le): ditto. (flo_eq): ditto. (flo_cmp): use rb_big_float_cmp for fixnum argument. (flo_gt): ditto. (flo_ge): ditto. (flo_lt): ditto. (flo_le): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 17 +++++++++++++++++ bignum.c | 10 ++++++++++ numeric.c | 38 +++++++++++++------------------------- 3 files changed, 40 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c05db7d57..411717a77c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +Mon Jul 16 17:29:45 2012 Tanaka Akira + + * bignum.c (rb_big_float_cmp): support fixnum for argument x. + + * numeric.c (fix_equal): use rb_big_float_cmp. + (fix_cmp): ditto. + (fix_gt): ditto. + (fix_ge): ditto. + (fix_lt): ditto. + (fix_le): ditto. + (flo_eq): ditto. + (flo_cmp): use rb_big_float_cmp for fixnum argument. + (flo_gt): ditto. + (flo_ge): ditto. + (flo_lt): ditto. + (flo_le): ditto. + Mon Jul 16 17:05:53 2012 Ayumu AIZAWA * test/fileutils/test_fileutils.rb: add test for FileUtils#uptodate? diff --git a/bignum.c b/bignum.c index 592c8f88ce..32dace5d6f 100644 --- a/bignum.c +++ b/bignum.c @@ -1436,10 +1436,20 @@ rb_big_float_cmp(VALUE x, VALUE y) { double a = RFLOAT_VALUE(y); + if (isnan(a)) + return Qnil; if (isinf(a)) { if (a > 0.0) return INT2FIX(-1); else return INT2FIX(1); } + if (FIXNUM_P(x)) { + double xd = (double)FIX2LONG(x); + if (xd < a) + return INT2FIX(-1); + if (xd > a) + return INT2FIX(1); + return INT2FIX(0); + } return rb_dbl_cmp(rb_big2dbl(x), a); } diff --git a/numeric.c b/numeric.c index cf4fc3f181..29d7f38978 100644 --- a/numeric.c +++ b/numeric.c @@ -1054,11 +1054,8 @@ flo_eq(VALUE x, VALUE y) switch (TYPE(y)) { case T_FIXNUM: - b = (double)FIX2LONG(y); - break; case T_BIGNUM: - b = rb_big2dbl(y); - break; + return rb_big_float_cmp(y, x) == INT2FIX(0) ? Qtrue : Qfalse; case T_FLOAT: b = RFLOAT_VALUE(y); #if defined(_MSC_VER) && _MSC_VER < 1300 @@ -1124,9 +1121,6 @@ flo_cmp(VALUE x, VALUE y) if (isnan(a)) return Qnil; switch (TYPE(y)) { case T_FIXNUM: - b = (double)FIX2LONG(y); - break; - case T_BIGNUM: { VALUE rel = rb_big_float_cmp(y, x); @@ -1169,9 +1163,6 @@ flo_gt(VALUE x, VALUE y) a = RFLOAT_VALUE(x); switch (TYPE(y)) { case T_FIXNUM: - b = (double)FIX2LONG(y); - break; - case T_BIGNUM: { VALUE rel = rb_big_float_cmp(y, x); @@ -1212,9 +1203,6 @@ flo_ge(VALUE x, VALUE y) a = RFLOAT_VALUE(x); switch (TYPE(y)) { case T_FIXNUM: - b = (double)FIX2LONG(y); - break; - case T_BIGNUM: { VALUE rel = rb_big_float_cmp(y, x); @@ -1254,9 +1242,6 @@ flo_lt(VALUE x, VALUE y) a = RFLOAT_VALUE(x); switch (TYPE(y)) { case T_FIXNUM: - b = (double)FIX2LONG(y); - break; - case T_BIGNUM: { VALUE rel = rb_big_float_cmp(y, x); @@ -1297,9 +1282,6 @@ flo_le(VALUE x, VALUE y) a = RFLOAT_VALUE(x); switch (TYPE(y)) { case T_FIXNUM: - b = (double)FIX2LONG(y); - break; - case T_BIGNUM: { VALUE rel = rb_big_float_cmp(y, x); @@ -2965,7 +2947,7 @@ fix_equal(VALUE x, VALUE y) case T_BIGNUM: return rb_big_eq(y, x); case T_FLOAT: - return (double)FIX2LONG(x) == RFLOAT_VALUE(y) ? Qtrue : Qfalse; + return rb_big_float_cmp(x, y) == INT2FIX(0) ? Qtrue : Qfalse; default: return num_equal(x, y); } @@ -2993,7 +2975,7 @@ fix_cmp(VALUE x, VALUE y) case T_BIGNUM: return rb_big_cmp(rb_int2big(FIX2LONG(x)), y); case T_FLOAT: - return rb_dbl_cmp((double)FIX2LONG(x), RFLOAT_VALUE(y)); + return rb_big_float_cmp(x, y); default: return rb_num_coerce_cmp(x, y, rb_intern("<=>")); } @@ -3018,7 +3000,7 @@ fix_gt(VALUE x, VALUE y) case T_BIGNUM: return FIX2INT(rb_big_cmp(rb_int2big(FIX2LONG(x)), y)) > 0 ? Qtrue : Qfalse; case T_FLOAT: - return (double)FIX2LONG(x) > RFLOAT_VALUE(y) ? Qtrue : Qfalse; + return rb_big_float_cmp(x, y) == INT2FIX(1) ? Qtrue : Qfalse; default: return rb_num_coerce_relop(x, y, '>'); } @@ -3043,7 +3025,10 @@ fix_ge(VALUE x, VALUE y) case T_BIGNUM: return FIX2INT(rb_big_cmp(rb_int2big(FIX2LONG(x)), y)) >= 0 ? Qtrue : Qfalse; case T_FLOAT: - return (double)FIX2LONG(x) >= RFLOAT_VALUE(y) ? Qtrue : Qfalse; + { + VALUE rel = rb_big_float_cmp(x, y); + return rel == INT2FIX(1) || rel == INT2FIX(0) ? Qtrue : Qfalse; + } default: return rb_num_coerce_relop(x, y, rb_intern(">=")); } @@ -3068,7 +3053,7 @@ fix_lt(VALUE x, VALUE y) case T_BIGNUM: return FIX2INT(rb_big_cmp(rb_int2big(FIX2LONG(x)), y)) < 0 ? Qtrue : Qfalse; case T_FLOAT: - return (double)FIX2LONG(x) < RFLOAT_VALUE(y) ? Qtrue : Qfalse; + return rb_big_float_cmp(x, y) == INT2FIX(-1) ? Qtrue : Qfalse; default: return rb_num_coerce_relop(x, y, '<'); } @@ -3093,7 +3078,10 @@ fix_le(VALUE x, VALUE y) case T_BIGNUM: return FIX2INT(rb_big_cmp(rb_int2big(FIX2LONG(x)), y)) <= 0 ? Qtrue : Qfalse; case T_FLOAT: - return (double)FIX2LONG(x) <= RFLOAT_VALUE(y) ? Qtrue : Qfalse; + { + VALUE rel = rb_big_float_cmp(x, y); + return rel == INT2FIX(-1) || rel == INT2FIX(0) ? Qtrue : Qfalse; + } default: return rb_num_coerce_relop(x, y, rb_intern("<=")); }