diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | class.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_keyword.rb | 15 |
3 files changed, 24 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Oct 23 03:41:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * class.c (unknown_keyword_error): delete expected keywords + directly from raw table, so that the given block is not called. + [ruby-core:65837] [Bug #10413] + Thu Oct 23 02:33:01 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * common.mk (update-unicode): invert dependency to run every times. @@ -1881,10 +1881,12 @@ NORETURN(static void unknown_keyword_error(VALUE hash, const ID *table, int keyw static void unknown_keyword_error(VALUE hash, const ID *table, int keywords) { + st_table *tbl = rb_hash_tbl_raw(hash); VALUE keys; int i; for (i = 0; i < keywords; i++) { - rb_hash_delete(hash, ID2SYM(table[i])); + st_data_t key = ID2SYM(table[i]); + st_delete(tbl, &key, NULL); } keys = rb_funcall(hash, rb_intern("keys"), 0, 0); if (!RB_TYPE_P(keys, T_ARRAY)) rb_raise(rb_eArgError, "unknown keyword"); diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index 6e9cd2dbfe..95cbcc209c 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -514,4 +514,19 @@ class TestKeywordArguments < Test::Unit::TestCase assert_nothing_raised(bug) {eval("def a(hoge:); end")} end; end + + def test_unknown_keyword_with_block + bug10413 = '[ruby-core:65837] [Bug #10413]' + class << (o = Object.new) + def bar(k2: 'v2') + end + + def foo + bar(k1: 1) + end + end + assert_raise_with_message(ArgumentError, /unknown keyword: k1/, bug10413) { + o.foo {raise "unreachable"} + } + end end |