diff options
| author | ydah <[email protected]> | 2024-09-27 02:32:27 +0900 |
|---|---|---|
| committer | Yuichiro Kaneko <[email protected]> | 2024-09-28 20:53:09 +0900 |
| commit | 8f678d69895d8b0562a52925a1840b698e021f56 () | |
| tree | 2bd7e499963b8403646b9940b1f0ff509c7bb96c | |
| parent | 027ef60500c43fecbd4784cf24a99f6955606567 (diff) | |
Implement OP_ASGN2 NODE locations
Notes: Merged: https://.com/ruby/ruby/pull/11702
| -rw-r--r-- | ast.c | 6 | ||||
| -rw-r--r-- | node_dump.c | 5 | ||||
| -rw-r--r-- | parse.y | 26 | ||||
| -rw-r--r-- | rubyparser.h | 3 | ||||
| -rw-r--r-- | test/ruby/test_ast.rb | 14 |
5 files changed, 42 insertions, 12 deletions
@@ -822,6 +822,12 @@ node_locations(VALUE ast_value, const NODE *node) location_new(&RNODE_OP_ASGN1(node)->opening_loc), location_new(&RNODE_OP_ASGN1(node)->closing_loc), location_new(&RNODE_OP_ASGN1(node)->binary_operator_loc)); case NODE_REDO: return rb_ary_new_from_args(2, location_new(nd_code_loc(node)), @@ -560,8 +560,11 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node) A_ID(RNODE_OP_ASGN2(node)->nd_vid); } F_ID(nd_mid, RNODE_OP_ASGN2, "operator"); - LAST_NODE; F_NODE(nd_value, RNODE_OP_ASGN2, "rvalue"); return; case NODE_OP_ASGN_AND: @@ -1087,7 +1087,7 @@ static rb_node_iasgn_t *rb_node_iasgn_new(struct parser_params *p, ID nd_vid, NO static rb_node_cdecl_t *rb_node_cdecl_new(struct parser_params *p, ID nd_vid, NODE *nd_value, NODE *nd_else, enum rb_parser_shareability shareability, const YYLTYPE *loc); static rb_node_cvasgn_t *rb_node_cvasgn_new(struct parser_params *p, ID nd_vid, NODE *nd_value, const YYLTYPE *loc); static rb_node_op_asgn1_t *rb_node_op_asgn1_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *index, NODE *rvalue, const YYLTYPE *loc, const YYLTYPE *call_operator_loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc, const YYLTYPE *binary_operator_loc); -static rb_node_op_asgn2_t *rb_node_op_asgn2_new(struct parser_params *p, NODE *nd_recv, NODE *nd_value, ID nd_vid, ID nd_mid, bool nd_aid, const YYLTYPE *loc); static rb_node_op_asgn_or_t *rb_node_op_asgn_or_new(struct parser_params *p, NODE *nd_head, NODE *nd_value, const YYLTYPE *loc); static rb_node_op_asgn_and_t *rb_node_op_asgn_and_new(struct parser_params *p, NODE *nd_head, NODE *nd_value, const YYLTYPE *loc); static rb_node_op_cdecl_t *rb_node_op_cdecl_new(struct parser_params *p, NODE *nd_head, NODE *nd_value, ID nd_aid, enum rb_parser_shareability shareability, const YYLTYPE *loc); @@ -1195,7 +1195,7 @@ static rb_node_error_t *rb_node_error_new(struct parser_params *p, const YYLTYPE #define NEW_CDECL(v,val,path,share,loc) (NODE *)rb_node_cdecl_new(p,v,val,path,share,loc) #define NEW_CVASGN(v,val,loc) (NODE *)rb_node_cvasgn_new(p,v,val,loc) #define NEW_OP_ASGN1(r,id,idx,rval,loc,c_op_loc,o_loc,c_loc,b_op_loc) (NODE *)rb_node_op_asgn1_new(p,r,id,idx,rval,loc,c_op_loc,o_loc,c_loc,b_op_loc) -#define NEW_OP_ASGN2(r,t,i,o,val,loc) (NODE *)rb_node_op_asgn2_new(p,r,val,i,o,t,loc) #define NEW_OP_ASGN_OR(i,val,loc) (NODE *)rb_node_op_asgn_or_new(p,i,val,loc) #define NEW_OP_ASGN_AND(i,val,loc) (NODE *)rb_node_op_asgn_and_new(p,i,val,loc) #define NEW_OP_CDECL(v,op,val,share,loc) (NODE *)rb_node_op_cdecl_new(p,v,val,op,share,loc) @@ -1454,7 +1454,7 @@ static NODE *node_assign(struct parser_params*,NODE*,NODE*,struct lex_context,co static NODE *new_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, struct lex_context, const YYLTYPE *loc); static NODE *new_ary_op_assign(struct parser_params *p, NODE *ary, NODE *args, ID op, NODE *rhs, const YYLTYPE *args_loc, const YYLTYPE *loc, const YYLTYPE *call_operator_loc, const YYLTYPE *opening_loc, const YYLTYPE *closing_loc, const YYLTYPE *binary_operator_loc); -static NODE *new_attr_op_assign(struct parser_params *p, NODE *lhs, ID atype, ID attr, ID op, NODE *rhs, const YYLTYPE *loc); static NODE *new_const_op_assign(struct parser_params *p, NODE *lhs, ID op, NODE *rhs, struct lex_context, const YYLTYPE *loc); static NODE *new_bodystmt(struct parser_params *p, NODE *head, NODE *rescue, NODE *rescue_else, NODE *ensure, const YYLTYPE *loc); @@ -3278,7 +3278,7 @@ command_asgn : lhs '=' lex_ctxt command_rhs } | primary_value call_op ident_or_const tOP_ASGN lex_ctxt command_rhs { - $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$); /*% ripper: opassign!(field!($:1, $:2, $:3), $:4, $:6) %*/ } | primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt command_rhs @@ -3289,7 +3289,7 @@ command_asgn : lhs '=' lex_ctxt command_rhs } | primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt command_rhs { - $$ = new_attr_op_assign(p, $1, idCOLON2, $3, $4, $6, &@$); /*% ripper: opassign!(field!($:1, $:2, $:3), $:4, $:6) %*/ } | defn_head[head] f_opt_paren_args[args] '=' endless_command[bodystmt] @@ -3878,17 +3878,17 @@ arg : lhs '=' lex_ctxt arg_rhs } | primary_value call_op tIDENTIFIER tOP_ASGN lex_ctxt arg_rhs { - $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$); /*% ripper: opassign!(field!($:1, $:2, $:3), $:4, $:6) %*/ } | primary_value call_op tCONSTANT tOP_ASGN lex_ctxt arg_rhs { - $$ = new_attr_op_assign(p, $1, $2, $3, $4, $6, &@$); /*% ripper: opassign!(field!($:1, $:2, $:3), $:4, $:6) %*/ } | primary_value tCOLON2 tIDENTIFIER tOP_ASGN lex_ctxt arg_rhs { - $$ = new_attr_op_assign(p, $1, idCOLON2, $3, $4, $6, &@$); /*% ripper: opassign!(field!($:1, $:2, $:3), $:4, $:6) %*/ } | primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt arg_rhs @@ -11940,7 +11940,7 @@ rb_node_op_asgn1_new(struct parser_params *p, NODE *nd_recv, ID nd_mid, NODE *in } static rb_node_op_asgn2_t * -rb_node_op_asgn2_new(struct parser_params *p, NODE *nd_recv, NODE *nd_value, ID nd_vid, ID nd_mid, bool nd_aid, const YYLTYPE *loc) { rb_node_op_asgn2_t *n = NODE_NEWNODE(NODE_OP_ASGN2, rb_node_op_asgn2_t, loc); n->nd_recv = nd_recv; @@ -11948,6 +11948,9 @@ rb_node_op_asgn2_new(struct parser_params *p, NODE *nd_recv, NODE *nd_value, ID n->nd_vid = nd_vid; n->nd_mid = nd_mid; n->nd_aid = nd_aid; return n; } @@ -14849,11 +14852,12 @@ new_ary_op_assign(struct parser_params *p, NODE *ary, static NODE * new_attr_op_assign(struct parser_params *p, NODE *lhs, - ID atype, ID attr, ID op, NODE *rhs, const YYLTYPE *loc) { NODE *asgn; - asgn = NEW_OP_ASGN2(lhs, CALL_Q_P(atype), attr, op, rhs, loc); fixpos(asgn, lhs); return asgn; } @@ -469,6 +469,9 @@ typedef struct RNode_OP_ASGN2 { ID nd_vid; ID nd_mid; bool nd_aid; } rb_node_op_asgn2_t; typedef struct RNode_OP_ASGN_AND { @@ -1397,6 +1397,20 @@ dummy assert_locations(node.children[-1].locations, [[1, 0, 1, 6], [1, 2, 1, 4]]) end def test_redo_locations node = ast_parse("loop { redo }") assert_locations(node.children[-1].children[-1].children[-1].locations, [[1, 7, 1, 11], [1, 7, 1, 11]]) |