diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | class.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_keyword.rb | 15 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 27 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Sun Oct 26 03:21:30 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] + Wed Oct 22 23:02:49 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * ext/openssl/lib/openssl/ssl.rb (DEFAULT_PARAMS): override @@ -1876,10 +1876,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 e7bd11b18b..13bac278f2 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -505,4 +505,19 @@ class TestKeywordArguments < Test::Unit::TestCase tap { prc.call } }, bug8964 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 @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.4" -#define RUBY_RELEASE_DATE "2014-10-22" -#define RUBY_PATCHLEVEL 262 +#define RUBY_RELEASE_DATE "2014-10-26" +#define RUBY_PATCHLEVEL 263 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 26 #include "ruby/version.h" |