From e8f88daa9c0486485072a1fb1c61a60ede0ff5c0 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby-lang.org>
Date: Mon, 14 Sep 2015 15:56:54 +0900
Subject: instance_eval should set target_class; close #2936

target_class should be singleton class of the receiver
---
 mrbgems/mruby-eval/src/eval.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mrbgems/mruby-eval/src')

diff --git a/mrbgems/mruby-eval/src/eval.c b/mrbgems/mruby-eval/src/eval.c
index 8bfa2f112..dd5fd5024 100644
--- a/mrbgems/mruby-eval/src/eval.c
+++ b/mrbgems/mruby-eval/src/eval.c
@@ -235,12 +235,12 @@ f_instance_eval(mrb_state *mrb, mrb_value self)
     mrb_int len;
     char *file = NULL;
     mrb_int line = 1;
+    mrb_value cv;
 
     mrb_get_args(mrb, "s|zi", &s, &len, &file, &line);
     c->ci->acc = CI_ACC_SKIP;
-    if (c->ci->target_class->tt == MRB_TT_ICLASS) {
-      c->ci->target_class = c->ci->target_class->c;
-    }
+    cv = mrb_singleton_class(mrb, self);
+    c->ci->target_class = mrb_class_ptr(cv);
     return mrb_run(mrb, create_proc_from_string(mrb, s, len, mrb_nil_value(), file, line), self);
   }
   else {
-- 
cgit v1.2.3