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

merge revision(s) 49224,49234,49235: [Backport #10711]

Browse source 
* numeric.c (bit_coerce): use original value for error message
	  [ruby-core:67405] [Bug #10711]

	* test/ruby/test_numeric.rb (test_coerce): check error message


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-01-17 16:00:11 +00:00
parent 3892141722
commit 636f191933
5 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Jan 18 00:59:41 2015 Eric Wong <e@80x24.org>
* numeric.c (bit_coerce): use original value for error message
[ruby-core:67405] [Bug #10711]
* test/ruby/test_numeric.rb (test_coerce): check error message
Sun Jan 18 00:53:38 2015 Seiei Higa <hanachin@gmail.com>
* vm_method.c (rb_alias): raise a NameError when creating alias to

2
compar.c
View file

@ -20,7 +20,7 @@ rb_cmperr(VALUE x, VALUE y)
{
VALUE classname;
if (SPECIAL_CONST_P(y)) {
if (SPECIAL_CONST_P(y) || BUILTIN_TYPE(y) == T_FLOAT) {
classname = rb_inspect(y);
}
else {

12
numeric.c
View file

@ -237,9 +237,14 @@ NORETURN(static void coerce_failed(VALUE x, VALUE y));
static void
coerce_failed(VALUE x, VALUE y)
{
if (SPECIAL_CONST_P(y) || BUILTIN_TYPE(y) == T_FLOAT) {
y = rb_inspect(y);
}
else {
y = rb_obj_class(y);
}
rb_raise(rb_eTypeError, "%"PRIsVALUE" can't be coerced into %"PRIsVALUE,
(rb_special_const_p(y)? rb_inspect(y) : rb_obj_class(y)),
rb_obj_class(x));
y, rb_obj_class(x));
}
static VALUE
@ -3426,10 +3431,11 @@ static int
bit_coerce(VALUE *x, VALUE *y)
{
if (!FIXNUM_P(*y) && !RB_TYPE_P(*y, T_BIGNUM)) {
VALUE orig = *x;
do_coerce(x, y, TRUE);
if (!FIXNUM_P(*x) && !RB_TYPE_P(*x, T_BIGNUM)
&& !FIXNUM_P(*y) && !RB_TYPE_P(*y, T_BIGNUM)) {
coerce_failed(*x, *y);
coerce_failed(orig, *y);
}
}
return TRUE;

4
test/ruby/test_numeric.rb
View file

@ -32,6 +32,10 @@ class TestNumeric < Test::Unit::TestCase
assert_raise_with_message(TypeError, /:"\\u3042"/) {1|:"\u{3042}"}
assert_raise_with_message(TypeError, /:"\\u3042"/) {1^:"\u{3042}"}
end
bug10711 = '[ruby-core:67405] [Bug #10711]'
exp = "Float can't be coerced into Fixnum"
assert_raise_with_message(TypeError, exp, bug10711) { 1 & 1.2 }
end
def test_dummynumeric

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2015-01-18"
#define RUBY_PATCHLEVEL 25
#define RUBY_PATCHLEVEL 26
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1