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: fix NODE_CASE dump to properly handle when clauses

Browse Source 
The NODE_CASE dump was treating the case body as a single varnode,
but it's actually a cons-list structure containing when clauses.
Changed to iterate through the cons-list similar to rescue clauses,
allowing proper display of when conditions and bodies.

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-09-29 10:53:29 +09:00
parent 759c1b1eff
commit eae2501ff1
2 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/parse.y
+22 -11
View File
@@ -8064,18 +8064,29 @@ dump_node(mrb_state *mrb, node *tree, int offset)
case NODE_CASE:
printf("NODE_CASE:\n");
if (tree->car) {
dump_node(mrb, tree->car, offset+1);
if (CASE_NODE_VALUE(tree)) {
dump_prefix(offset+1, lineno);
printf("value:\n");
dump_node(mrb, CASE_NODE_VALUE(tree), offset+2);
}
tree = tree->cdr;
while (tree) {
dump_prefix(offset+1, lineno);
printf("case:\n");
dump_recur(mrb, tree->car->car, offset+2);
dump_prefix(offset+1, lineno);
printf("body:\n");
dump_node(mrb, tree->car->cdr, offset+2);
tree = tree->cdr;
if (CASE_NODE_BODY(tree)) {
node *when_node = CASE_NODE_BODY(tree);
while (when_node) {
dump_prefix(offset+1, lineno);
printf("when:\n");
node *when_clause = when_node->car;
if (when_clause && when_clause->car) {
dump_prefix(offset+2, lineno);
printf("cond:\n");
dump_recur(mrb, when_clause->car, offset+3);
}
if (when_clause && when_clause->cdr) {
dump_prefix(offset+2, lineno);
printf("body:\n");
dump_node(mrb, when_clause->cdr, offset+3);
}
when_node = when_node->cdr;
}
}
break;
mrbgems/mruby-compiler/core/y.tab.c
+22 -11
View File
@@ -14893,18 +14893,29 @@ dump_node(mrb_state *mrb, node *tree, int offset)
case NODE_CASE:
printf("NODE_CASE:\n");
if (tree->car) {
dump_node(mrb, tree->car, offset+1);
if (CASE_NODE_VALUE(tree)) {
dump_prefix(offset+1, lineno);
printf("value:\n");
dump_node(mrb, CASE_NODE_VALUE(tree), offset+2);
}
tree = tree->cdr;
while (tree) {
dump_prefix(offset+1, lineno);
printf("case:\n");
dump_recur(mrb, tree->car->car, offset+2);
dump_prefix(offset+1, lineno);
printf("body:\n");
dump_node(mrb, tree->car->cdr, offset+2);
tree = tree->cdr;
if (CASE_NODE_BODY(tree)) {
node *when_node = CASE_NODE_BODY(tree);
while (when_node) {
dump_prefix(offset+1, lineno);
printf("when:\n");
node *when_clause = when_node->car;
if (when_clause && when_clause->car) {
dump_prefix(offset+2, lineno);
printf("cond:\n");
dump_recur(mrb, when_clause->car, offset+3);
}
if (when_clause && when_clause->cdr) {
dump_prefix(offset+2, lineno);
printf("body:\n");
dump_node(mrb, when_clause->cdr, offset+3);
}
when_node = when_node->cdr;
}
}
break;