archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 40205: [Backport #8236]

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/branches/ruby_2_0_0@40379 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-04-19 16:02:09 +00:00
parent 1ccf489ad5
commit a569165d3e
4 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Apr 20 00:41:10 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]
Sat Apr 20 00:31:57 2013 Kouhei Sutou <kou@cozmixng.org>
* README.EXT.ja (Data_Wrap_Struct): Remove a description about

5
compile.c
View file

@ -4485,6 +4485,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;
}
}
}
}

21
test/ruby/test_keyword.rb
View file

@ -290,4 +290,25 @@ class TestKeywordArguments < Test::Unit::TestCase
assert_equal(1, o.bug7942(), bug7942)
assert_equal(42, o.bug7942(a: 42), bug7942)
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

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-04-20"
#define RUBY_PATCHLEVEL 146
#define RUBY_PATCHLEVEL 147
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 4