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

* variable.c (rb_const_set): const_set shoud preserve constant

Browse Source 
visibility.  see [ruby-core:32912].

* test/ruby/test_module.rb: add a test for above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2011-01-28 17:57:42 +00:00
parent a2ec8666cf
commit b1e829fb30
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sat Jan 29 01:36:41 2011 Yusuke Endoh <mame@tsg.ne.jp>
* variable.c (rb_const_set): const_set shoud preserve constant
visibility. see [ruby-core:32912].
* test/ruby/test_module.rb: add a test for above.
Sat Jan 29 01:24:57 2011 Yusuke Endoh <mame@tsg.ne.jp> Sat Jan 29 01:24:57 2011 Yusuke Endoh <mame@tsg.ne.jp>
* compile.c (NODE_CLASS, NODE_MODULE), insns.def (defineclass): raise * compile.c (NODE_CLASS, NODE_MODULE), insns.def (defineclass): raise

4
test/ruby/test_module.rb
View File

@ -948,6 +948,10 @@ class TestModule < Test::Unit::TestCase
assert_raise(NameError) { c::FOO } assert_raise(NameError) { c::FOO }
assert_equal("foo", c.class_eval("FOO")) assert_equal("foo", c.class_eval("FOO"))
assert_equal("foo", c.const_get("FOO")) assert_equal("foo", c.const_get("FOO"))
$VERBOSE, verbose = nil, $VERBOSE
c.const_set(:FOO, "foo")
$VERBOSE = verbose
assert_raise(NameError) { c::FOO }
end end
class PrivateClass class PrivateClass

10
variable.c
View File

@ -1876,6 +1876,7 @@ void
rb_const_set(VALUE klass, ID id, VALUE val) rb_const_set(VALUE klass, ID id, VALUE val)
{ {
rb_const_entry_t *ce; rb_const_entry_t *ce;
VALUE visibility = CONST_PUBLIC;
if (NIL_P(klass)) { if (NIL_P(klass)) {
rb_raise(rb_eTypeError, "no class/module to define constant %s", rb_raise(rb_eTypeError, "no class/module to define constant %s",
@ -1890,17 +1891,20 @@ rb_const_set(VALUE klass, ID id, VALUE val)
st_data_t value; st_data_t value;
if (st_lookup(RCLASS_CONST_TBL(klass), (st_data_t)id, &value)) { if (st_lookup(RCLASS_CONST_TBL(klass), (st_data_t)id, &value)) {
if (((rb_const_entry_t*)value)->value == Qundef) rb_const_entry_t *ce = (rb_const_entry_t*)value;
if (ce->value == Qundef)
autoload_delete(klass, id); autoload_delete(klass, id);
else else {
visibility = ce->flag;
rb_warn("already initialized constant %s", rb_id2name(id)); rb_warn("already initialized constant %s", rb_id2name(id));
}
} }
} }
rb_vm_change_state(); rb_vm_change_state();
ce = ALLOC(rb_const_entry_t); ce = ALLOC(rb_const_entry_t);
ce->flag = CONST_PUBLIC; ce->flag = visibility;
ce->value = val; ce->value = val;
st_insert(RCLASS_CONST_TBL(klass), (st_data_t)id, (st_data_t)ce); st_insert(RCLASS_CONST_TBL(klass), (st_data_t)id, (st_data_t)ce);