mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
Implement COLON2 NODE locations
This commit is contained in:
ydah
Yudai Takada
parent
2d96400c26
commit
c584790bde
Notes:
git
2025-06-15 13:37:34 +00:00
5 changed files with 31 additions and 11 deletions
5
ast.c
5
ast.c
|
|
@ -812,6 +812,11 @@ node_locations(VALUE ast_value, const NODE *node)
|
|||
location_new(&RNODE_CLASS(node)->class_keyword_loc),
|
||||
location_new(&RNODE_CLASS(node)->inheritance_operator_loc),
|
||||
location_new(&RNODE_CLASS(node)->end_keyword_loc));
|
||||
case NODE_COLON2:
|
||||
return rb_ary_new_from_args(3,
|
||||
location_new(nd_code_loc(node)),
|
||||
location_new(&RNODE_COLON2(node)->delimiter_loc),
|
||||
location_new(&RNODE_COLON2(node)->name_loc));
|
||||
case NODE_DOT2:
|
||||
return rb_ary_new_from_args(2,
|
||||
location_new(nd_code_loc(node)),
|
||||
|
|
|
|||
|
|
@ -1027,8 +1027,10 @@ dump_node(VALUE buf, VALUE indent, int comment, const NODE * node)
|
|||
ANN("format: [nd_head]::[nd_mid]");
|
||||
ANN("example: M::C");
|
||||
F_ID(nd_mid, RNODE_COLON2, "constant name");
|
||||
LAST_NODE;
|
||||
F_NODE(nd_head, RNODE_COLON2, "receiver");
|
||||
F_LOC(delimiter_loc, RNODE_COLON2);
|
||||
LAST_NODE;
|
||||
F_LOC(name_loc, RNODE_COLON2);
|
||||
return;
|
||||
|
||||
case NODE_COLON3:
|
||||
|
|
|
|||
22
parse.y
22
parse.y
|
|
@ -1146,7 +1146,7 @@ static rb_node_undef_t *rb_node_undef_new(struct parser_params *p, NODE *nd_unde
|
|||
static rb_node_class_t *rb_node_class_new(struct parser_params *p, NODE *nd_cpath, NODE *nd_body, NODE *nd_super, const YYLTYPE *loc, const YYLTYPE *class_keyword_loc, const YYLTYPE *inheritance_operator_loc, const YYLTYPE *end_keyword_loc);
|
||||
static rb_node_module_t *rb_node_module_new(struct parser_params *p, NODE *nd_cpath, NODE *nd_body, const YYLTYPE *loc);
|
||||
static rb_node_sclass_t *rb_node_sclass_new(struct parser_params *p, NODE *nd_recv, NODE *nd_body, const YYLTYPE *loc);
|
||||
static rb_node_colon2_t *rb_node_colon2_new(struct parser_params *p, NODE *nd_head, ID nd_mid, const YYLTYPE *loc);
|
||||
static rb_node_colon2_t *rb_node_colon2_new(struct parser_params *p, NODE *nd_head, ID nd_mid, const YYLTYPE *loc, const YYLTYPE *delimiter_loc, const YYLTYPE *name_loc);
|
||||
static rb_node_colon3_t *rb_node_colon3_new(struct parser_params *p, ID nd_mid, const YYLTYPE *loc);
|
||||
static rb_node_dot2_t *rb_node_dot2_new(struct parser_params *p, NODE *nd_beg, NODE *nd_end, const YYLTYPE *loc, const YYLTYPE *operator_loc);
|
||||
static rb_node_dot3_t *rb_node_dot3_new(struct parser_params *p, NODE *nd_beg, NODE *nd_end, const YYLTYPE *loc, const YYLTYPE *operator_loc);
|
||||
|
|
@ -1254,7 +1254,7 @@ static rb_node_error_t *rb_node_error_new(struct parser_params *p, const YYLTYPE
|
|||
#define NEW_CLASS(n,b,s,loc,ck_loc,io_loc,ek_loc) (NODE *)rb_node_class_new(p,n,b,s,loc,ck_loc,io_loc,ek_loc)
|
||||
#define NEW_MODULE(n,b,loc) (NODE *)rb_node_module_new(p,n,b,loc)
|
||||
#define NEW_SCLASS(r,b,loc) (NODE *)rb_node_sclass_new(p,r,b,loc)
|
||||
#define NEW_COLON2(c,i,loc) (NODE *)rb_node_colon2_new(p,c,i,loc)
|
||||
#define NEW_COLON2(c,i,loc,d_loc,n_loc) (NODE *)rb_node_colon2_new(p,c,i,loc,d_loc,n_loc)
|
||||
#define NEW_COLON3(i,loc) (NODE *)rb_node_colon3_new(p,i,loc)
|
||||
#define NEW_DOT2(b,e,loc,op_loc) (NODE *)rb_node_dot2_new(p,b,e,loc,op_loc)
|
||||
#define NEW_DOT3(b,e,loc,op_loc) (NODE *)rb_node_dot3_new(p,b,e,loc,op_loc)
|
||||
|
|
@ -3067,7 +3067,7 @@ rb_parser_ary_free(rb_parser_t *p, rb_parser_ary_t *ary)
|
|||
| primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt rhs
|
||||
{
|
||||
YYLTYPE loc = code_loc_gen(&@primary_value, &@tCONSTANT);
|
||||
$$ = new_const_op_assign(p, NEW_COLON2($primary_value, $tCONSTANT, &loc), $tOP_ASGN, $rhs, $lex_ctxt, &@$);
|
||||
$$ = new_const_op_assign(p, NEW_COLON2($primary_value, $tCONSTANT, &loc, &@tCOLON2, &@tCONSTANT), $tOP_ASGN, $rhs, $lex_ctxt, &@$);
|
||||
/*% ripper: opassign!(const_path_field!($:1, $:3), $:4, $:6) %*/
|
||||
}
|
||||
| tCOLON3 tCONSTANT tOP_ASGN lex_ctxt rhs
|
||||
|
|
@ -3756,7 +3756,7 @@ mlhs_node : user_or_keyword_variable
|
|||
| primary_value tCOLON2 tCONSTANT
|
||||
{
|
||||
/*% ripper: const_path_field!($:1, $:3) %*/
|
||||
$$ = const_decl(p, NEW_COLON2($1, $3, &@$), &@$);
|
||||
$$ = const_decl(p, NEW_COLON2($1, $3, &@$, &@2, &@3), &@$);
|
||||
}
|
||||
| tCOLON3 tCONSTANT
|
||||
{
|
||||
|
|
@ -3794,7 +3794,7 @@ lhs : user_or_keyword_variable
|
|||
| primary_value tCOLON2 tCONSTANT
|
||||
{
|
||||
/*% ripper: const_path_field!($:1, $:3) %*/
|
||||
$$ = const_decl(p, NEW_COLON2($1, $3, &@$), &@$);
|
||||
$$ = const_decl(p, NEW_COLON2($1, $3, &@$, &@2, &@3), &@$);
|
||||
}
|
||||
| tCOLON3 tCONSTANT
|
||||
{
|
||||
|
|
@ -3827,12 +3827,12 @@ cpath : tCOLON3 cname
|
|||
}
|
||||
| cname
|
||||
{
|
||||
$$ = NEW_COLON2(0, $1, &@$);
|
||||
$$ = NEW_COLON2(0, $1, &@$, &NULL_LOC, &@1);
|
||||
/*% ripper: const_ref!($:1) %*/
|
||||
}
|
||||
| primary_value tCOLON2 cname
|
||||
{
|
||||
$$ = NEW_COLON2($1, $3, &@$);
|
||||
$$ = NEW_COLON2($1, $3, &@$, &@2, &@3);
|
||||
/*% ripper: const_path_ref!($:1, $:3) %*/
|
||||
}
|
||||
;
|
||||
|
|
@ -4385,7 +4385,7 @@ primary : inline_primary
|
|||
}
|
||||
| primary_value tCOLON2 tCONSTANT
|
||||
{
|
||||
$$ = NEW_COLON2($1, $3, &@$);
|
||||
$$ = NEW_COLON2($1, $3, &@$, &@2, &@3);
|
||||
/*% ripper: const_path_ref!($:1, $:3) %*/
|
||||
}
|
||||
| tCOLON3 tCONSTANT
|
||||
|
|
@ -5815,7 +5815,7 @@ p_const : tCOLON3 cname
|
|||
}
|
||||
| p_const tCOLON2 cname
|
||||
{
|
||||
$$ = NEW_COLON2($1, $3, &@$);
|
||||
$$ = NEW_COLON2($1, $3, &@$, &@2, &@3);
|
||||
/*% ripper: const_path_ref!($:1, $:3) %*/
|
||||
}
|
||||
| tCONSTANT
|
||||
|
|
@ -11553,11 +11553,13 @@ rb_node_until_new(struct parser_params *p, NODE *nd_cond, NODE *nd_body, long nd
|
|||
}
|
||||
|
||||
static rb_node_colon2_t *
|
||||
rb_node_colon2_new(struct parser_params *p, NODE *nd_head, ID nd_mid, const YYLTYPE *loc)
|
||||
rb_node_colon2_new(struct parser_params *p, NODE *nd_head, ID nd_mid, const YYLTYPE *loc, const YYLTYPE *delimiter_loc, const YYLTYPE *name_loc)
|
||||
{
|
||||
rb_node_colon2_t *n = NODE_NEWNODE(NODE_COLON2, rb_node_colon2_t, loc);
|
||||
n->nd_head = nd_head;
|
||||
n->nd_mid = nd_mid;
|
||||
n->delimiter_loc = *delimiter_loc;
|
||||
n->name_loc = *name_loc;
|
||||
|
||||
return n;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -915,6 +915,8 @@ typedef struct RNode_COLON2 {
|
|||
|
||||
struct RNode *nd_head;
|
||||
ID nd_mid;
|
||||
rb_code_location_t delimiter_loc;
|
||||
rb_code_location_t name_loc;
|
||||
} rb_node_colon2_t;
|
||||
|
||||
typedef struct RNode_COLON3 {
|
||||
|
|
|
|||
|
|
@ -1397,6 +1397,15 @@ dummy
|
|||
assert_locations(node.children[-1].locations, [[1, 0, 1, 16], [1, 0, 1, 5], [1, 8, 1, 9], [1, 13, 1, 16]])
|
||||
end
|
||||
|
||||
def test_colon2_locations
|
||||
node = ast_parse("A::B")
|
||||
assert_locations(node.children[-1].locations, [[1, 0, 1, 4], [1, 1, 1, 3], [1, 3, 1, 4]])
|
||||
|
||||
node = ast_parse("A::B::C")
|
||||
assert_locations(node.children[-1].locations, [[1, 0, 1, 7], [1, 4, 1, 6], [1, 6, 1, 7]])
|
||||
assert_locations(node.children[-1].children[0].locations, [[1, 0, 1, 4], [1, 1, 1, 3], [1, 3, 1, 4]])
|
||||
end
|
||||
|
||||
def test_dot2_locations
|
||||
node = ast_parse("1..2")
|
||||
assert_locations(node.children[-1].locations, [[1, 0, 1, 4], [1, 1, 1, 3]])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue