From a3cc3cc5c958e6e0bb9d650f396123d719c75ca3 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 9 Sep 2016 01:07:41 +0000 Subject: variable.c: fix private constant message * 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 --- ChangeLog | 5 +++++ test/ruby/test_module.rb | 3 +++ variable.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3fe44c32d6..a974f00695 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 9 10:07:40 2016 Nobuyoshi Nakada + + * 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 * array.c (flatten): use rb_obj_class instead of rb_class_of diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 0f9351c57d..43bd3f72b6 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1360,6 +1360,9 @@ class TestModule < Test::Unit::TestCase c.const_set(:FOO, "foo") $VERBOSE = verbose assert_raise(NameError) { c::FOO } + assert_raise_with_message(NameError, /#{c}::FOO/) do + Class.new(c)::FOO + end end def test_private_constant2 diff --git a/variable.c b/variable.c index 0966685690..277edb83b4 100644 --- a/variable.c +++ b/variable.c @@ -2261,7 +2261,7 @@ rb_const_search(VALUE klass, ID id, int exclude, int recurse, int visibility) while ((ce = rb_const_lookup(tmp, id))) { if (visibility && RB_CONST_PRIVATE_P(ce)) { 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); value = ce->value; -- cgit v1.2.3