1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/yarp] Mark locations in the tree where newlines can occur

Browse Source 
https://github.com/ruby/yarp/commit/479e835756
This commit is contained in:
Kevin Newton 2023-07-31 10:48:17 -04:00 committed by Takashi Kokubun
parent 86b32dac92
commit 41e8ba01ae
Notes: git 2023-08-17 00:48:15 +00:00 
Merged: https://github.com/ruby/ruby/pull/8226
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
yarp/yarp.c
View File

@ -2202,7 +2202,7 @@ yp_if_node_create(yp_parser_t *parser,
*node = (yp_if_node_t) { *node = (yp_if_node_t) {
{ {
.type = YP_NODE_IF_NODE, .type = YP_NODE_IF_NODE | YP_NODE_FLAG_NEWLINE,
.location = { .location = {
.start = if_keyword->start, .start = if_keyword->start,
.end = end .end = end
@ -2228,7 +2228,7 @@ yp_if_node_modifier_create(yp_parser_t *parser, yp_node_t *statement, const yp_t
*node = (yp_if_node_t) { *node = (yp_if_node_t) {
{ {
.type = YP_NODE_IF_NODE, .type = YP_NODE_IF_NODE | YP_NODE_FLAG_NEWLINE,
.location = { .location = {
.start = statement->location.start, .start = statement->location.start,
.end = predicate->location.end .end = predicate->location.end
@ -2260,7 +2260,7 @@ yp_if_node_ternary_create(yp_parser_t *parser, yp_node_t *predicate, yp_node_t *
*node = (yp_if_node_t) { *node = (yp_if_node_t) {
{ {
.type = YP_NODE_IF_NODE, .type = YP_NODE_IF_NODE | YP_NODE_FLAG_NEWLINE,
.location = { .location = {
.start = predicate->location.start, .start = predicate->location.start,
.end = false_expression->location.end, .end = false_expression->location.end,
@ -3683,6 +3683,9 @@ yp_statements_node_body_append(yp_statements_node_t *node, yp_node_t *statement)
yp_node_list_append(&node->body, statement); yp_node_list_append(&node->body, statement);
node->base.location.end = statement->location.end; node->base.location.end = statement->location.end;
// Every statement gets marked as a place where a newline can occur.
statement->type |= YP_NODE_FLAG_NEWLINE;
} }
// Allocate a new StringConcatNode node. // Allocate a new StringConcatNode node.
@ -3913,7 +3916,7 @@ yp_unless_node_create(yp_parser_t *parser, const yp_token_t *keyword, yp_node_t
*node = (yp_unless_node_t) { *node = (yp_unless_node_t) {
{ {
.type = YP_NODE_UNLESS_NODE, .type = YP_NODE_UNLESS_NODE | YP_NODE_FLAG_NEWLINE,
.location = { .location = {
.start = keyword->start, .start = keyword->start,
.end = end .end = end
@ -3939,7 +3942,7 @@ yp_unless_node_modifier_create(yp_parser_t *parser, yp_node_t *statement, const
*node = (yp_unless_node_t) { *node = (yp_unless_node_t) {
{ {
.type = YP_NODE_UNLESS_NODE, .type = YP_NODE_UNLESS_NODE | YP_NODE_FLAG_NEWLINE,
.location = { .location = {
.start = statement->location.start, .start = statement->location.start,
.end = predicate->location.end .end = predicate->location.end