diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | test/ruby/test_module.rb | 13 | ||||
| -rw-r--r-- | variable.c | 2 |
3 files changed, 22 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Sat Dec 3 20:43:14 2011 Yusuke Endoh <mame@tsg.ne.jp> + + * variable.c (set_const_visibility): Module#private_constant has + changed the visibility of only the first argument. Now it changes + all of them. [ruby-list:48558] + + * test/ruby/test_module.rb: add a test for above. + Sat Dec 3 07:17:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * Makefile.in (CFLAGS): append ARCH_FLAG. diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 892ab9f593..16485c30d1 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1070,6 +1070,19 @@ class TestModule < Test::Unit::TestCase assert_raise(NameError) { c::FOO } end + def test_private_constant2 + c = Class.new + c.const_set(:FOO, "foo") + c.const_set(:BAR, "bar") + assert_equal("foo", c::FOO) + assert_equal("bar", c::BAR) + c.private_constant(:FOO, :BAR) + assert_raise(NameError) { c::FOO } + assert_raise(NameError) { c::BAR } + assert_equal("foo", c.class_eval("FOO")) + assert_equal("bar", c.class_eval("BAR")) + end + class PrivateClass end private_constant :PrivateClass diff --git a/variable.c b/variable.c index abdb39ad10..fc912d64f8 100644 --- a/variable.c +++ b/variable.c @@ -2119,7 +2119,7 @@ set_const_visibility(VALUE mod, int argc, VALUE *argv, rb_const_flag_t flag) } if (RCLASS_CONST_TBL(mod) && st_lookup(RCLASS_CONST_TBL(mod), (st_data_t)id, &v)) { ((rb_const_entry_t*)v)->flag = flag; - return; + continue; } rb_name_error(id, "constant %s::%s not defined", rb_class2name(mod), rb_id2name(id)); } |