diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-08 09:18:47 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-08 09:18:47 +0000 |
commit | 65b55c26a15d1b7bf3387e7f31a44f0a669431d0 (patch) | |
tree | e73e20bfbe0db0d7dfe3e8fe662fab41d5fc785f /bignum.c | |
parent | b745b792e6ed67a714bad1604968947d95f1dbf7 (diff) |
* bignum.c (rb_big_and): bit-wise operation should not take float
values. [ruby-dev:34612]
* bignum.c (rb_big_or): ditto.
* bignum.c (rb_big_xor): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16335 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bignum.c')
-rw-r--r-- | bignum.c | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -2152,6 +2152,18 @@ rb_big_pow(VALUE x, VALUE y) return DOUBLE2NUM(pow(rb_big2dbl(x), d)); } +static VALUE +bit_coerce(VALUE x) +{ + while (!FIXNUM_P(x) && TYPE(x) != T_BIGNUM) { + if (TYPE(x) == T_FLOAT) { + rb_raise(rb_eTypeError, "can't convert Float into Integer"); + } + x = rb_to_int(x); + } + return x; +} + /* * call-seq: * big & numeric => integer @@ -2168,7 +2180,7 @@ rb_big_and(VALUE xx, VALUE yy) char sign; x = xx; - y = rb_to_int(yy); + y = bit_coerce(yy); if (FIXNUM_P(y)) { y = rb_int2big(FIX2LONG(y)); } @@ -2223,7 +2235,7 @@ rb_big_or(VALUE xx, VALUE yy) char sign; x = xx; - y = rb_to_int(yy); + y = bit_coerce(yy); if (FIXNUM_P(y)) { y = rb_int2big(FIX2LONG(y)); } @@ -2281,7 +2293,7 @@ rb_big_xor(VALUE xx, VALUE yy) char sign; x = xx; - y = rb_to_int(yy); + y = bit_coerce(yy); if (FIXNUM_P(y)) { y = rb_int2big(FIX2LONG(y)); } |