diff options
| author | take_cheeze <[email protected]> | 2014-05-19 22:05:02 +0900 |
|---|---|---|
| committer | take_cheeze <[email protected]> | 2014-05-19 22:05:02 +0900 |
| commit | d8d07a234507e63a3ffad65309a62b484028381e (patch) | |
| tree | d758c460fec7423b6e23dcf0fd962fde978ee6fb /mrbgems/mruby-proc-ext | |
| parent | c4268f67d052aa55f9cce3307d846285f1e6519b (diff) | |
| download | mruby-d8d07a234507e63a3ffad65309a62b484028381e.tar.gz mruby-d8d07a234507e63a3ffad65309a62b484028381e.zip | |
Move `Kernel.local_variables` to core.
Diffstat (limited to 'mrbgems/mruby-proc-ext')
| -rw-r--r-- | mrbgems/mruby-proc-ext/src/proc.c | 46 | ||||
| -rw-r--r-- | mrbgems/mruby-proc-ext/test/proc.rb | 14 |
2 files changed, 0 insertions, 60 deletions
diff --git a/mrbgems/mruby-proc-ext/src/proc.c b/mrbgems/mruby-proc-ext/src/proc.c index 546ed49e5..b105c95d7 100644 --- a/mrbgems/mruby-proc-ext/src/proc.c +++ b/mrbgems/mruby-proc-ext/src/proc.c @@ -122,51 +122,6 @@ mrb_kernel_proc(mrb_state *mrb, mrb_value self) return blk; } -static mrb_value -mrb_local_variables(mrb_state *mrb, mrb_value self) -{ - mrb_value ret; - struct RProc *proc; - struct mrb_irep *irep; - size_t i; - - proc = mrb->c->ci[-1].proc; - - if (MRB_PROC_CFUNC_P(proc)) { - return mrb_ary_new(mrb); - } - - irep = proc->body.irep; - if (!irep->lv) { - return mrb_ary_new(mrb); - } - ret = mrb_ary_new_capa(mrb, irep->nlocals - 1); - for (i = 0; i + 1 < irep->nlocals; ++i) { - if (irep->lv[i].name) { - mrb_ary_push(mrb, ret, mrb_symbol_value(irep->lv[i].name)); - } - } - if (proc->env) { - struct REnv *e = proc->env; - - while (e) { - if (!MRB_PROC_CFUNC_P(mrb->c->cibase[e->cioff].proc)) { - irep = mrb->c->cibase[e->cioff].proc->body.irep; - if (irep->lv) { - for (i = 0; i + 1 < irep->nlocals; ++i) { - if (irep->lv[i].name) { - mrb_ary_push(mrb, ret, mrb_symbol_value(irep->lv[i].name)); - } - } - } - } - e = (struct REnv*)e->c; - } - } - - return ret; -} - void mrb_mruby_proc_ext_gem_init(mrb_state* mrb) { @@ -178,7 +133,6 @@ mrb_mruby_proc_ext_gem_init(mrb_state* mrb) mrb_define_class_method(mrb, mrb->kernel_module, "proc", mrb_kernel_proc, MRB_ARGS_NONE()); mrb_define_method(mrb, mrb->kernel_module, "proc", mrb_kernel_proc, MRB_ARGS_NONE()); - mrb_define_module_function(mrb, mrb->kernel_module, "local_variables", mrb_local_variables, MRB_ARGS_NONE()); } void diff --git a/mrbgems/mruby-proc-ext/test/proc.rb b/mrbgems/mruby-proc-ext/test/proc.rb index 443bd330c..0f5ecfb94 100644 --- a/mrbgems/mruby-proc-ext/test/proc.rb +++ b/mrbgems/mruby-proc-ext/test/proc.rb @@ -74,17 +74,3 @@ assert('mrb_cfunc_env_get') do assert_equal 1, t.get_int(1) end - -assert('Kernel.local_variables', '15.3.1.2.7') do - a, b = 0, 1 - a += b - - vars = Kernel.local_variables.sort - assert_equal [:a, :b, :vars], vars - - proc { - c = 2 - vars = Kernel.local_variables.sort - assert_equal [:a, :b, :c, :vars], vars - }.call -end |
