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: preserve encoding

Browse source 
* numeric.c (coerce_failed): preserve encoding of error message.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-01-15 08:16:37 +00:00
parent 5f3e675bdf
commit 2c65cdd319
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
numeric.c
View file

@ -232,17 +232,19 @@ coerce_body(VALUE *x)
return rb_funcall(x[1], id_coerce, 1, x[0]); return rb_funcall(x[1], id_coerce, 1, x[0]);
} }
NORETURN(static void coerce_failed(VALUE x, VALUE y));
static void
coerce_failed(VALUE x, VALUE 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));
}
static VALUE static VALUE
coerce_rescue(VALUE *x) coerce_rescue(VALUE *x)
{ {
volatile VALUE v = rb_inspect(x[1]); coerce_failed(x[0], x[1]);
rb_raise(rb_eTypeError, "%s can't be coerced into %s",
rb_special_const_p(x[1])?
RSTRING_PTR(v):
rb_obj_classname(x[1]),
rb_obj_classname(x[0]));
return Qnil; /* dummy */ return Qnil; /* dummy */
} }
@ -3261,11 +3263,7 @@ bit_coerce(VALUE *x, VALUE *y, int err)
if (!FIXNUM_P(*x) && !RB_TYPE_P(*x, T_BIGNUM) if (!FIXNUM_P(*x) && !RB_TYPE_P(*x, T_BIGNUM)
&& !FIXNUM_P(*y) && !RB_TYPE_P(*y, T_BIGNUM)) { && !FIXNUM_P(*y) && !RB_TYPE_P(*y, T_BIGNUM)) {
if (!err) return FALSE; if (!err) return FALSE;
rb_raise(rb_eTypeError, coerce_failed(*x, *y);
"%s can't be coerced into %s for bitwise arithmetic",
rb_special_const_p(*y) ?
RSTRING_PTR(rb_inspect(*y)) : rb_obj_classname(*y),
rb_obj_classname(*x));
} }
} }
return TRUE; return TRUE;

5
test/ruby/test_numeric.rb
View file

@ -19,6 +19,11 @@ class TestNumeric < Test::Unit::TestCase
assert_raise_with_message(TypeError, /can't be coerced into /) {1&:foo} assert_raise_with_message(TypeError, /can't be coerced into /) {1&:foo}
assert_raise_with_message(TypeError, /can't be coerced into /) {1|:foo} assert_raise_with_message(TypeError, /can't be coerced into /) {1|:foo}
assert_raise_with_message(TypeError, /can't be coerced into /) {1^:foo} assert_raise_with_message(TypeError, /can't be coerced into /) {1^:foo}
assert_raise_with_message(TypeError, /:\u{3042}/) {1+:"\u{3042}"}
assert_raise_with_message(TypeError, /:\u{3042}/) {1&:"\u{3042}"}
assert_raise_with_message(TypeError, /:\u{3042}/) {1|:"\u{3042}"}
assert_raise_with_message(TypeError, /:\u{3042}/) {1^:"\u{3042}"}
end end
def test_dummynumeric def test_dummynumeric