admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

proc.c: combine variable declaration with initialization

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-10-31 22:44:34 +09:00
parent fa8c460c61
commit ed82cea4ca
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/proc.c
+6 -13
View File
@@ -294,14 +294,12 @@ static mrb_value
mrb_proc_s_new(mrb_state *mrb, mrb_value proc_class)
{
mrb_value blk;
mrb_value proc;
struct RProc *p;
/* Calling Proc.new without a block is not implemented yet */
mrb_get_args(mrb, "&!", &blk);
p = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, mrb_class_ptr(proc_class));
struct RProc *p = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, mrb_class_ptr(proc_class));
mrb_proc_copy(mrb, p, mrb_proc_ptr(blk));
proc = mrb_obj_value(p);
mrb_value proc = mrb_obj_value(p);
mrb_funcall_with_block(mrb, proc, MRB_SYM(initialize), 0, NULL, proc);
if (!MRB_PROC_STRICT_P(p) &&
mrb->c->ci > mrb->c->cibase && MRB_PROC_ENV(p) == mrb->c->ci[-1].u.env) {
@@ -377,14 +375,13 @@ static mrb_value
proc_lambda(mrb_state *mrb, mrb_value self)
{
mrb_value blk;
const struct RProc *p;
mrb_get_args(mrb, "&", &blk);
if (mrb_nil_p(blk)) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "tried to create Proc object without a block");
}
check_proc(mrb, blk);
p = mrb_proc_ptr(blk);
const struct RProc *p = mrb_proc_ptr(blk);
if (!MRB_PROC_STRICT_P(p)) {
struct RProc *p2 = MRB_OBJ_ALLOC(mrb, MRB_TT_PROC, p->c);
mrb_proc_copy(mrb, p2, p);
@@ -431,19 +428,15 @@ mrb_proc_arity(const struct RProc *p)
mrb_value
mrb_proc_local_variables(mrb_state *mrb, const struct RProc *proc)
{
const mrb_irep *irep;
mrb_value vars;
size_t i;
if (proc == NULL || MRB_PROC_CFUNC_P(proc)) {
return mrb_ary_new(mrb);
}
vars = mrb_hash_new(mrb);
mrb_value vars = mrb_hash_new(mrb);
while (proc) {
if (MRB_PROC_CFUNC_P(proc)) break;
irep = proc->body.irep;
const mrb_irep *irep = proc->body.irep;
if (irep->lv) {
for (i = 0; i + 1 < irep->nlocals; i++) {
for (size_t i = 0; i + 1 < irep->nlocals; i++) {
if (irep->lv[i]) {
mrb_sym sym = irep->lv[i];
const char *name = mrb_sym_name(mrb, sym);