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

variable.c: fix private constant message

Browse Source 
* variable.c (rb_const_search): raise with the actual class/module
  name which defines the private constant.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-09-09 01:07:41 +00:00
parent bef96f5a3f
commit a3cc3cc5c9
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Sep 9 10:07:40 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* variable.c (rb_const_search): raise with the actual class/module
name which defines the private constant.
Thu Sep 8 17:47:18 2016 Kazuki Tsujimoto <kazuki@callcc.net> Thu Sep 8 17:47:18 2016 Kazuki Tsujimoto <kazuki@callcc.net>
* array.c (flatten): use rb_obj_class instead of rb_class_of * array.c (flatten): use rb_obj_class instead of rb_class_of

3
test/ruby/test_module.rb
View File

@ -1360,6 +1360,9 @@ class TestModule < Test::Unit::TestCase
c.const_set(:FOO, "foo") c.const_set(:FOO, "foo")
$VERBOSE = verbose $VERBOSE = verbose
assert_raise(NameError) { c::FOO } assert_raise(NameError) { c::FOO }
assert_raise_with_message(NameError, /#{c}::FOO/) do
Class.new(c)::FOO
end
end end
def test_private_constant2 def test_private_constant2

2
variable.c
View File

@ -2261,7 +2261,7 @@ rb_const_search(VALUE klass, ID id, int exclude, int recurse, int visibility)
while ((ce = rb_const_lookup(tmp, id))) { while ((ce = rb_const_lookup(tmp, id))) {
if (visibility && RB_CONST_PRIVATE_P(ce)) { if (visibility && RB_CONST_PRIVATE_P(ce)) {
rb_name_err_raise("private constant %2$s::%1$s referenced", rb_name_err_raise("private constant %2$s::%1$s referenced",
klass, ID2SYM(id)); tmp, ID2SYM(id));
} }
rb_const_warn_if_deprecated(ce, klass, id); rb_const_warn_if_deprecated(ce, klass, id);
value = ce->value; value = ce->value;