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: make method by define_method public

Browse source 
* proc.c (rb_mod_define_method): consider visibility only if self
  in the caller is same as the receiver, otherwise make public as
  well as old behavior.  [ruby-core:57747] [Bug #9005]
  [ruby-core:58497] [Bug #9141]
* vm.c (rb_vm_cref_in_context): return ruby level cref if self is
  same.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-12-24 07:28:11 +00:00
parent 3c0cbea874
commit 1fc3319973
4 changed files with 50 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Tue Dec 24 16:28:05 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (rb_mod_define_method): consider visibility only if self
in the caller is same as the receiver, otherwise make public as
well as old behavior. [ruby-core:57747] [Bug #9005]
[ruby-core:58497] [Bug #9141]
* vm.c (rb_vm_cref_in_context): return ruby level cref if self is
same.
Tue Dec 24 14:13:14 2013 Koichi Sasada <ko1@atdot.net>
* README.EXT: add a refer to URL.

9
proc.c
View file

@ -14,6 +14,8 @@
#include "gc.h"
#include "iseq.h"
NODE *rb_vm_cref_in_context(VALUE self);
struct METHOD {
VALUE recv;
VALUE rclass;
@ -1619,7 +1621,12 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
{
ID id;
VALUE body;
int noex = (int)rb_vm_cref()->nd_visi;
int noex = NOEX_PUBLIC;
const NODE *cref = rb_vm_cref_in_context(mod);
if (cref && cref->nd_clss == mod) {
noex = (int)cref->nd_visi;
}
if (argc == 1) {
id = rb_to_id(argv[0]);

23
test/ruby/test_method.rb
View file

@ -338,6 +338,29 @@ class TestMethod < Test::Unit::TestCase
assert_equal(true, m.private_method_defined?(:foo))
end
def test_define_method_in_private_scope
bug9005 = '[ruby-core:57747] [Bug #9005]'
c = Class.new
class << c
public :define_method
end
TOPLEVEL_BINDING.eval("proc{|c|c.define_method(:x) {|*x|throw x}}").call(c)
o = c.new
assert_throw(bug9005) {o.x(bug9005)}
end
def test_singleton_define_method_in_private_scope
bug9141 = '[ruby-core:58497] [Bug #9141]'
o = Object.new
class << o
public :define_singleton_method
end
TOPLEVEL_BINDING.eval("proc{|o|o.define_singleton_method(:x) {|x|throw x}}").call(o)
assert_throw(bug9141) do
o.x(bug9141)
end
end
def test_super_in_proc_from_define_method
c1 = Class.new {
def m

9
vm.c
View file

@ -930,6 +930,15 @@ rb_vm_cref(void)
return rb_vm_get_cref(cfp->iseq, cfp->ep);
}
NODE *
rb_vm_cref_in_context(VALUE self)
{
rb_thread_t *th = GET_THREAD();
const rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp);
if (cfp->self != self) return NULL;
return rb_vm_get_cref(cfp->iseq, cfp->ep);
}
#if 0
void
debug_cref(NODE *cref)