1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* insns.def (defineclass): private constants should not be accessed

Browse Source 
by scoped module definitions.  The bug was introduced in r38495.

* test/ruby/test_module.rb: related test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2013-01-11 00:58:08 +00:00
parent c0c381e4d5
commit bb54d0ae4c
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Jan 11 09:56:22 2013 Shugo Maeda <shugo@ruby-lang.org>
* insns.def (defineclass): private constants should not be accessed
by scoped module definitions. The bug was introduced in r38495.
* test/ruby/test_module.rb: related test.
Fri Jan 11 02:11:59 2013 Shugo Maeda <shugo@ruby-lang.org> Fri Jan 11 02:11:59 2013 Shugo Maeda <shugo@ruby-lang.org>
* lib/rbconfig/obsolete.rb (respond_to_missing?): use send because * lib/rbconfig/obsolete.rb (respond_to_missing?): use send because

2
insns.def
View File

@ -949,7 +949,7 @@ defineclass
/* find klass */ /* find klass */
if ((klass = vm_search_const_defined_class(cbase, id)) != 0) { if ((klass = vm_search_const_defined_class(cbase, id)) != 0) {
klass = VM_DEFINECLASS_SCOPED_P(flags) ? klass = VM_DEFINECLASS_SCOPED_P(flags) ?
rb_const_get_at(klass, id) : rb_public_const_get_at(klass, id); rb_public_const_get_at(klass, id) : rb_const_get_at(klass, id);
/* already exist */ /* already exist */
if (!RB_TYPE_P(klass, T_MODULE)) { if (!RB_TYPE_P(klass, T_MODULE)) {
rb_raise(rb_eTypeError, "%s is not a module", rb_id2name(id)); rb_raise(rb_eTypeError, "%s is not a module", rb_id2name(id));

20
test/ruby/test_module.rb
View File

@ -1604,6 +1604,26 @@ class TestModule < Test::Unit::TestCase
assert_top_method_is_private(:define_method) assert_top_method_is_private(:define_method)
end end
module PrivateConstantReopen
PRIVATE_CONSTANT = true
private_constant :PRIVATE_CONSTANT
end
def test_private_constant_reopen
assert_raise(NameError) do
eval <<-EOS, TOPLEVEL_BINDING
module TestModule::PrivateConstantReopen::PRIVATE_CONSTANT
end
EOS
end
assert_raise(NameError) do
eval <<-EOS, TOPLEVEL_BINDING
class TestModule::PrivateConstantReopen::PRIVATE_CONSTANT
end
EOS
end
end
private private
def assert_top_method_is_private(method) def assert_top_method_is_private(method)