From e75e2083fd6ddb35f58ac63ae2b98a5222b1854a Mon Sep 17 00:00:00 2001
From: Kouhei Sutou <kou@clear-code.com>
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 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/vm.c')

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);
-- 
cgit v1.2.3