ruby-changes:24354
From: akr <ko1@a...>
Date: Mon, 16 Jul 2012 18:41:41 +0900 (JST)
Subject: [ruby-changes:24354] akr:r36405 (trunk): * bignum.c (rb_integer_float_cmp): renamed from rb_big_float_cmp.
akr 2012-07-16 18:41:25 +0900 (Mon, 16 Jul 2012) New Revision: 36405 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36405 Log: * bignum.c (rb_integer_float_cmp): renamed from rb_big_float_cmp. * internal.h: follow the above change. * numeric.c: ditto. Modified files: trunk/ChangeLog trunk/bignum.c trunk/internal.h trunk/numeric.c Index: ChangeLog =================================================================== --- ChangeLog (revision 36404) +++ ChangeLog (revision 36405) @@ -1,3 +1,11 @@ +Mon Jul 16 18:40:26 2012 Tanaka Akira <akr@f...> + + * bignum.c (rb_integer_float_cmp): renamed from rb_big_float_cmp. + + * internal.h: follow the above change. + + * numeric.c: ditto. + Mon Jul 16 17:57:54 2012 Tanaka Akira <akr@f...> * bignum.c (rb_big_float_cmp): compare an integer and float precisely. Index: numeric.c =================================================================== --- numeric.c (revision 36404) +++ numeric.c (revision 36405) @@ -1055,7 +1055,7 @@ switch (TYPE(y)) { case T_FIXNUM: case T_BIGNUM: - return rb_big_float_cmp(y, x) == INT2FIX(0) ? Qtrue : Qfalse; + return rb_integer_float_cmp(y, x) == INT2FIX(0) ? Qtrue : Qfalse; case T_FLOAT: b = RFLOAT_VALUE(y); #if defined(_MSC_VER) && _MSC_VER < 1300 @@ -1123,7 +1123,7 @@ case T_FIXNUM: case T_BIGNUM: { - VALUE rel = rb_big_float_cmp(y, x); + VALUE rel = rb_integer_float_cmp(y, x); if (FIXNUM_P(rel)) return INT2FIX(-FIX2INT(rel)); return rel; @@ -1165,7 +1165,7 @@ case T_FIXNUM: case T_BIGNUM: { - VALUE rel = rb_big_float_cmp(y, x); + VALUE rel = rb_integer_float_cmp(y, x); if (FIXNUM_P(rel)) return -FIX2INT(rel) > 0 ? Qtrue : Qfalse; return Qfalse; @@ -1205,7 +1205,7 @@ case T_FIXNUM: case T_BIGNUM: { - VALUE rel = rb_big_float_cmp(y, x); + VALUE rel = rb_integer_float_cmp(y, x); if (FIXNUM_P(rel)) return -FIX2INT(rel) >= 0 ? Qtrue : Qfalse; return Qfalse; @@ -1244,7 +1244,7 @@ case T_FIXNUM: case T_BIGNUM: { - VALUE rel = rb_big_float_cmp(y, x); + VALUE rel = rb_integer_float_cmp(y, x); if (FIXNUM_P(rel)) return -FIX2INT(rel) < 0 ? Qtrue : Qfalse; return Qfalse; @@ -1284,7 +1284,7 @@ case T_FIXNUM: case T_BIGNUM: { - VALUE rel = rb_big_float_cmp(y, x); + VALUE rel = rb_integer_float_cmp(y, x); if (FIXNUM_P(rel)) return -FIX2INT(rel) <= 0 ? Qtrue : Qfalse; return Qfalse; @@ -2947,7 +2947,7 @@ case T_BIGNUM: return rb_big_eq(y, x); case T_FLOAT: - return rb_big_float_cmp(x, y) == INT2FIX(0) ? Qtrue : Qfalse; + return rb_integer_float_cmp(x, y) == INT2FIX(0) ? Qtrue : Qfalse; default: return num_equal(x, y); } @@ -2975,7 +2975,7 @@ case T_BIGNUM: return rb_big_cmp(rb_int2big(FIX2LONG(x)), y); case T_FLOAT: - return rb_big_float_cmp(x, y); + return rb_integer_float_cmp(x, y); default: return rb_num_coerce_cmp(x, y, rb_intern("<=>")); } @@ -3000,7 +3000,7 @@ case T_BIGNUM: return FIX2INT(rb_big_cmp(rb_int2big(FIX2LONG(x)), y)) > 0 ? Qtrue : Qfalse; case T_FLOAT: - return rb_big_float_cmp(x, y) == INT2FIX(1) ? Qtrue : Qfalse; + return rb_integer_float_cmp(x, y) == INT2FIX(1) ? Qtrue : Qfalse; default: return rb_num_coerce_relop(x, y, '>'); } @@ -3026,7 +3026,7 @@ return FIX2INT(rb_big_cmp(rb_int2big(FIX2LONG(x)), y)) >= 0 ? Qtrue : Qfalse; case T_FLOAT: { - VALUE rel = rb_big_float_cmp(x, y); + VALUE rel = rb_integer_float_cmp(x, y); return rel == INT2FIX(1) || rel == INT2FIX(0) ? Qtrue : Qfalse; } default: @@ -3053,7 +3053,7 @@ case T_BIGNUM: return FIX2INT(rb_big_cmp(rb_int2big(FIX2LONG(x)), y)) < 0 ? Qtrue : Qfalse; case T_FLOAT: - return rb_big_float_cmp(x, y) == INT2FIX(-1) ? Qtrue : Qfalse; + return rb_integer_float_cmp(x, y) == INT2FIX(-1) ? Qtrue : Qfalse; default: return rb_num_coerce_relop(x, y, '<'); } @@ -3079,7 +3079,7 @@ return FIX2INT(rb_big_cmp(rb_int2big(FIX2LONG(x)), y)) <= 0 ? Qtrue : Qfalse; case T_FLOAT: { - VALUE rel = rb_big_float_cmp(x, y); + VALUE rel = rb_integer_float_cmp(x, y); return rel == INT2FIX(-1) || rel == INT2FIX(0) ? Qtrue : Qfalse; } default: Index: internal.h =================================================================== --- internal.h (revision 36404) +++ internal.h (revision 36405) @@ -49,7 +49,7 @@ /* bignum.c */ VALUE rb_big_fdiv(VALUE x, VALUE y); VALUE rb_big_uminus(VALUE x); -VALUE rb_big_float_cmp(VALUE x, VALUE y); +VALUE rb_integer_float_cmp(VALUE x, VALUE y); /* class.c */ VALUE rb_obj_methods(int argc, VALUE *argv, VALUE obj); Index: bignum.c =================================================================== --- bignum.c (revision 36404) +++ bignum.c (revision 36405) @@ -1432,7 +1432,7 @@ } VALUE -rb_big_float_cmp(VALUE x, VALUE y) +rb_integer_float_cmp(VALUE x, VALUE y) { double a = RFLOAT_VALUE(y); double yi, yf; @@ -1506,7 +1506,7 @@ break; case T_FLOAT: - return rb_big_float_cmp(x, y); + return rb_integer_float_cmp(x, y); default: return rb_num_coerce_cmp(x, y, rb_intern("<=>")); @@ -1549,7 +1549,7 @@ break; case T_FLOAT: - rel = rb_big_float_cmp(x, y); + rel = rb_integer_float_cmp(x, y); break; default: @@ -1654,7 +1654,7 @@ case T_BIGNUM: break; case T_FLOAT: - return rb_big_float_cmp(x, y) == INT2FIX(0) ? Qtrue : Qfalse; + return rb_integer_float_cmp(x, y) == INT2FIX(0) ? Qtrue : Qfalse; default: return rb_equal(y, x); } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/