Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 79f7dfabb69ec435b6b0be5ccb5157cb85e71580 1 parent 7e052c7
@nobu nobu authored
Showing with 28 additions and 3 deletions.
  1. +6 −0 ChangeLog
  2. +16 −0 test/ruby/test_keyword.rb
  3. +6 −3 vm_insnhelper.c
View
6 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
View
16 test/ruby/test_keyword.rb
@@ -296,10 +296,17 @@ def test_required_keyword
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 @@ def test_block_required_keyword
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
View
9 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]));
Please sign in to comment.
Something went wrong with that request. Please try again.