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

proc.c: fix method proc binding receiver

Browse source 
* proc.c (method_proc): the receiver of binding from method should
  be same as the receiver of the method.
  [ruby-core:65917] [Bug #10432]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-10-27 08:17:26 +00:00
parent 9bcf16f01a
commit e45b215fdd
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Oct 27 17:17:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (method_proc): the receiver of binding from method should
be same as the receiver of the method.
[ruby-core:65917] [Bug #10432]
Mon Oct 27 16:26:37 2014 Koichi Sasada <ko1@atdot.net>
* test/ruby/test_super.rb: add a test to check block passing.

10
proc.c
View file

@ -2365,7 +2365,10 @@ static VALUE
method_proc(VALUE method)
{
VALUE procval;
struct METHOD *meth;
rb_proc_t *proc;
rb_env_t *env;
/*
* class Method
* def to_proc
@ -2375,9 +2378,16 @@ method_proc(VALUE method)
* end
* end
*/
TypedData_Get_Struct(method, struct METHOD, &method_data_type, meth);
procval = rb_iterate(mlambda, 0, bmcall, method);
GetProcPtr(procval, proc);
proc->is_from_method = 1;
proc->block.self = meth->recv;
proc->block.klass = meth->defined_class;
GetEnvPtr(proc->envval, env);
env->block.self = meth->recv;
env->block.klass = meth->defined_class;
env->block.iseq = method_get_iseq(meth->me->def);
return procval;
}

5
test/ruby/test_proc.rb
View file

@ -202,7 +202,10 @@ class TestProc < Test::Unit::TestCase
def test_method_to_proc
b = block()
assert_equal "OK", b.call
assert_instance_of(Binding, b.binding, '[ruby-core:25589]')
b = b.binding
assert_instance_of(Binding, b, '[ruby-core:25589]')
bug10432 = '[ruby-core:65919] [Bug #10432]'
assert_same(self, b.receiver, bug10432)
end
def test_block_given_method