Skip to content
Browse files

* 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 53df70d commit d267b2e347b0ef226c132a881ed11a89e622df24 @mame mame committed Dec 3, 2011
Showing with 22 additions and 1 deletion.
  1. +8 −0 ChangeLog
  2. +13 −0 test/ruby/test_module.rb
  3. +1 −1 variable.c
View
8 ChangeLog
@@ -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.
View
13 test/ruby/test_module.rb
@@ -1070,6 +1070,19 @@ def test_private_constant
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
View
2 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));
}

0 comments on commit d267b2e

Please sign in to comment.
Something went wrong with that request. Please try again.