1 files changed, 184 insertions, 28 deletions

diff --git a/mrbgems/mruby-eval/src/eval.c b/mrbgems/mruby-eval/src/eval.c
index b439b7378..508f5ffcb 100644
--- a/mrbgems/mruby-eval/src/eval.c
+++ b/mrbgems/mruby-eval/src/eval.c
@@ -1,75 +1,231 @@
-#include "mruby.h"
-#include "mruby/compile.h"
+#include <mruby.h>
+#include <mruby/class.h>
+#include <mruby/compile.h>
+#include <mruby/irep.h>
+#include <mruby/proc.h>
+#include <mruby/opcode.h>
+#include <mruby/error.h>
+#include <mruby/presym.h>
+#include <mruby/variable.h>
+
+struct REnv *mrb_env_new(mrb_state *mrb, struct mrb_context *c, mrb_callinfo *ci, int nstacks, mrb_value *stack, struct RClass *tc);
+mrb_value mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p, mrb_func_t posthook);
+mrb_value mrb_obj_instance_eval(mrb_state *mrb, mrb_value self);
+void mrb_codedump_all(mrb_state*, struct RProc*);
+void mrb_proc_merge_lvar(mrb_state *mrb, mrb_irep *irep, struct REnv *env, int num, const mrb_sym *lv, const mrb_value *stack);
 
 static struct RProc*
-create_proc_from_string(mrb_state *mrb, char *s, int len, mrb_value binding, char *file, mrb_int line)
+create_proc_from_string(mrb_state *mrb, const char *s, mrb_int len, mrb_value binding, const char *file, mrb_int line)
 {
   mrbc_context *cxt;
   struct mrb_parser_state *p;
   struct RProc *proc;
+  const struct RProc *scope;
+  struct REnv *e;
+  mrb_callinfo *ci; /* callinfo of eval caller */
+  struct RClass *target_class = NULL;
+  struct mrb_context *c = mrb->c;
 
   if (!mrb_nil_p(binding)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "Binding of eval must be nil.");
+    mrb_value scope_obj;
+    if (!mrb_class_defined_id(mrb, MRB_SYM(Binding))
+        || !mrb_obj_is_kind_of(mrb, binding, mrb_class_get_id(mrb, MRB_SYM(Binding)))) {
+      mrb_raisef(mrb, E_TYPE_ERROR, "wrong argument type %C (expected binding)",
+          mrb_obj_class(mrb, binding));
+    }
+    scope_obj = mrb_iv_get(mrb, binding, MRB_SYM(proc));
+    mrb_assert(mrb_proc_p(scope_obj));
+    scope = mrb_proc_ptr(scope_obj);
+    if (MRB_PROC_CFUNC_P(scope)) {
+      e = NULL;
+    }
+    else {
+      mrb_value env = mrb_iv_get(mrb, binding, MRB_SYM(env));
+      mrb_assert(mrb_env_p(env));
+      e = (struct REnv *)mrb_obj_ptr(env);
+      mrb_assert(e != NULL);
+    }
+  }
+  else {
+    ci = (c->ci > c->cibase) ? c->ci - 1 : c->cibase;
+    scope = ci->proc;
+    e = NULL;
   }
 
   cxt = mrbc_context_new(mrb);
-  cxt->lineno = line;
-  if (file) {
-    mrbc_filename(mrb, cxt, file);
-  }
+  cxt->lineno = (uint16_t)line;
 
-  p = mrb_parser_new(mrb);
-  p->s = s;
-  p->send = s + len;
-  mrb_parser_parse(p, cxt);
+  mrbc_filename(mrb, cxt, file ? file : "(eval)");
+  cxt->capture_errors = TRUE;
+  cxt->no_optimize = TRUE;
+  cxt->upper = scope && MRB_PROC_CFUNC_P(scope) ? NULL : scope;
+
+  p = mrb_parse_nstring(mrb, s, len, cxt);
+
+  /* only occur when memory ran out */
+  if (!p) {
+    mrb_raise(mrb, E_RUNTIME_ERROR, "Failed to create parser state (out of memory)");
+  }
 
   if (0 < p->nerr) {
     /* parse error */
-    char buf[256];
-    int n;
-    n = snprintf(buf, sizeof(buf), "line %d: %s\n", p->error_buffer[0].lineno, p->error_buffer[0].message);
+    mrb_value str;
+
+    if (file) {
+      str = mrb_format(mrb, "file %s line %d: %s",
+                       file,
+                       p->error_buffer[0].lineno,
+                       p->error_buffer[0].message);
+    }
+    else {
+      str = mrb_format(mrb, "line %d: %s",
+                       p->error_buffer[0].lineno,
+                       p->error_buffer[0].message);
+    }
     mrb_parser_free(p);
     mrbc_context_free(mrb, cxt);
-    mrb_exc_raise(mrb, mrb_exc_new(mrb, E_SYNTAX_ERROR, buf, n));
+    mrb_exc_raise(mrb, mrb_exc_new_str(mrb, E_SYNTAX_ERROR, str));
   }
 
   proc = mrb_generate_code(mrb, p);
-
-  mrb_parser_free(p);
-  mrbc_context_free(mrb, cxt);
-
   if (proc == NULL) {
     /* codegen error */
+    mrb_parser_free(p);
+    mrbc_context_free(mrb, cxt);
     mrb_raise(mrb, E_SCRIPT_ERROR, "codegen error");
   }
