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: clean up void_expr_error for variable-sized nodes only

Browse Source 
Remove obsolete cons-list node cases since control flow nodes (break,
return, next, redo, retry) and logical operators (and, or) are now
always created as variable-sized nodes. Move and/or handling to inner
switch with proper struct field access.

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-09-04 12:27:59 +09:00
parent c6af438500
commit 931c41aa94
2 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/parse.y
+20 -12
View File
@@ -5274,18 +5274,26 @@ void_expr_error(parser_state *p, node *n)
if (n == NULL) return;
c = node_to_int(n->car);
switch (c) {
case NODE_BREAK:
case NODE_RETURN:
case NODE_NEXT:
case NODE_REDO:
case NODE_RETRY:
yyerror(NULL, p, "void value expression");
break;
case NODE_AND:
case NODE_OR:
if (n->cdr) {
void_expr_error(p, n->cdr->car);
void_expr_error(p, n->cdr->cdr);
case NODE_VARIABLE:
/* Handle variable-sized nodes */
switch (VAR_NODE_TYPE(n->cdr)) {
case NODE_BREAK:
case NODE_RETURN:
case NODE_NEXT:
case NODE_REDO:
case NODE_RETRY:
yyerror(NULL, p, "void value expression");
break;
case NODE_AND:
case NODE_OR:
{
struct mrb_ast_and_node *and_n = (struct mrb_ast_and_node*)n->cdr;
void_expr_error(p, (node*)and_n->left);
void_expr_error(p, (node*)and_n->right);
}
break;
default:
break;
}
break;
case NODE_STMTS:
mrbgems/mruby-compiler/core/y.tab.c
+20 -12
View File
@@ -12099,18 +12099,26 @@ void_expr_error(parser_state *p, node *n)
if (n == NULL) return;
c = node_to_int(n->car);
switch (c) {
case NODE_BREAK:
case NODE_RETURN:
case NODE_NEXT:
case NODE_REDO:
case NODE_RETRY:
yyerror(NULL, p, "void value expression");
break;
case NODE_AND:
case NODE_OR:
if (n->cdr) {
void_expr_error(p, n->cdr->car);
void_expr_error(p, n->cdr->cdr);
case NODE_VARIABLE:
/* Handle variable-sized nodes */
switch (VAR_NODE_TYPE(n->cdr)) {
case NODE_BREAK:
case NODE_RETURN:
case NODE_NEXT:
case NODE_REDO:
case NODE_RETRY:
yyerror(NULL, p, "void value expression");
break;
case NODE_AND:
case NODE_OR:
{
struct mrb_ast_and_node *and_n = (struct mrb_ast_and_node*)n->cdr;
void_expr_error(p, (node*)and_n->left);
void_expr_error(p, (node*)and_n->right);
}
break;
default:
break;
}
break;
case NODE_STMTS: