diff options
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 33 |
1 files changed, 22 insertions, 11 deletions
@@ -9478,10 +9478,10 @@ node_assign(struct parser_params *p, NODE *lhs, NODE *rhs, const YYLTYPE *loc) return lhs; } -static int -value_expr_gen(struct parser_params *p, NODE *node) +static NODE * +value_expr_check(struct parser_params *p, NODE *node) { - int cond = 0; + NODE *void_node = 0, *vn; if (!node) { rb_warning0("empty expression"); @@ -9493,9 +9493,7 @@ value_expr_gen(struct parser_params *p, NODE *node) case NODE_NEXT: case NODE_REDO: case NODE_RETRY: - if (!cond) yyerror1(&node->nd_loc, "void value expression"); - /* or "control never reach"? */ - return FALSE; + return void_node ? void_node : node; case NODE_BLOCK: while (node->nd_next) { @@ -9518,14 +9516,15 @@ value_expr_gen(struct parser_params *p, NODE *node) node = node->nd_body; break; } - if (!value_expr(node->nd_body)) return FALSE; + vn = value_expr_check(p, node->nd_body); + if (!vn) return NULL; + if (!void_node) void_node = vn; node = node->nd_else; break; case NODE_AND: case NODE_OR: - cond = 1; - node = node->nd_2nd; + node = node->nd_1st; break; case NODE_LASGN: @@ -9533,13 +9532,25 @@ value_expr_gen(struct parser_params *p, NODE *node) case NODE_DASGN_CURR: case NODE_MASGN: mark_lvar_used(p, node); - return TRUE; + return NULL; default: - return TRUE; + return NULL; } } + return NULL; +} + +static int +value_expr_gen(struct parser_params *p, NODE *node) +{ + NODE *void_node = value_expr_check(p, node); + if (void_node) { + yyerror1(&void_node->nd_loc, "void value expression"); + /* or "control never reach"? */ + return FALSE; + } return TRUE; } |