summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-21 19:51:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-21 19:51:19 +0000
commit79f7dfabb69ec435b6b0be5ccb5157cb85e71580 (patch)
tree8188d7372f9774ce1b9cfddcf2e4e7a189614127
parent7e052c7b81d22fe4556e313c1f24ccda15502ab1 (diff)
vm_insnhelper.c: check required kwarg with resthash
* vm_insnhelper.c (vm_callee_setup_keyword_arg): should check required keyword arguments even if rest hash is defined. [ruby-core:53608] [Bug #8139] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_keyword.rb16
-rw-r--r--vm_insnhelper.c9
3 files changed, 28 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 81dc91d00e8..1cea895a292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 22 04:51:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_insnhelper.c (vm_callee_setup_keyword_arg): should check required
+ keyword arguments even if rest hash is defined. [ruby-core:53608]
+ [Bug #8139]
+
Fri Mar 22 01:00:17 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* process.c (rb_execarg_addopt, run_exec_pgroup): use rb_pid_t
diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb
index b7b4301ca16..dc20c6d7fd3 100644
--- a/test/ruby/test_keyword.rb
+++ b/test/ruby/test_keyword.rb
@@ -296,10 +296,17 @@ class TestKeywordArguments < Test::Unit::TestCase
o = Object.new
assert_nothing_raised(SyntaxError, feature7701) do
eval("def o.foo(a:) a; end")
+ eval("def o.bar(a:,**b) [a, b]; end")
end
assert_raise(ArgumentError, feature7701) {o.foo}
assert_equal(42, o.foo(a: 42), feature7701)
assert_equal([[:keyreq, :a]], o.method(:foo).parameters, feature7701)
+
+ bug8139 = '[ruby-core:53608] [Bug #8139] required keyword argument with rest hash'
+ assert_equal([42, {}], o.bar(a: 42), feature7701)
+ assert_equal([[:keyreq, :a], [:keyrest, :b]], o.method(:bar).parameters, feature7701)
+ assert_raise(ArgumentError, bug8139) {o.bar(c: bug8139)}
+ assert_raise(ArgumentError, bug8139) {o.bar}
end
def test_block_required_keyword
@@ -310,5 +317,14 @@ class TestKeywordArguments < Test::Unit::TestCase
assert_raise(ArgumentError, feature7701) {b.call}
assert_equal(42, b.call(a: 42), feature7701)
assert_equal([[:keyreq, :a]], b.parameters, feature7701)
+
+ bug8139 = '[ruby-core:53608] [Bug #8139] required keyword argument with rest hash'
+ b = assert_nothing_raised(SyntaxError, feature7701) do
+ break eval("proc {|a:, **b| [a, b]}")
+ end
+ assert_equal([42, {}], b.call(a: 42), feature7701)
+ assert_equal([[:keyreq, :a], [:keyrest, :b]], b.parameters, feature7701)
+ assert_raise(ArgumentError, bug8139) {b.call(c: bug8139)}
+ assert_raise(ArgumentError, bug8139) {b.call}
end
end
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index a6b307048ac..b1c48faf03e 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1080,9 +1080,10 @@ vm_callee_setup_keyword_arg(const rb_iseq_t *iseq, int argc, VALUE *orig_argv, V
!NIL_P(keyword_hash = rb_check_hash_type(orig_argv[argc-1]))) {
argc--;
keyword_hash = rb_hash_dup(keyword_hash);
- if (iseq->arg_keyword_check) {
+ i = 0;
+ if (iseq->arg_keyword_required) {
VALUE missing = Qnil;
- for (i = 0; i < iseq->arg_keyword_required; i++) {
+ for (; i < iseq->arg_keyword_required; i++) {
if (st_lookup(RHASH_TBL(keyword_hash), ID2SYM(iseq->arg_keyword_table[i]), 0))
continue;
if (NIL_P(missing)) missing = rb_ary_tmp_new(1);
@@ -1091,6 +1092,8 @@ vm_callee_setup_keyword_arg(const rb_iseq_t *iseq, int argc, VALUE *orig_argv, V
if (!NIL_P(missing)) {
keyword_error("missing", missing);
}
+ }
+ if (iseq->arg_keyword_check) {
for (j = i; i < iseq->arg_keywords; i++) {
if (st_lookup(RHASH_TBL(keyword_hash), ID2SYM(iseq->arg_keyword_table[i]), 0)) j++;
}
@@ -1099,7 +1102,7 @@ vm_callee_setup_keyword_arg(const rb_iseq_t *iseq, int argc, VALUE *orig_argv, V
}
}
}
- else if (iseq->arg_keyword_check && iseq->arg_keyword_required) {
+ else if (iseq->arg_keyword_required) {
VALUE missing = rb_ary_tmp_new(iseq->arg_keyword_required);
for (i = 0; i < iseq->arg_keyword_required; i++) {
rb_ary_push(missing, ID2SYM(iseq->arg_keyword_table[i]));