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

merge revision(s) 40807: [Backport #8416]

Browse source 
* 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/branches/ruby_2_0_0@41051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-06-03 14:57:36 +00:00
parent 6f617028a4
commit 44658707d2
4 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Jun 3 23:22:58 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (iseq_compile_each): forward anonymous and first keyword
rest argument one. [ruby-core:55033] [Bug #8416].
Sun Jun 2 22:39:24 2013 Zachary Scott <zachary@zacharyscott.net>
* range.c: Fix rdoc on Range#bsearch [Bug #8242] [ruby-core:54143]

2
compile.c
View file

@ -4471,7 +4471,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++;

30
test/ruby/test_keyword.rb
View file

@ -312,4 +312,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

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-06-02"
#define RUBY_PATCHLEVEL 198
#define RUBY_RELEASE_DATE "2013-06-03"
#define RUBY_PATCHLEVEL 199
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 2
#define RUBY_RELEASE_DAY 3
#include "ruby/version.h"