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

mruby-compiler: complete NODE_BLOCK_ARG migration to variable-sized nodes

Browse Source 
Remove traditional NODE_BLOCK_ARG support from main codegen() switch and
eliminate synthetic node creation in gen_block_arg_var. The function now
handles the variable-sized node directly without creating temporary
traditional nodes on the stack.

This completes the NODE_BLOCK_ARG migration by removing the dual handling
pattern while maintaining the gen_block_arg_var function for better code
organization and readability.

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-09-10 11:27:38 +09:00
parent af87c87f5f
commit f4507c0cbf
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/codegen.c
+15 -28
View File
@@ -3954,25 +3954,6 @@ codegen_sdef(codegen_scope *s, node *tree, int val)
if (val) push();
}
static void
codegen_block_arg(codegen_scope *s, node *tree, int val)
{
if (!tree) {
int idx = lv_idx(s, MRB_OPSYM_2(s->mrb, and));
if (idx == 0) {
gen_getupvar(s, cursp(), MRB_OPSYM_2(s->mrb, and));
}
else {
gen_move(s, cursp(), idx, val);
}
if (val) push();
}
else {
codegen(s, tree, val);
}
}
/* Handle variable-sized node types */
static void
gen_call_var(codegen_scope *s, node *varnode, int val)
@@ -5688,11 +5669,21 @@ static void
gen_block_arg_var(codegen_scope *s, node *varnode, int val)
{
struct mrb_ast_block_arg_node *n = block_arg_node(varnode);
// Create stack-allocated node structure for traditional codegen
struct mrb_ast_head_node stack_node = {0};
stack_node.car = (node*)NODE_BLOCK_ARG;
stack_node.cdr = n->value;
codegen_block_arg(s, (node*)&stack_node, val);
if (!n->value) {
int idx = lv_idx(s, MRB_OPSYM_2(s->mrb, and));
if (idx == 0) {
gen_getupvar(s, cursp(), MRB_OPSYM_2(s->mrb, and));
}
else {
gen_move(s, cursp(), idx, val);
}
if (val) push();
}
else {
codegen(s, n->value, val);
}
}
static void
@@ -6241,10 +6232,6 @@ codegen(codegen_scope *s, node *tree, int val)
codegen_const(s, node_to_sym(tree), val);
break;
case NODE_BLOCK_ARG:
codegen_block_arg(s, tree, val);
break;
case NODE_DEF:
codegen_def(s, tree, val);
break;