kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* numeric.c (bit_coerce): remove constant parameter `err'

Browse source 
(always TRUE) of bit_coerce().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46374 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eregon 2014-06-07 09:16:21 +00:00
parent 3acff92b2b
commit ea7ce3096e
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Jun 7 18:15:33 2014 Benoit Daloze <eregontp@gmail.com>
* numeric.c (bit_coerce): remove constant parameter `err'
(always TRUE) of bit_coerce().
Sat Jun 7 16:01:57 2014 Yutaka Kanemoto <kanemoto@ruby-lang.org>
* cont.c (rb_fiber_struct): keep context.uc_stack.ss_sp and context.uc_stack.ss_size

13
numeric.c
View file

@ -3407,13 +3407,12 @@ fix_rev(VALUE num)
}
static int
bit_coerce(VALUE *x, VALUE *y, int err)
bit_coerce(VALUE *x, VALUE *y)
{
if (!FIXNUM_P(*y) && !RB_TYPE_P(*y, T_BIGNUM)) {
do_coerce(x, y, err);
do_coerce(x, y, TRUE);
if (!FIXNUM_P(*x) && !RB_TYPE_P(*x, T_BIGNUM)
&& !FIXNUM_P(*y) && !RB_TYPE_P(*y, T_BIGNUM)) {
if (!err) return FALSE;
coerce_failed(*x, *y);
}
}
@ -3423,7 +3422,7 @@ bit_coerce(VALUE *x, VALUE *y, int err)
VALUE
rb_num_coerce_bit(VALUE x, VALUE y, ID func)
{
bit_coerce(&x, &y, TRUE);
bit_coerce(&x, &y);
return rb_funcall(x, func, 1, y);
}
@ -3446,7 +3445,7 @@ fix_and(VALUE x, VALUE y)
return rb_big_and(y, x);
}
bit_coerce(&x, &y, TRUE);
bit_coerce(&x, &y);
return rb_funcall(x, rb_intern("&"), 1, y);
}
@ -3469,7 +3468,7 @@ fix_or(VALUE x, VALUE y)
return rb_big_or(y, x);
}
bit_coerce(&x, &y, TRUE);
bit_coerce(&x, &y);
return rb_funcall(x, rb_intern("|"), 1, y);
}
@ -3492,7 +3491,7 @@ fix_xor(VALUE x, VALUE y)
return rb_big_xor(y, x);
}
bit_coerce(&x, &y, TRUE);
bit_coerce(&x, &y);
return rb_funcall(x, rb_intern("^"), 1, y);
}