ruby-changes:4259
From: ko1@a...
Date: Tue, 11 Mar 2008 19:50:33 +0900 (JST)
Subject: [ruby-changes:4259] nobu - Ruby:r15749 (trunk, ruby_1_8): * numeric.c (fix_coerce): try conversion before type check.
nobu 2008-03-11 19:48:12 +0900 (Tue, 11 Mar 2008) New Revision: 15749 Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/numeric.c trunk/ChangeLog trunk/numeric.c Log: * numeric.c (fix_coerce): try conversion before type check. [ruby-core:15838] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/numeric.c?r1=15749&r2=15748&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15749&r2=15748&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15749&r2=15748&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/numeric.c?r1=15749&r2=15748&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 15748) +++ ChangeLog (revision 15749) @@ -1,3 +1,8 @@ +Tue Mar 11 19:48:09 2008 Nobuyoshi Nakada <nobu@r...> + + * numeric.c (fix_coerce): try conversion before type check. + [ruby-core:15838] + Tue Mar 11 12:39:53 2008 Nobuyoshi Nakada <nobu@r...> * common.mk (clean-local): WINMAINOBJ is Windows specific. Index: numeric.c =================================================================== --- numeric.c (revision 15748) +++ numeric.c (revision 15749) @@ -1493,6 +1493,7 @@ SIGNED_VALUE rb_num2long(VALUE val) { + again: if (NIL_P(val)) { rb_raise(rb_eTypeError, "no implicit conversion from nil to integer"); } @@ -1519,7 +1520,7 @@ default: val = rb_to_int(val); - return NUM2LONG(val); + goto again; } } @@ -2593,6 +2594,15 @@ return LONG2NUM(val); } +static VALUE +fix_coerce(VALUE x) +{ + while (!FIXNUM_P(x) && TYPE(x) != T_BIGNUM) { + x = rb_to_int(x); + } + return x; +} + /* * call-seq: * fix & other => integer @@ -2605,10 +2615,10 @@ { long val; - if (TYPE(y) == T_BIGNUM) { + if (!FIXNUM_P(y = fix_coerce(y))) { return rb_big_and(y, x); } - val = FIX2LONG(x) & NUM2LONG(y); + val = FIX2LONG(x) & FIX2LONG(y); return LONG2NUM(val); } @@ -2624,10 +2634,10 @@ { long val; - if (TYPE(y) == T_BIGNUM) { + if (!FIXNUM_P(y = fix_coerce(y))) { return rb_big_or(y, x); } - val = FIX2LONG(x) | NUM2LONG(y); + val = FIX2LONG(x) | FIX2LONG(y); return LONG2NUM(val); } @@ -2643,10 +2653,10 @@ { long val; - if (TYPE(y) == T_BIGNUM) { + if (!FIXNUM_P(y = fix_coerce(y))) { return rb_big_xor(y, x); } - val = FIX2LONG(x) ^ NUM2LONG(y); + val = FIX2LONG(x) ^ FIX2LONG(y); return LONG2NUM(val); } @@ -2740,7 +2750,7 @@ long val = FIX2LONG(fix); long i; - if (TYPE(idx) == T_BIGNUM) { + if (!FIXNUM_P(idx = fix_coerce(idx))) { idx = rb_big_norm(idx); if (!FIXNUM_P(idx)) { if (!RBIGNUM_SIGN(idx) || val >= 0) @@ -2748,7 +2758,7 @@ return INT2FIX(1); } } - i = NUM2LONG(idx); + i = FIX2LONG(idx); if (i < 0) return INT2FIX(0); if (SIZEOF_LONG*CHAR_BIT-1 < i) { Index: ruby_1_8/numeric.c =================================================================== --- ruby_1_8/numeric.c (revision 15748) +++ ruby_1_8/numeric.c (revision 15749) @@ -1538,6 +1538,7 @@ rb_num2long(val) VALUE val; { + again: if (NIL_P(val)) { rb_raise(rb_eTypeError, "no implicit conversion from nil to integer"); } @@ -1564,7 +1565,7 @@ default: val = rb_to_int(val); - return NUM2LONG(val); + goto again; } } @@ -2531,6 +2532,16 @@ return LONG2NUM(val); } +static VALUE +fix_coerce(x) + VALUE x; +{ + while (!FIXNUM_P(x) && TYPE(x) != T_BIGNUM) { + x = rb_to_int(x); + } + return x; +} + /* * call-seq: * fix & other => integer @@ -2544,10 +2555,10 @@ { long val; - if (TYPE(y) == T_BIGNUM) { + if (!FIXNUM_P(y = fix_coerce(y))) { return rb_big_and(y, x); } - val = FIX2LONG(x) & NUM2LONG(y); + val = FIX2LONG(x) & FIX2LONG(y); return LONG2NUM(val); } @@ -2564,10 +2575,10 @@ { long val; - if (TYPE(y) == T_BIGNUM) { + if (!FIXNUM_P(y = fix_coerce(y))) { return rb_big_or(y, x); } - val = FIX2LONG(x) | NUM2LONG(y); + val = FIX2LONG(x) | FIX2LONG(y); return LONG2NUM(val); } @@ -2584,10 +2595,10 @@ { long val; - if (TYPE(y) == T_BIGNUM) { + if (!FIXNUM_P(y = fix_coerce(y))) { return rb_big_xor(y, x); } - val = FIX2LONG(x) ^ NUM2LONG(y); + val = FIX2LONG(x) ^ FIX2LONG(y); return LONG2NUM(val); } @@ -2686,7 +2697,7 @@ long val = FIX2LONG(fix); long i; - if (TYPE(idx) == T_BIGNUM) { + if (!FIXNUM_P(idx = fix_coerce(idx))) { idx = rb_big_norm(idx); if (!FIXNUM_P(idx)) { if (!RBIGNUM(idx)->sign || val >= 0) @@ -2694,7 +2705,7 @@ return INT2FIX(1); } } - i = NUM2LONG(idx); + i = FIX2LONG(idx); if (i < 0) return INT2FIX(0); if (sizeof(VALUE)*CHAR_BIT-1 < i) { Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 15748) +++ ruby_1_8/ChangeLog (revision 15749) @@ -1,3 +1,8 @@ +Tue Mar 11 19:48:09 2008 Nobuyoshi Nakada <nobu@r...> + + * numeric.c (fix_coerce): try conversion before type check. + [ruby-core:15838] + Tue Mar 11 17:03:23 2008 Nobuyoshi Nakada <nobu@r...> * lib/delegate.rb (Delegator#initialize, DelegateClass): skip correct -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/