From e75e2083fd6ddb35f58ac63ae2b98a5222b1854a Mon Sep 17 00:00:00 2001 From: Kouhei Sutou Date: Sat, 9 Aug 2014 15:06:17 +0900 Subject: Fix a bug that class variable can't be referenced from class method Class method defined in singleton class should be evaluated in class context not singleton class context. fix #2515 --- src/vm.c | 9 +++++++++ test/t/class.rb | 13 +++++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/vm.c b/src/vm.c index 14388af9a..4b7a30d71 100644 --- a/src/vm.c +++ b/src/vm.c @@ -2175,6 +2175,15 @@ RETRY_TRY_BLOCK: } else { p = mrb_proc_new(mrb, irep->reps[GETARG_b(i)]); + if (c & OP_L_METHOD) { + if (p->target_class->tt == MRB_TT_SCLASS) { + mrb_value klass; + klass = mrb_obj_iv_get(mrb, + (struct RObject *)p->target_class, + mrb_intern_lit(mrb, "__attached__")); + p->target_class = mrb_class_ptr(klass); + } + } } if (c & OP_L_STRICT) p->flags |= MRB_PROC_STRICT; regs[GETARG_A(i)] = mrb_obj_value(p); diff --git a/test/t/class.rb b/test/t/class.rb index f49ccf494..d4ecf99d0 100644 --- a/test/t/class.rb +++ b/test/t/class.rb @@ -370,3 +370,16 @@ assert('clone Class') do Foo.clone.new.func end + +assert('class variable and class << self style class method') do + class ClassVariableTest + @@class_variable = "value" + class << self + def class_variable + @@class_variable + end + end + end + + assert_equal("value", ClassVariableTest.class_variable) +end -- cgit v1.2.3