diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | test/ruby/test_module.rb | 4 | ||||
| -rw-r--r-- | variable.c | 8 |
3 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Sat Jan 29 02:02:37 2011 Yusuke Endoh <mame@tsg.ne.jp> + + * variable.c (rb_mod_const_of, sv_i): Module#constant should exclude + private constants. see [ruby-core:32912]. + + * test/ruby/test_module.rb (test_constants_with_private_constant): add + a test for above. + Sat Jan 29 01:36:41 2011 Yusuke Endoh <mame@tsg.ne.jp> * variable.c (rb_const_set): const_set shoud preserve constant diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index e3b433e2cb..c7acac05f9 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -981,4 +981,8 @@ class TestModule < Test::Unit::TestCase c.public_constant(:FOO) assert_equal("foo", c::FOO) end + + def test_constants_with_private_constant + assert(!(::TestModule).constants.include?(:PrivateClass)) + end end diff --git a/variable.c b/variable.c index 1ee299e358..daaf4e2d56 100644 --- a/variable.c +++ b/variable.c @@ -1709,7 +1709,7 @@ sv_i(ID key, rb_const_entry_t *ce, st_table *tbl) { if (rb_is_const_id(key)) { if (!st_lookup(tbl, (st_data_t)key, 0)) { - st_insert(tbl, (st_data_t)key, (st_data_t)key); + st_insert(tbl, (st_data_t)key, (st_data_t)ce); } } return ST_CONTINUE; @@ -1742,9 +1742,11 @@ rb_mod_const_of(VALUE mod, void *data) } static int -list_i(ID key, ID value, VALUE ary) +list_i(st_data_t key, st_data_t value, VALUE ary) { - rb_ary_push(ary, ID2SYM(key)); + ID sym = (ID)key; + rb_const_entry_t *ce = (rb_const_entry_t *)value; + if (ce->flag != CONST_PRIVATE) rb_ary_push(ary, ID2SYM(sym)); return ST_CONTINUE; } |