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

* insns.def (setclassvariable, setconstant): warn when self is a

Browse Source 
refinement.  [Bug #10103] [ruby-core:64143]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2016-09-08 04:44:51 +00:00
parent 0a764c0bb1
commit bbd662c8bd
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Sep 8 13:41:46 2016 Shugo Maeda <shugo@ruby-lang.org>
* insns.def (setclassvariable, setconstant): warn when self is a
refinement. [Bug #10103] [ruby-core:64143]
Thu Sep 8 11:29:00 2016 Kenta Murata <mrkn@mrkn.jp> Thu Sep 8 11:29:00 2016 Kenta Murata <mrkn@mrkn.jp>
* hash.c (rb_hash_transform_values, rb_hash_transform_values_bang): * hash.c (rb_hash_transform_values, rb_hash_transform_values_bang):

2
insns.def
View File

@ -173,6 +173,7 @@ setclassvariable
(VALUE val) (VALUE val)
() ()
{ {
vm_ensure_not_refinement_module(GET_SELF());
rb_cvar_set(vm_get_cvar_base(rb_vm_get_cref(GET_EP()), GET_CFP()), id, val); rb_cvar_set(vm_get_cvar_base(rb_vm_get_cref(GET_EP()), GET_CFP()), id, val);
} }
@ -217,6 +218,7 @@ setconstant
() ()
{ {
vm_check_if_namespace(cbase); vm_check_if_namespace(cbase);
vm_ensure_not_refinement_module(GET_SELF());
rb_const_set(cbase, id, val); rb_const_set(cbase, id, val);
} }

16
test/ruby/test_refinement.rb
View File

@ -1674,6 +1674,22 @@ class TestRefinement < Test::Unit::TestCase
assert_equal [ref::RefB, ref::RefA], ref::Combined::USED_REFS assert_equal [ref::RefB, ref::RefA], ref::Combined::USED_REFS
end end
def test_warn_setconst_in_refinmenet
bug10103 = '[ruby-core:64143] [Bug #10103]'
warnings = [
"-:3: warning: not defined at the refinement, but at the outer class/module",
"-:4: warning: not defined at the refinement, but at the outer class/module"
]
assert_in_out_err([], <<-INPUT, [], warnings, bug10103)
module M
refine String do
FOO = 123
@@foo = 456
end
end
INPUT
end
private private
def eval_using(mod, s) def eval_using(mod, s)

8
vm_insnhelper.c
View File

@ -733,6 +733,14 @@ vm_check_if_namespace(VALUE klass)
} }
} }
static inline void
vm_ensure_not_refinement_module(VALUE self)
{
if (RB_TYPE_P(self, T_MODULE) && FL_TEST(self, RMODULE_IS_REFINEMENT)) {
rb_warn("not defined at the refinement, but at the outer class/module");
}
}
static inline VALUE static inline VALUE
vm_get_iclass(rb_control_frame_t *cfp, VALUE klass) vm_get_iclass(rb_control_frame_t *cfp, VALUE klass)
{ {