1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* bignum.c (rb_integer_float_eq): new function.

Browse Source 
(rb_big_eq): use rb_integer_float_eq.

* internal.h (rb_integer_float_eq): declared.

* numeric.c (flo_eq): use rb_integer_float_eq.
  (fix_equal): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2012-07-16 10:39:42 +00:00
parent 858a832d40
commit 04f09ef8a1
4 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Mon Jul 16 19:24:01 2012 Tanaka Akira <akr@fsij.org>
* bignum.c (rb_integer_float_eq): new function.
(rb_big_eq): use rb_integer_float_eq.
* internal.h (rb_integer_float_eq): declared.
* numeric.c (flo_eq): use rb_integer_float_eq.
(fix_equal): ditto.
Mon Jul 16 19:02:31 2012 Tanaka Akira <akr@fsij.org> Mon Jul 16 19:02:31 2012 Tanaka Akira <akr@fsij.org>
* bignum.c (rb_integer_float_cmp): rename a local variable. * bignum.c (rb_integer_float_cmp): rename a local variable.

34
bignum.c
View File

@ -1481,6 +1481,38 @@ rb_integer_float_cmp(VALUE x, VALUE y)
return INT2FIX(-1); return INT2FIX(-1);
} }
VALUE
rb_integer_float_eq(VALUE x, VALUE y)
{
double yd = RFLOAT_VALUE(y);
double yi, yf;
if (isnan(yd) || isinf(yd))
return Qfalse;
yf = modf(yd, &yi);
if (yf != 0)
return Qfalse;
if (FIXNUM_P(x)) {
#if SIZEOF_LONG * CHAR_BIT < DBL_MANT_DIG /* assume FLT_RADIX == 2 */
double xd = (double)FIX2LONG(x);
if (xd != yd)
return Qfalse;
return Qtrue;
#else
long xl, yl;
if (yi < LONG_MIN || LONG_MAX < yi)
return Qfalse;
xl = FIX2LONG(x);
yl = (long)yi;
if (xl != yl)
return Qfalse;
return Qtrue;
#endif
}
y = rb_dbl2big(yi);
return rb_big_eq(x, y);
}
/* /*
* call-seq: * call-seq:
* big <=> numeric -> -1, 0, +1 or nil * big <=> numeric -> -1, 0, +1 or nil
@ -1654,7 +1686,7 @@ rb_big_eq(VALUE x, VALUE y)
case T_BIGNUM: case T_BIGNUM:
break; break;
case T_FLOAT: case T_FLOAT:
return rb_integer_float_cmp(x, y) == INT2FIX(0) ? Qtrue : Qfalse; return rb_integer_float_eq(x, y);
default: default:
return rb_equal(y, x); return rb_equal(y, x);
} }

1
internal.h
View File

@ -50,6 +50,7 @@ VALUE rb_ary_cat(VALUE, const VALUE *, long);
VALUE rb_big_fdiv(VALUE x, VALUE y); VALUE rb_big_fdiv(VALUE x, VALUE y);
VALUE rb_big_uminus(VALUE x); VALUE rb_big_uminus(VALUE x);
VALUE rb_integer_float_cmp(VALUE x, VALUE y); VALUE rb_integer_float_cmp(VALUE x, VALUE y);
VALUE rb_integer_float_eq(VALUE x, VALUE y);
/* class.c */ /* class.c */
VALUE rb_obj_methods(int argc, VALUE *argv, VALUE obj); VALUE rb_obj_methods(int argc, VALUE *argv, VALUE obj);

4
numeric.c
View File

@ -1055,7 +1055,7 @@ flo_eq(VALUE x, VALUE y)
switch (TYPE(y)) { switch (TYPE(y)) {
case T_FIXNUM: case T_FIXNUM:
case T_BIGNUM: case T_BIGNUM:
return rb_integer_float_cmp(y, x) == INT2FIX(0) ? Qtrue : Qfalse; return rb_integer_float_eq(y, x);
case T_FLOAT: case T_FLOAT:
b = RFLOAT_VALUE(y); b = RFLOAT_VALUE(y);
#if defined(_MSC_VER) && _MSC_VER < 1300 #if defined(_MSC_VER) && _MSC_VER < 1300
@ -2947,7 +2947,7 @@ fix_equal(VALUE x, VALUE y)
case T_BIGNUM: case T_BIGNUM:
return rb_big_eq(y, x); return rb_big_eq(y, x);
case T_FLOAT: case T_FLOAT:
return rb_integer_float_cmp(x, y) == INT2FIX(0) ? Qtrue : Qfalse; return rb_integer_float_eq(x, y);
default: default:
return num_equal(x, y); return num_equal(x, y);
} }