From 858a832d40845a951e2cf01c0482e7d7014a8c81 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 16 Jul 2012 10:02:59 +0000 Subject: [PATCH] * bignum.c (rb_integer_float_cmp): rename a local variable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ bignum.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index eed0c7b213..0edab34843 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Jul 16 19:02:31 2012 Tanaka Akira + + * bignum.c (rb_integer_float_cmp): rename a local variable. + Mon Jul 16 18:40:26 2012 Tanaka Akira * bignum.c (rb_integer_float_cmp): renamed from rb_big_float_cmp. diff --git a/bignum.c b/bignum.c index fae923b5c9..45c1784c53 100644 --- a/bignum.c +++ b/bignum.c @@ -1434,23 +1434,23 @@ rb_big_to_f(VALUE x) VALUE rb_integer_float_cmp(VALUE x, VALUE y) { - double a = RFLOAT_VALUE(y); + double yd = RFLOAT_VALUE(y); double yi, yf; VALUE rel; - if (isnan(a)) + if (isnan(yd)) return Qnil; - if (isinf(a)) { - if (a > 0.0) return INT2FIX(-1); + if (isinf(yd)) { + if (yd > 0.0) return INT2FIX(-1); else return INT2FIX(1); } - yf = modf(a, &yi); + yf = modf(yd, &yi); if (FIXNUM_P(x)) { #if SIZEOF_LONG * CHAR_BIT < DBL_MANT_DIG /* assume FLT_RADIX == 2 */ double xd = (double)FIX2LONG(x); - if (xd < a) + if (xd < yd) return INT2FIX(-1); - if (xd > a) + if (xd > yd) return INT2FIX(1); return INT2FIX(0); #else