1 files changed, 19 insertions, 14 deletions

diff --git a/mrbgems/mruby-binding-core/src/binding-core.c b/mrbgems/mruby-binding-core/src/binding-core.c
index 4899dcc20..0113fc030 100644
--- a/mrbgems/mruby-binding-core/src/binding-core.c
+++ b/mrbgems/mruby-binding-core/src/binding-core.c
@@ -1,39 +1,44 @@
-#include "mruby.h"
-#include "mruby/array.h"
-#include "mruby/hash.h"
-#include "mruby/proc.h"
-#include "mruby/variable.h"
+#include <mruby.h>
+#include <mruby/array.h>
+#include <mruby/hash.h>
+#include <mruby/proc.h>
+#include <mruby/variable.h>
+#include <mruby/presym.h>
 
-mrb_value proc_local_variables(mrb_state *mrb, struct RProc *proc);
+mrb_value mrb_proc_local_variables(mrb_state *mrb, const struct RProc *proc);
 
 static mrb_value
 binding_local_variables(mrb_state *mrb, mrb_value self)
 {
-  struct RProc *proc = mrb_proc_ptr(mrb_iv_get(mrb, self, mrb_intern_lit(mrb, "proc")));
-  return proc_local_variables(mrb, proc);
+  const struct RProc *proc = mrb_proc_ptr(mrb_iv_get(mrb, self, MRB_SYM(proc)));
+  return mrb_proc_local_variables(mrb, proc);
 }
 
+const struct RProc *mrb_proc_get_caller(mrb_state *mrb, struct REnv **env);
+
 static mrb_value
 mrb_f_binding(mrb_state *mrb, mrb_value self)
 {
   struct RObject *obj;
   mrb_value binding;
   struct RProc *proc;
-  mrb_int i;
+  struct REnv *env;
 
   obj = (struct RObject*)mrb_obj_alloc(mrb, MRB_TT_OBJECT, mrb_class_get(mrb, "Binding"));
   binding = mrb_obj_value(obj);
-  proc = mrb->c->ci[-1].proc;
-  mrb_iv_set(mrb, binding, mrb_intern_lit(mrb, "proc"), mrb_obj_value(proc));
-  mrb_iv_set(mrb, binding, mrb_intern_lit(mrb, "recv"), self);
+  proc = (struct RProc*)mrb_proc_get_caller(mrb, &env);
+  mrb_iv_set(mrb, binding, MRB_SYM(proc), mrb_obj_value(proc));
+  mrb_iv_set(mrb, binding, MRB_SYM(recv), self);
+  mrb_iv_set(mrb, binding, MRB_SYM(env), mrb_obj_value(env));
   return binding;
 }
 
 void
-mrb_mruby_binding_gem_init(mrb_state *mrb)
+mrb_mruby_binding_core_gem_init(mrb_state *mrb)
 {
   struct RClass *binding = mrb_define_class(mrb, "Binding", mrb->object_class);
   mrb_undef_class_method(mrb, binding, "new");
+  mrb_undef_class_method(mrb, binding, "allocate");
 
   mrb_define_method(mrb, mrb->kernel_module, "binding", mrb_f_binding, MRB_ARGS_NONE());
 
@@ -41,6 +46,6 @@ mrb_mruby_binding_gem_init(mrb_state *mrb)
 }
 
 void
-mrb_mruby_binding_gem_final(mrb_state *mrb)
+mrb_mruby_binding_core_gem_final(mrb_state *mrb)
 {
 }