diff options
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 19 |
1 files changed, 17 insertions, 2 deletions
@@ -369,6 +369,7 @@ static void fixpos(NODE*,NODE*); static int value_expr_gen(struct parser_params*,NODE*); static void void_expr_gen(struct parser_params*,NODE*); static NODE *remove_begin(NODE*); +static NODE *remove_begin_all(NODE*); #define value_expr(node) value_expr_gen(parser, (node) = remove_begin(node)) #define void_expr0(node) void_expr_gen(parser, (node)) #define void_expr(node) void_expr0((node) = remove_begin(node)) @@ -438,6 +439,8 @@ static NODE *new_attr_op_assign_gen(struct parser_params *parser, NODE *lhs, ID static NODE *new_const_op_assign_gen(struct parser_params *parser, NODE *lhs, ID op, NODE *rhs); #define new_const_op_assign(lhs, op, rhs) new_const_op_assign_gen(parser, (lhs), (op), (rhs)) +#define new_defined(expr) NEW_DEFINED(remove_begin_all(expr)) + static NODE *match_op_gen(struct parser_params*,NODE*,NODE*); #define match_op(node1,node2) match_op_gen(parser, (node1), (node2)) @@ -616,6 +619,8 @@ new_args_tail_gen(struct parser_params *parser, VALUE k, VALUE kr, VALUE b) } #define new_args_tail(k,kr,b) new_args_tail_gen(parser, (k),(kr),(b)) +#define new_defined(expr) dispatch1(defined, (expr)) + #define FIXME 0 #endif /* RIPPER */ @@ -2305,7 +2310,7 @@ arg : lhs '=' arg { /*%%%*/ in_defined = 0; - $$ = NEW_DEFINED($4); + $$ = new_defined($4); /*% in_defined = 0; $$ = dispatch1(defined, $4); @@ -2705,7 +2710,7 @@ primary : literal { /*%%%*/ in_defined = 0; - $$ = NEW_DEFINED($5); + $$ = new_defined($5); /*% in_defined = 0; $$ = dispatch1(defined, $5); @@ -8926,6 +8931,16 @@ remove_begin(NODE *node) return node; } +static NODE * +remove_begin_all(NODE *node) +{ + NODE **n = &node, *n1 = node; + while (n1 && nd_type(n1) == NODE_BEGIN) { + *n = n1 = n1->nd_body; + } + return node; +} + static void reduce_nodes_gen(struct parser_params *parser, NODE **body) { |