kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

compile.c: append keyword hash to splat

Browse source 
* compile.c (iseq_compile_each): append keyword hash to argument array
  to splat if needed.  [ruby-core:54094] [Bug #8236]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-04-09 06:26:15 +00:00
parent 0a4ed02461
commit f4c52b483c
3 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Tue Apr 9 10:02:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (timestamp_file): gather timestamp files in one * lib/mkmf.rb (timestamp_file): gather timestamp files in one

5
compile.c
View file

@ -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_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
} }
ADD_SEND(args, line, ID2SYM(id_core_hash_merge_ptr), INT2FIX(i * 2 + 1)); 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;
}
} }
} }
} }

21
test/ruby/test_keyword.rb
View file

@ -327,4 +327,25 @@ class TestKeywordArguments < Test::Unit::TestCase
assert_raise(ArgumentError, bug8139) {b.call(c: bug8139)} assert_raise(ArgumentError, bug8139) {b.call(c: bug8139)}
assert_raise(ArgumentError, bug8139) {b.call} assert_raise(ArgumentError, bug8139) {b.call}
end 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 end