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

vm_insnhelper.c: deprecated constant in class

Browse Source 
* vm_insnhelper.c (vm_get_ev_const): warn deprecated constant even
  in the class context.  [ruby-core:75505] [Bug #12382]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55005 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-05-15 01:57:28 +00:00
parent 6d4fb98e59
commit 5cb5692ac8
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun May 15 10:57:26 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_insnhelper.c (vm_get_ev_const): warn deprecated constant even
in the class context. [ruby-core:75505] [Bug #12382]
Sun May 15 03:13:01 2016 NARUSE, Yui <naruse@ruby-lang.org> Sun May 15 03:13:01 2016 NARUSE, Yui <naruse@ruby-lang.org>
* iseq.h (struct iseq_compile_data): use struct rb_id_table * iseq.h (struct iseq_compile_data): use struct rb_id_table

2
test/ruby/test_module.rb
View File

@ -1415,6 +1415,8 @@ 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}
bug12382 = '[ruby-core:75505] [Bug #12382]'
assert_warn(/deprecated/, bug12382) {c.class_eval "FOO"}
end end
def test_constants_with_private_constant def test_constants_with_private_constant

24
variable.c
View File

@ -2221,6 +2221,20 @@ rb_autoload_p(VALUE mod, ID id)
return (ele = check_autoload_data(load)) ? ele->feature : Qnil; return (ele = check_autoload_data(load)) ? ele->feature : Qnil;
} }
void
rb_const_warn_if_deprecated(const rb_const_entry_t *ce, VALUE klass, ID id)
{
if (RB_CONST_DEPRECATED_P(ce)) {
if (klass == rb_cObject) {
rb_warn("constant ::%"PRIsVALUE" is deprecated", QUOTE_ID(id));
}
else {
rb_warn("constant %"PRIsVALUE"::%"PRIsVALUE" is deprecated",
rb_class_name(klass), QUOTE_ID(id));
}
}
}
static VALUE static VALUE
rb_const_get_0(VALUE klass, ID id, int exclude, int recurse, int visibility) rb_const_get_0(VALUE klass, ID id, int exclude, int recurse, int visibility)
{ {
@ -2238,15 +2252,7 @@ rb_const_get_0(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",
klass, ID2SYM(id)); klass, ID2SYM(id));
} }
if (RB_CONST_DEPRECATED_P(ce)) { rb_const_warn_if_deprecated(ce, klass, id);
if (klass == rb_cObject) {
rb_warn("constant ::%"PRIsVALUE" is deprecated", QUOTE_ID(id));
}
else {
rb_warn("constant %"PRIsVALUE"::%"PRIsVALUE" is deprecated",
rb_class_name(klass), QUOTE_ID(id));
}
}
value = ce->value; value = ce->value;
if (value == Qundef) { if (value == Qundef) {
if (am == tmp) break; if (am == tmp) break;

2
vm_insnhelper.c
View File

@ -664,6 +664,7 @@ vm_get_iclass(rb_control_frame_t *cfp, VALUE klass)
static inline VALUE static inline VALUE
vm_get_ev_const(rb_thread_t *th, VALUE orig_klass, ID id, int is_defined) vm_get_ev_const(rb_thread_t *th, VALUE orig_klass, ID id, int is_defined)
{ {
void rb_const_warn_if_deprecated(const rb_const_entry_t *ce, VALUE klass, ID id);
VALUE val; VALUE val;
if (orig_klass == Qnil) { if (orig_klass == Qnil) {
@ -690,6 +691,7 @@ vm_get_ev_const(rb_thread_t *th, VALUE orig_klass, ID id, int is_defined)
rb_const_entry_t *ce; rb_const_entry_t *ce;
search_continue: search_continue:
if ((ce = rb_const_lookup(klass, id))) { if ((ce = rb_const_lookup(klass, id))) {
rb_const_warn_if_deprecated(ce, klass, id);
val = ce->value; val = ce->value;
if (val == Qundef) { if (val == Qundef) {
if (am == klass) break; if (am == klass) break;