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) r44610,r44617:

Browse source 
numeric.c: preserve encoding

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-08-03 15:50:33 +00:00
parent 1760861c0d
commit fe45e6b79c
3 changed files with 28 additions and 16 deletions
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]);
}
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
coerce_rescue(VALUE *x)
{
volatile VALUE v = rb_inspect(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]));
coerce_failed(x[0], x[1]);
return Qnil; /* dummy */
}
@ -3297,11 +3299,7 @@ bit_coerce(VALUE *x, VALUE *y, int err)
if (!FIXNUM_P(*x) && !RB_TYPE_P(*x, T_BIGNUM)
&& !FIXNUM_P(*y) && !RB_TYPE_P(*y, T_BIGNUM)) {
if (!err) return FALSE;
rb_raise(rb_eTypeError,
"%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));
coerce_failed(*x, *y);
}
}
return TRUE;

14
test/ruby/test_numeric.rb
View file

@ -1,4 +1,5 @@
require 'test/unit'
require_relative 'envutil'
class TestNumeric < Test::Unit::TestCase
class DummyNumeric < Numeric
@ -14,6 +15,19 @@ class TestNumeric < Test::Unit::TestCase
assert_equal(Float, b.class)
assert_raise(TypeError) { -Numeric.new }
EnvUtil.with_default_external(Encoding::UTF_8) do
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
EnvUtil.with_default_external(Encoding::US_ASCII) do
assert_raise_with_message(TypeError, /:"\\u3042"/) {1+:"\u{3042}"}
assert_raise_with_message(TypeError, /:"\\u3042"/) {1&:"\u{3042}"}
assert_raise_with_message(TypeError, /:"\\u3042"/) {1|:"\u{3042}"}
assert_raise_with_message(TypeError, /:"\\u3042"/) {1^:"\u{3042}"}
end
end
def test_dummynumeric

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-08-03"
#define RUBY_PATCHLEVEL 188
#define RUBY_RELEASE_DATE "2014-08-04"
#define RUBY_PATCHLEVEL 189
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 8
#define RUBY_RELEASE_DAY 3
#define RUBY_RELEASE_DAY 4
#include "ruby/version.h"