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

* bignum.c (rb_big_and): bit-wise operation should not take float

Browse Source 
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
This commit is contained in:
matz 2008-05-08 09:18:47 +00:00
parent b745b792e6
commit 65b55c26a1
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Thu May 8 18:14:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* 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.
Thu May 8 17:44:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu May 8 17:44:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk, ext/extmk.rb, lib/mkmf.rb: use absolute path for RUBYOPT. * common.mk, ext/extmk.rb, lib/mkmf.rb: use absolute path for RUBYOPT.

18
bignum.c
View File

@ -2152,6 +2152,18 @@ rb_big_pow(VALUE x, VALUE y)
return DOUBLE2NUM(pow(rb_big2dbl(x), d)); 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: * call-seq:
* big & numeric => integer * big & numeric => integer
@ -2168,7 +2180,7 @@ rb_big_and(VALUE xx, VALUE yy)
char sign; char sign;
x = xx; x = xx;
y = rb_to_int(yy); y = bit_coerce(yy);
if (FIXNUM_P(y)) { if (FIXNUM_P(y)) {
y = rb_int2big(FIX2LONG(y)); y = rb_int2big(FIX2LONG(y));
} }
@ -2223,7 +2235,7 @@ rb_big_or(VALUE xx, VALUE yy)
char sign; char sign;
x = xx; x = xx;
y = rb_to_int(yy); y = bit_coerce(yy);
if (FIXNUM_P(y)) { if (FIXNUM_P(y)) {
y = rb_int2big(FIX2LONG(y)); y = rb_int2big(FIX2LONG(y));
} }
@ -2281,7 +2293,7 @@ rb_big_xor(VALUE xx, VALUE yy)
char sign; char sign;
x = xx; x = xx;
y = rb_to_int(yy); y = bit_coerce(yy);
if (FIXNUM_P(y)) { if (FIXNUM_P(y)) {
y = rb_int2big(FIX2LONG(y)); y = rb_int2big(FIX2LONG(y));
} }