1 files changed, 102 insertions, 1 deletions

diff --git a/mrbgems/mruby-eval/src/eval.c b/mrbgems/mruby-eval/src/eval.c
index b439b7378..efda9168c 100644
--- a/mrbgems/mruby-eval/src/eval.c
+++ b/mrbgems/mruby-eval/src/eval.c
@@ -1,5 +1,95 @@
 #include "mruby.h"
 #include "mruby/compile.h"
+#include "mruby/irep.h"
+#include "mruby/proc.h"
+#include "opcode.h"
+
+static struct mrb_irep *
+get_closure_irep(mrb_state *mrb, int level)
+{
+  struct REnv *e = mrb->c->ci[-1].proc->env;
+  struct RProc *proc;
+
+  if (level == 0) {
+    return mrb->c->ci[-1].proc->body.irep;
+  }
+    
+  while (--level) {
+    e = (struct REnv*)e->c;
+    if (!e) return NULL;
+  }
+
+  if (!e) return NULL;
+  proc = mrb->c->cibase[e->cioff].proc;
+
+  return proc->body.irep;
+}
+
+static inline mrb_code
+search_variable(mrb_state *mrb, mrb_sym vsym)
+{
+  mrb_irep *virep;
+  int level;
+  int pos;
+
+  for (level = 0; (virep = get_closure_irep(mrb, level)); level++) {
+    if (virep->lv == NULL) {
+      continue;
+    }
+    for (pos = 0; pos < virep->nlocals - 1; pos++) {
+      if (vsym == virep->lv[pos].name) {
+	return (MKARG_B(pos + 1) | MKARG_C(level));
+      }
+    }
+  }
+
+  return 0;
+}
+
+
+static void
+patch_irep(mrb_state *mrb, mrb_irep *irep)
+{
+  int i;
+  mrb_code c;
+
+  for (i = 0; i < irep->ilen; i++) {
+    c = irep->iseq[i];
+    switch(GET_OPCODE(c)){
+    case OP_SEND:
+      if (GETARG_C(c) != 0) {
+	break;
+      }
+      {
+	mrb_code arg = search_variable(mrb, irep->syms[GETARG_B(c)]);
+	if (arg != 0) {
+	  /* must replace */
+	  irep->iseq[i] = MKOPCODE(OP_GETUPVAR) | MKARG_A(GETARG_A(c)) | arg;
+	}
+      }
+      break;
+
+    case OP_MOVE:
+      /* src part */
+      if (GETARG_B(c) < irep->nlocals) {
+	mrb_code arg = search_variable(mrb, irep->lv[GETARG_B(c) - 1].name);
+	if (arg != 0) {
+	  /* must replace */
+	  irep->iseq[i] = MKOPCODE(OP_GETUPVAR) | MKARG_A(GETARG_A(c)) | arg;
+	}
+      }
+      /* dst part */
+      if (GETARG_A(c) < irep->nlocals) {
+	mrb_code arg = search_variable(mrb, irep->lv[GETARG_A(c) - 1].name);
+	if (arg != 0) {
+	  /* must replace */
+	  irep->iseq[i] = MKOPCODE(OP_SETUPVAR) | MKARG_A(GETARG_B(c)) | arg;
+	}
+      }
+      break;
+    }
+  }
+}
 
 static struct RProc*
 create_proc_from_string(mrb_state *mrb, char *s, int len, mrb_value binding, char *file, mrb_int line)
@@ -7,6 +97,7 @@ create_proc_from_string(mrb_state *mrb, char *s, int len, mrb_value binding, cha
   mrbc_context *cxt;
   struct mrb_parser_state *p;
   struct RProc *proc;
+  struct REnv *e;
 
   if (!mrb_nil_p(binding)) {
     mrb_raise(mrb, E_ARGUMENT_ERROR, "Binding of eval must be nil.");
@@ -34,6 +125,13 @@ create_proc_from_string(mrb_state *mrb, char *s, int len, mrb_value binding, cha
   }
 
   proc = mrb_generate_code(mrb, p);
+  e = (struct REnv*)mrb_obj_alloc(mrb, MRB_TT_ENV, (struct RClass*)mrb->c->ci[-1].proc->env);
+  e->mid = mrb->c->ci[-1].mid;
+  e->cioff = mrb->c->ci - mrb->c->cibase - 1;
+  e->stack = mrb->c->ci->stackent;
+  mrb->c->ci->env = e;
+  proc->env = e;
+  patch_irep(mrb, proc->body.irep);
 
   mrb_parser_free(p);
   mrbc_context_free(mrb, cxt);
@@ -55,10 +153,12 @@ f_eval(mrb_state *mrb, mrb_value self)
   char *file = NULL;
   mrb_int line = 1;
   mrb_value ret;
+  struct RProc *proc;
 
   mrb_get_args(mrb, "s|ozi", &s, &len, &binding, &file, &line);
 
-  ret = mrb_toplevel_run(mrb, create_proc_from_string(mrb, s, len, binding, file, line));
+  proc = create_proc_from_string(mrb, s, len, binding, file, line);
+  ret = mrb_toplevel_run(mrb, proc);
   if (mrb->exc) {
     mrb_exc_raise(mrb, mrb_obj_value(mrb->exc));
   }
@@ -76,3 +176,4 @@ void
 mrb_mruby_eval_gem_final(mrb_state* mrb)
 {
 }
+