diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | class.c | 7 | ||||
| -rw-r--r-- | test/ruby/test_keyword.rb | 2 | ||||
| -rw-r--r-- | vm_insnhelper.c | 14 |
4 files changed, 23 insertions, 8 deletions
@@ -1,3 +1,11 @@ +Sun Dec 8 16:19:28 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * class.c (rb_get_kwargs): if optional is negative, unknown + keywords are allowed. + + * vm_insnhelper.c (vm_callee_setup_keyword_arg): check unknown + keywords. + Sun Dec 8 14:55:12 2013 Kazuki Tsujimoto <kazuki@callcc.net> * array.c (rb_ary_shuffle_bang, rb_ary_sample): rename local variables. @@ -1912,8 +1912,13 @@ int rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values) { int i = 0, j; + int rest = 0; VALUE missing = Qnil; + if (optional < 0) { + rest = 1; + optional = -1-optional; + } if (values) { for (j = 0; j < required + optional; j++) { values[j] = Qundef; @@ -1945,6 +1950,8 @@ rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, V j++; } } + } + if (!rest && keyword_hash) { if (RHASH_SIZE(keyword_hash) > (unsigned int)j) { unknown_keyword_error(keyword_hash, table, required+optional); } diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index a63ff8233f..e7e1a927e6 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -306,6 +306,7 @@ class TestKeywordArguments < Test::Unit::TestCase eval("def o.bar(a:,**b) [a, b]; end") end assert_raise_with_message(ArgumentError, /missing keyword/, feature7701) {o.foo} + assert_raise_with_message(ArgumentError, /unknown keyword/, feature7701) {o.foo(a:0, b:1)} assert_equal(42, o.foo(a: 42), feature7701) assert_equal([[:keyreq, :a]], o.method(:foo).parameters, feature7701) @@ -323,6 +324,7 @@ class TestKeywordArguments < Test::Unit::TestCase break eval("proc {|a:| a}") end assert_raise_with_message(ArgumentError, /missing keyword/, feature7701) {b.call} + assert_raise_with_message(ArgumentError, /unknown keyword/, feature7701) {b.call(a:0, b:1)} assert_equal(42, b.call(a: 42), feature7701) assert_equal([[:keyreq, :a]], b.parameters, feature7701) diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 28d0ea31c6..d490f4690e 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1067,7 +1067,8 @@ vm_caller_setup_args(const rb_thread_t *th, rb_control_frame_t *cfp, rb_call_inf static inline int vm_callee_setup_keyword_arg(const rb_iseq_t *iseq, int argc, int m, VALUE *orig_argv, VALUE *kwd) { - VALUE keyword_hash, orig_hash; + VALUE keyword_hash = 0, orig_hash; + int optional = iseq->arg_keywords - iseq->arg_keyword_required; if (argc > m && !NIL_P(orig_hash = rb_check_hash_type(orig_argv[argc-1])) && @@ -1078,14 +1079,11 @@ vm_callee_setup_keyword_arg(const rb_iseq_t *iseq, int argc, int m, VALUE *orig_ else { orig_argv[argc-1] = orig_hash; } - rb_get_kwargs(keyword_hash, iseq->arg_keyword_table, iseq->arg_keyword_required, - iseq->arg_keyword_check ? iseq->arg_keywords - iseq->arg_keyword_required : 0, - NULL); } - else if (iseq->arg_keyword_required) { - rb_get_kwargs(0, iseq->arg_keyword_table, iseq->arg_keyword_required, 0, NULL); - } - else { + rb_get_kwargs(keyword_hash, iseq->arg_keyword_table, iseq->arg_keyword_required, + (iseq->arg_keyword_check ? optional : -1-optional), + NULL); + if (!keyword_hash) { keyword_hash = rb_hash_new(); } |