archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 63696: [Backport #14853]

Browse source 
variable.c: fix receiver on private constant

	* variable.c (rb_const_search): fix NameError :receiver attribute
	  on private constant, should raise with the included module, not
	  the ICLASS.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@64559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-08-27 13:48:53 +00:00
parent 7d9572819b
commit 4941bba3c8
3 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

42
test/ruby/test_module.rb
View file

@ -1352,21 +1352,55 @@ class TestModule < Test::Unit::TestCase
assert_raise(ArgumentError, bug8540) { c.new.send :foo= }
end
def test_private_constant
def test_private_constant_in_class
c = Class.new
c.const_set(:FOO, "foo")
assert_equal("foo", c::FOO)
c.private_constant(:FOO)
assert_raise(NameError) { c::FOO }
e = assert_raise(NameError) {c::FOO}
assert_equal(c, e.receiver)
assert_equal(:FOO, e.name)
assert_equal("foo", c.class_eval("FOO"))
assert_equal("foo", c.const_get("FOO"))
$VERBOSE, verbose = nil, $VERBOSE
c.const_set(:FOO, "foo")
$VERBOSE = verbose
assert_raise(NameError) { c::FOO }
assert_raise_with_message(NameError, /#{c}::FOO/) do
e = assert_raise(NameError) {c::FOO}
assert_equal(c, e.receiver)
assert_equal(:FOO, e.name)
e = assert_raise_with_message(NameError, /#{c}::FOO/) do
Class.new(c)::FOO
end
assert_equal(c, e.receiver)
assert_equal(:FOO, e.name)
end
def test_private_constant_in_module
m = Module.new
m.const_set(:FOO, "foo")
assert_equal("foo", m::FOO)
m.private_constant(:FOO)
e = assert_raise(NameError) {m::FOO}
assert_equal(m, e.receiver)
assert_equal(:FOO, e.name)
assert_equal("foo", m.class_eval("FOO"))
assert_equal("foo", m.const_get("FOO"))
$VERBOSE, verbose = nil, $VERBOSE
m.const_set(:FOO, "foo")
$VERBOSE = verbose
e = assert_raise(NameError) {m::FOO}
assert_equal(m, e.receiver)
assert_equal(:FOO, e.name)
e = assert_raise(NameError, /#{m}::FOO/) do
Module.new {include m}::FOO
end
assert_equal(m, e.receiver)
assert_equal(:FOO, e.name)
e = assert_raise(NameError, /#{m}::FOO/) do
Class.new {include m}::FOO
end
assert_equal(m, e.receiver)
assert_equal(:FOO, e.name)
end
def test_private_constant2

1
variable.c
View file

@ -2304,6 +2304,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)) {
if (BUILTIN_TYPE(tmp) == T_ICLASS) tmp = RBASIC(tmp)->klass;
rb_name_err_raise("private constant %2$s::%1$s referenced",
tmp, ID2SYM(id));
}

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.5"
#define RUBY_RELEASE_DATE "2018-08-27"
#define RUBY_PATCHLEVEL 316
#define RUBY_PATCHLEVEL 317
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 8