archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 48160: [Backport #10432]

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/branches/ruby_2_0_0@48633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2014-11-28 07:20:40 +00:00
parent 3412d1016a
commit 7149859bc3
4 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Nov 28 16:18:44 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]
Fri Nov 28 16:12:22 2014 NARUSE, Yui <naruse@ruby-lang.org>
* lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead

10
proc.c
View file

@ -2034,7 +2034,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
@ -2044,9 +2047,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

@ -179,7 +179,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.eval("self"), bug10432)
end
def test_block_given_method

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-11-28"
#define RUBY_PATCHLEVEL 602
#define RUBY_PATCHLEVEL 603
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 11