diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | numeric.c | 3 | ||||
| -rw-r--r-- | test/ruby/test_numeric.rb | 4 |
3 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Jan 12 18:35:44 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 Jan 12 18:01:24 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with @@ -3426,10 +3426,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; diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb index e818d52e3f..9c5d762602 100644 --- a/test/ruby/test_numeric.rb +++ b/test/ruby/test_numeric.rb @@ -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 |