diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | compar.c | 2 | ||||
-rw-r--r-- | numeric.c | 3 | ||||
-rw-r--r-- | test/ruby/test_numeric.rb | 4 | ||||
-rw-r--r-- | version.h | 6 |
5 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Tue Jun 30 11:56:24 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 + Mon Jun 29 13:22:14 2015 Shota Fukumori <her@sorah.jp> * ext/objspace/objspace_dump.c(dump_object): Return empty JSON object when @@ -20,7 +20,7 @@ rb_cmperr(VALUE x, VALUE y) { const char *classname; - if (SPECIAL_CONST_P(y)) { + if (SPECIAL_CONST_P(y) || BUILTIN_TYPE(y) == T_FLOAT) { y = rb_inspect(y); classname = StringValuePtr(y); } @@ -3299,11 +3299,12 @@ static int bit_coerce(VALUE *x, VALUE *y, int err) { if (!FIXNUM_P(*y) && !RB_TYPE_P(*y, T_BIGNUM)) { + VALUE orig = *x; do_coerce(x, y, err); 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); + coerce_failed(orig, *y); } } return TRUE; diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb index 0e70078bad..98fabc4e13 100644 --- a/test/ruby/test_numeric.rb +++ b/test/ruby/test_numeric.rb @@ -28,6 +28,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 = "1.2 can't be coerced into Fixnum" + assert_raise_with_message(TypeError, exp, bug10711) { 1 & 1.2 } end def test_dummynumeric @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.7" -#define RUBY_RELEASE_DATE "2015-06-29" -#define RUBY_PATCHLEVEL 368 +#define RUBY_RELEASE_DATE "2015-06-30" +#define RUBY_PATCHLEVEL 369 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 29 +#define RUBY_RELEASE_DAY 30 #include "ruby/version.h" |