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

variable.c: fix deprecated constant message

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

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

5
ChangeLog
View File

@ -1,4 +1,7 @@
Fri Sep 9 10:07:40 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Sep 9 10:10:00 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* variable.c (rb_const_search): warn with the actual class/module
name which defines the deprecated constant.
* variable.c (rb_const_search): raise with the actual class/module * variable.c (rb_const_search): raise with the actual class/module
name which defines the private constant. name which defines the private constant.

1
test/ruby/test_module.rb
View File

@ -1420,6 +1420,7 @@ class TestModule < Test::Unit::TestCase
c.const_set(:FOO, "foo") c.const_set(:FOO, "foo")
c.deprecate_constant(:FOO) c.deprecate_constant(:FOO)
assert_warn(/deprecated/) {c::FOO} assert_warn(/deprecated/) {c::FOO}
assert_warn(/#{c}::FOO is deprecated/) {Class.new(c)::FOO}
bug12382 = '[ruby-core:75505] [Bug #12382]' bug12382 = '[ruby-core:75505] [Bug #12382]'
assert_warn(/deprecated/, bug12382) {c.class_eval "FOO"} assert_warn(/deprecated/, bug12382) {c.class_eval "FOO"}
end end

2
variable.c
View File

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