Merge pull request #1985 from take-cheeze/cfunc_with_env

Add API to define cfunc Proc with userdata.

1 files changed, 43 insertions, 0 deletions

diff --git a/mrbgems/mruby-proc-ext/src/proc.c b/mrbgems/mruby-proc-ext/src/proc.c
index 4e41891a4..507f91d7d 100644
--- a/mrbgems/mruby-proc-ext/src/proc.c
+++ b/mrbgems/mruby-proc-ext/src/proc.c
@@ -4,6 +4,49 @@
 #include "mruby/string.h"
 #include "mruby/debug.h"
 
+struct RProc *
+mrb_proc_new_cfunc_with_env(mrb_state *mrb, mrb_func_t f, mrb_int argc, const mrb_value *argv)
+{
+  struct RProc *p;
+  struct REnv *e;
+  int ai, i;
+
+  p = mrb_proc_new_cfunc(mrb, f);
+  ai = mrb_gc_arena_save(mrb);
+  e = (struct REnv*)mrb_obj_alloc(mrb, MRB_TT_ENV, NULL);
+  p->env = e;
+  mrb_gc_arena_restore(mrb, ai);
+
+  e->cioff = -1;
+  e->flags = argc;
+  e->stack = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * argc);
+  for (i = 0; i < argc; ++i) {
+    e->stack[i] = argv[i];
+  }
+
+  return p;
+}
+
+mrb_value
+mrb_cfunc_env_get(mrb_state *mrb, mrb_int idx)
+{
+  struct RProc *p = mrb->c->ci->proc;
+  struct REnv *e = p->env;
+
+  if (!MRB_PROC_CFUNC_P(p)) {
+    mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from non-cfunc proc.");
+  }
+  if (!e) {
+    mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from cfunc Proc without REnv.");
+  }
+  if (idx < 0 || e->flags <= idx) {
+    mrb_raisef(mrb, E_INDEX_ERROR, "Env index out of range: %S (expected: 0 <= index < %S)",
+               mrb_fixnum_value(idx), mrb_fixnum_value(e->flags));
+  }
+
+  return e->stack[idx];
+}
+
 static mrb_value
 mrb_proc_lambda(mrb_state *mrb, mrb_value self)
 {