diff options
| -rw-r--r-- | test/ruby/test_variable.rb | 10 | ||||
| -rw-r--r-- | variable.c | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/test/ruby/test_variable.rb b/test/ruby/test_variable.rb index b053e11607..685a06226f 100644 --- a/test/ruby/test_variable.rb +++ b/test/ruby/test_variable.rb @@ -35,6 +35,16 @@ class TestVariable < Test::Unit::TestCase end end + def test_setting_class_variable_on_module_through_inheritance + mod = Module.new + mod.class_variable_set(:@@foo, 1) + mod.freeze + c = Class.new { include(mod) } + assert_raise(FrozenError) { c.class_variable_set(:@@foo, 2) } + assert_raise(FrozenError) { c.class_eval("@@foo = 2") } + assert_equal(1, c.class_variable_get(:@@foo)) + end + def test_singleton_class_included_class_variable c = Class.new c.extend(Olympians) diff --git a/variable.c b/variable.c index ebf23fab67..0d8a424438 100644 --- a/variable.c +++ b/variable.c @@ -3143,6 +3143,9 @@ rb_cvar_set(VALUE klass, ID id, VALUE val) target = tmp; } + if (RB_TYPE_P(target, T_ICLASS)) { + target = RBASIC(target)->klass; + } check_before_mod_set(target, id, val, "class variable"); if (!RCLASS_IV_TBL(target)) { RCLASS_IV_TBL(target) = st_init_numtable(); |