+  if (c->ci > c->cibase) {
+    ci = &c->ci[-1];
+  }
+  else {
+    ci = c->cibase;
+  }
+  if (scope) {
+    target_class = MRB_PROC_TARGET_CLASS(scope);
+    if (!MRB_PROC_CFUNC_P(scope)) {
+      if (e == NULL) {
+        /* when `binding` is nil */
+        e = mrb_vm_ci_env(ci);
+        if (e == NULL) {
+          e = mrb_env_new(mrb, c, ci, ci->proc->body.irep->nlocals, ci->stack, target_class);
+          ci->u.env = e;
+        }
+      }
+      proc->e.env = e;
+      proc->flags |= MRB_PROC_ENVSET;
+      mrb_field_write_barrier(mrb, (struct RBasic*)proc, (struct RBasic*)e);
+    }
+  }
+  proc->upper = scope;
+  mrb_vm_ci_target_class_set(mrb->c->ci, target_class);
+  /* mrb_codedump_all(mrb, proc); */
+
+  mrb_parser_free(p);
+  mrbc_context_free(mrb, cxt);
 
   return proc;
 }
 
 static mrb_value
+exec_irep(mrb_state *mrb, mrb_value self, struct RProc *proc, mrb_func_t posthook)
+{
+  /* no argument passed from eval() */
+  mrb->c->ci->argc = 0;
+  /* clear block */
+  mrb->c->ci->stack[1] = mrb_nil_value();
+  return mrb_exec_irep(mrb, self, proc, posthook);
+}
+
+static void
+eval_merge_lvar(mrb_state *mrb, mrb_irep *irep, struct REnv *env, int num, const mrb_sym *lv, const mrb_value *stack)
+{
+  mrb_assert(mrb->c->stend >= stack + num);
+  mrb_proc_merge_lvar(mrb, irep, env, num, lv, stack);
+}
+
+static mrb_value
+eval_merge_lvar_hook(mrb_state *mrb, mrb_value dummy_self)
+{
+  const mrb_callinfo *orig_ci = &mrb->c->ci[1];
+  const struct RProc *orig_proc = orig_ci->proc;
+  const mrb_irep *orig_irep = orig_proc->body.irep;
+  int orig_nlocals = orig_irep->nlocals;
+
+  if (orig_nlocals > 1) {
+    struct RProc *proc = (struct RProc *)orig_proc->upper;
+    struct REnv *env = MRB_PROC_ENV(orig_proc);
+    eval_merge_lvar(mrb, (mrb_irep *)proc->body.irep, env,
+                    orig_nlocals - 1, orig_irep->lv,
+                    mrb->c->ci->stack + 3 /* hook proc + exc + ret val */);
+  }
+
+  mrb_value exc = mrb->c->ci->stack[1];
+  if (!mrb_nil_p(exc)) {
+    mrb_exc_raise(mrb, exc);
+  }
+
+  return mrb->c->ci->stack[2];
+}
+
+static mrb_value
 f_eval(mrb_state *mrb, mrb_value self)
 {
-  char *s;
+  const char *s;
   mrb_int len;
   mrb_value binding = mrb_nil_value();
-  char *file = NULL;
+  const char *file = NULL;
   mrb_int line = 1;
-  mrb_value ret;
+  struct RProc *proc;
+  mrb_func_t posthook = NULL;
 
   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));
-  if (mrb->exc) {
-    mrb_exc_raise(mrb, mrb_obj_value(mrb->exc));
+  proc = create_proc_from_string(mrb, s, len, binding, file, line);
+  if (!mrb_nil_p(binding)) {
+    self = mrb_iv_get(mrb, binding, MRB_SYM(recv));
+    if (mrb_env_p(mrb_iv_get(mrb, binding, MRB_SYM(env)))) {
+      posthook = eval_merge_lvar_hook;
+    }
   }
+  mrb_assert(!MRB_PROC_CFUNC_P(proc));
+  return exec_irep(mrb, self, proc, posthook);
+}
 
-  return ret;
+static mrb_value
+f_instance_eval(mrb_state *mrb, mrb_value self)
+{
+  mrb_value b;
+  mrb_int argc; const mrb_value *argv;
+
+  mrb_get_args(mrb, "*!&", &argv, &argc, &b);
+
+  if (mrb_nil_p(b)) {
+    const char *s;
+    mrb_int len;
+    const char *file = NULL;
+    mrb_int line = 1;
+    mrb_value cv;
+    struct RProc *proc;
+
+    mrb_get_args(mrb, "s|zi", &s, &len, &file, &line);
+    cv = mrb_singleton_class(mrb, self);
+    proc = create_proc_from_string(mrb, s, len, mrb_nil_value(), file, line);
+    MRB_PROC_SET_TARGET_CLASS(proc, mrb_class_ptr(cv));
+    mrb_assert(!MRB_PROC_CFUNC_P(proc));
+    mrb_vm_ci_target_class_set(mrb->c->ci, mrb_class_ptr(cv));
+    return exec_irep(mrb, self, proc, NULL);
+  }
+  else {
+    mrb_get_args(mrb, "&", &b);
+    return mrb_obj_instance_eval(mrb, self);
+  }
 }
 
 void
 mrb_mruby_eval_gem_init(mrb_state* mrb)
 {
-  mrb_define_module_function(mrb, mrb->kernel_module, "eval", f_eval, MRB_ARGS_REQ(1) | MRB_ARGS_OPT(3));
+  mrb_define_module_function(mrb, mrb->kernel_module, "eval", f_eval, MRB_ARGS_ARG(1, 3));
+  mrb_define_method_id(mrb, mrb_class_get_id(mrb, MRB_SYM(BasicObject)), MRB_SYM(instance_eval), f_instance_eval, MRB_ARGS_OPT(3)|MRB_ARGS_BLOCK());
 }
 
 void