diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | compile.c | 5 | ||||
| -rw-r--r-- | test/ruby/test_keyword.rb | 21 |
3 files changed, 31 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Apr 9 15:26:12 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * compile.c (iseq_compile_each): append keyword hash to argument array + to splat if needed. [ruby-core:54094] [Bug #8236] + Tue Apr 9 10:02:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (timestamp_file): gather timestamp files in one @@ -4499,6 +4499,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level)); } ADD_SEND(args, line, ID2SYM(id_core_hash_merge_ptr), INT2FIX(i * 2 + 1)); + if (liseq->arg_rest != -1) { + ADD_INSN1(args, line, newarray, INT2FIX(1)); + ADD_INSN (args, line, concatarray); + --argc; + } } } } diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index dc20c6d7fd..c9a9ed0a07 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -327,4 +327,25 @@ class TestKeywordArguments < Test::Unit::TestCase assert_raise(ArgumentError, bug8139) {b.call(c: bug8139)} assert_raise(ArgumentError, bug8139) {b.call} end + + def test_super_with_keyword + bug8236 = '[ruby-core:54094] [Bug #8236]' + base = Class.new do + def foo(*args) + args + end + end + a = Class.new(base) do + def foo(arg, bar: 'x') + super + end + end + b = Class.new(base) do + def foo(*args, bar: 'x') + super + end + end + assert_equal([42, {:bar=>"x"}], a.new.foo(42), bug8236) + assert_equal([42, {:bar=>"x"}], b.new.foo(42), bug8236) + end end |