From e38a2399d21bd8c6f104a1b522a82ae0b75b34de Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 18 May 2013 07:38:55 +0000 Subject: compile.c: forward kwrest * compile.c (iseq_compile_each): forward anonymous and first keyword rest argument one. [ruby-core:55033] [Bug #8416]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ compile.c | 2 +- test/ruby/test_keyword.rb | 30 ++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 67c9ff7d7a..630ddf5880 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat May 18 16:38:39 2013 Nobuyoshi Nakada + + * compile.c (iseq_compile_each): forward anonymous and first keyword + rest argument one. [ruby-core:55033] [Bug #8416]. + Sat May 18 15:49:14 2013 Nobuyoshi Nakada * vm_core.h (rb_vm_tag): move jmpbuf between tag and prev so ensure to diff --git a/compile.c b/compile.c index c079c03c50..57f5a5fb92 100644 --- a/compile.c +++ b/compile.c @@ -4485,7 +4485,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } } - if (liseq->arg_keyword > 0) { + if (liseq->arg_keyword >= 0) { int local_size = liseq->local_size; int idx = local_size - liseq->arg_keyword; argc++; diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index ae56757032..7443937942 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -349,4 +349,34 @@ class TestKeywordArguments < Test::Unit::TestCase assert_equal([42, {:bar=>"x"}], a.new.foo(42), bug8236) assert_equal([42, {:bar=>"x"}], b.new.foo(42), bug8236) end + + def test_zsuper_only_named_kwrest + bug8416 = '[ruby-core:55033] [Bug #8416]' + base = Class.new do + def foo(**h) + h + end + end + a = Class.new(base) do + def foo(**h) + super + end + end + assert_equal({:bar=>"x"}, a.new.foo(bar: "x"), bug8416) + end + + def test_zsuper_only_anonymous_kwrest + bug8416 = '[ruby-core:55033] [Bug #8416]' + base = Class.new do + def foo(**h) + h + end + end + a = Class.new(base) do + def foo(**) + super + end + end + assert_equal({:bar=>"x"}, a.new.foo(bar: "x"), bug8416) + end end -- cgit v1.2.3