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

* vm_insnhelper.c (vm_yield_setup_block_args): partially revert r41019.

Browse source 
The code is not useless.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-06-02 18:44:33 +00:00
parent 233f7d09e3
commit 284d746392
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Jun 3 03:40:29 2013 NARUSE, Yui <naruse@ruby-lang.org>
* vm_insnhelper.c (vm_yield_setup_block_args): partially revert r41019.
The code is not useless.
Mon Jun 3 01:25:25 2013 Ayumu AIZAWA <ayumu.aizawa@gmail.com> Mon Jun 3 01:25:25 2013 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
* test/socket/test_sockopt.rb: change test name. follow r41037. * test/socket/test_sockopt.rb: change test name. follow r41037.

11
test/ruby/test_yield.rb
View file

@ -379,4 +379,15 @@ class TestRubyYieldGen < Test::Unit::TestCase
} }
end end
def test_block_with_mock
y = Object.new
def y.s(a)
yield(a)
end
m = Object.new
def m.method_missing(*a)
super
end
assert_equal [m, nil], y.s(m){|a,b|[a,b]}
end
end end

3
vm_insnhelper.c
View file

@ -2211,6 +2211,9 @@ vm_yield_setup_block_args(rb_thread_t *th, const rb_iseq_t * iseq,
MEMCPY(argv, RARRAY_PTR(ary), VALUE, argc); MEMCPY(argv, RARRAY_PTR(ary), VALUE, argc);
} }
else {
argv[0] = arg0; /* rb_check_array_type(arg0) may change argv */
}
/* keyword argument */ /* keyword argument */
if (iseq->arg_keyword != -1) { if (iseq->arg_keyword != -1) {