Skip to content

Commit

Permalink
use YP_LOCATION_*_VALUE macros more consistently
Browse files Browse the repository at this point in the history
  • Loading branch information
@froydnj
froydnj committed Sep 7, 2023
1 parent 59b2d22 commit bcad93e
Showing 1 changed file with 44 additions and 58 deletions.
102 changes: 44 additions & 58 deletions src/yarp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -811,10 +811,7 @@ yp_array_node_create(yp_parser_t *parser, const yp_token_t *opening) {
*node = (yp_array_node_t) {
{
.type = YP_ARRAY_NODE,
.location = {
.start = opening->start,
.end = opening->end
},
.location = YP_LOCATION_TOKEN_VALUE(opening)
},
.opening_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
.closing_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
Expand Down Expand Up @@ -1182,7 +1179,7 @@ yp_block_parameters_node_create(yp_parser_t *parser, yp_parameters_node_t *param
},
.parameters = parameters,
.opening_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(opening),
.closing_loc = { .start = NULL, .end = NULL },
.closing_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
.locals = YP_EMPTY_NODE_LIST
};

Expand Down Expand Up @@ -1443,9 +1440,7 @@ static yp_call_node_t *
yp_call_node_variable_call_create(yp_parser_t *parser, yp_token_t *message) {
yp_call_node_t *node = yp_call_node_create(parser);

node->base.location.start = message->start;
node->base.location.end = message->end;

node->base.location = YP_LOCATION_TOKEN_VALUE(message);
node->message_loc = YP_OPTIONAL_LOCATION_TOKEN_VALUE(message);

yp_string_shared_init(&node->name, message->start, message->end);
Expand Down Expand Up @@ -2532,10 +2527,7 @@ yp_hash_node_create(yp_parser_t *parser, const yp_token_t *opening) {
*node = (yp_hash_node_t) {
{
.type = YP_HASH_NODE,
.location = {
.start = opening->start,
.end = opening->end
},
.location = YP_LOCATION_TOKEN_VALUE(opening)
},
.opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
.closing_loc = YP_LOCATION_NULL_VALUE(parser),
Expand Down Expand Up @@ -3034,10 +3026,7 @@ yp_keyword_hash_node_create(yp_parser_t *parser) {
*node = (yp_keyword_hash_node_t) {
.base = {
.type = YP_KEYWORD_HASH_NODE,
.location = {
.start = NULL,
.end = NULL
},
.location = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE
},
.elements = YP_EMPTY_NODE_LIST
};
Expand Down Expand Up @@ -3489,7 +3478,7 @@ yp_parameters_node_create(yp_parser_t *parser) {
*node = (yp_parameters_node_t) {
{
.type = YP_PARAMETERS_NODE,
.location = { .start = parser->current.start, .end = parser->current.start },
.location = YP_LOCATION_TOKEN_VALUE(&parser->current)
},
.rest = NULL,
.keyword_rest = NULL,
Expand Down Expand Up @@ -3772,7 +3761,7 @@ yp_required_destructured_parameter_node_create(yp_parser_t *parser, const yp_tok
.location = YP_LOCATION_TOKEN_VALUE(opening)
},
.opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
.closing_loc = { .start = NULL, .end = NULL },
.closing_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
.parameters = YP_EMPTY_NODE_LIST
};

Expand Down Expand Up @@ -3837,10 +3826,7 @@ yp_rescue_node_create(yp_parser_t *parser, const yp_token_t *keyword) {
*node = (yp_rescue_node_t) {
{
.type = YP_RESCUE_NODE,
.location = {
.start = keyword->start,
.end = keyword->end
}
.location = YP_LOCATION_TOKEN_VALUE(keyword)
},
.keyword_loc = YP_LOCATION_TOKEN_VALUE(keyword),
.operator_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE,
Expand Down Expand Up @@ -4568,10 +4554,6 @@ yp_yield_node_create(yp_parser_t *parser, const yp_token_t *keyword, const yp_lo


#undef YP_EMPTY_STRING
#undef YP_LOCATION_NULL_VALUE
#undef YP_LOCATION_TOKEN_VALUE
#undef YP_LOCATION_NODE_VALUE
#undef YP_LOCATION_NODE_BASE_VALUE
#undef YP_TOKEN_NOT_PROVIDED_VALUE
#undef YP_ALLOC_NODE

Expand Down Expand Up @@ -8084,7 +8066,7 @@ parse_target(yp_parser_t *parser, yp_node_t *target) {
}

yp_token_t operator = not_provided(parser);
yp_location_t location = { .start = NULL, .end = NULL };
yp_location_t location = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE;

yp_multi_write_node_t *multi_write = yp_multi_write_node_create(parser, &operator, NULL, &location, &location);
yp_multi_write_node_targets_append(multi_write, (yp_node_t *) splat);
Expand Down Expand Up @@ -8230,7 +8212,7 @@ parse_write(yp_parser_t *parser, yp_node_t *target, yp_token_t *operator, yp_nod
splat->expression = parse_write(parser, splat->expression, operator, value);
}

yp_location_t location = { .start = NULL, .end = NULL };
yp_location_t location = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE;
yp_multi_write_node_t *multi_write = yp_multi_write_node_create(parser, operator, value, &location, &location);
yp_multi_write_node_targets_append(multi_write, (yp_node_t *) splat);

Expand Down Expand Up @@ -8365,7 +8347,7 @@ parse_targets(yp_parser_t *parser, yp_node_t *first_target, yp_binding_power_t b
}
}

yp_location_t lparen_loc = { .start = NULL, .end = NULL };
yp_location_t lparen_loc = YP_OPTIONAL_LOCATION_NOT_PROVIDED_VALUE;
yp_multi_write_node_t *result = yp_multi_write_node_create(parser, &operator, NULL, &lparen_loc, &lparen_loc);

if (first_target != NULL) {
Expand Down Expand Up @@ -8413,26 +8395,26 @@ parse_targets(yp_parser_t *parser, yp_node_t *first_target, yp_binding_power_t b
result = (yp_multi_write_node_t *) child_target;
result->base.location.start = lparen.start;
result->base.location.end = rparen.end;
result->lparen_loc = (yp_location_t) { .start = lparen.start, .end = lparen.end };
result->rparen_loc = (yp_location_t) { .start = rparen.start, .end = rparen.end };
result->lparen_loc = YP_LOCATION_TOKEN_VALUE(&lparen);
result->rparen_loc = YP_LOCATION_TOKEN_VALUE(&rparen);
} else {
yp_multi_write_node_t *target;

if (YP_NODE_TYPE_P(child_target, YP_MULTI_WRITE_NODE)) {
target = (yp_multi_write_node_t *) child_target;
target->base.location.start = lparen.start;
target->base.location.end = rparen.end;
target->lparen_loc = (yp_location_t) { .start = lparen.start, .end = lparen.end };
target->rparen_loc = (yp_location_t) { .start = rparen.start, .end = rparen.end };
target->lparen_loc = YP_LOCATION_TOKEN_VALUE(&lparen);
target->rparen_loc = YP_LOCATION_TOKEN_VALUE(&rparen);
} else {
yp_token_t operator = not_provided(parser);

target = yp_multi_write_node_create(
parser,
&operator,
NULL,
&(yp_location_t) { .start = lparen.start, .end = lparen.end },
&(yp_location_t) { .start = rparen.start, .end = rparen.end }
&YP_LOCATION_TOKEN_VALUE(&lparen),
&YP_LOCATION_TOKEN_VALUE(&rparen)
);

yp_multi_write_node_targets_append(target, child_target);
Expand Down Expand Up @@ -9454,10 +9436,10 @@ parse_arguments_list(yp_parser_t *parser, yp_arguments_t *arguments, bool accept

if (accept(parser, YP_TOKEN_PARENTHESIS_LEFT)) {
found |= true;
arguments->opening_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
arguments->opening_loc = YP_LOCATION_TOKEN_VALUE(&parser->previous);

if (accept(parser, YP_TOKEN_PARENTHESIS_RIGHT)) {
arguments->closing_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
arguments->closing_loc = YP_LOCATION_TOKEN_VALUE(&parser->previous);
} else {
arguments->arguments = yp_arguments_node_create(parser);

Expand All @@ -9466,7 +9448,7 @@ parse_arguments_list(yp_parser_t *parser, yp_arguments_t *arguments, bool accept
expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected a ')' to close the argument list.");
yp_accepts_block_stack_pop(parser);

arguments->closing_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
arguments->closing_loc = YP_LOCATION_TOKEN_VALUE(&parser->previous);
}
} else if ((token_begins_expression_p(parser->current.type) || match_any_type_p(parser, 3, YP_TOKEN_USTAR, YP_TOKEN_USTAR_STAR, YP_TOKEN_UAMPERSAND)) && !match_type_p(parser, YP_TOKEN_BRACE_LEFT)) {
found |= true;
Expand Down Expand Up @@ -10244,8 +10226,8 @@ parse_pattern_constant_path(yp_parser_t *parser, yp_node_t *node) {
pattern_node->base.location.end = closing.end;

pattern_node->constant = node;
pattern_node->opening_loc = (yp_location_t) { .start = opening.start, .end = opening.end };
pattern_node->closing_loc = (yp_location_t) { .start = closing.start, .end = closing.end };
pattern_node->opening_loc = YP_LOCATION_TOKEN_VALUE(&opening);
pattern_node->closing_loc = YP_LOCATION_TOKEN_VALUE(&closing);

return (yp_node_t *) pattern_node;
}
Expand All @@ -10260,8 +10242,8 @@ parse_pattern_constant_path(yp_parser_t *parser, yp_node_t *node) {
pattern_node->base.location.end = closing.end;

pattern_node->constant = node;
pattern_node->opening_loc = (yp_location_t) { .start = opening.start, .end = opening.end };
pattern_node->closing_loc = (yp_location_t) { .start = closing.start, .end = closing.end };
pattern_node->opening_loc = YP_LOCATION_TOKEN_VALUE(&opening);
pattern_node->closing_loc = YP_LOCATION_TOKEN_VALUE(&closing);

return (yp_node_t *) pattern_node;
}
Expand All @@ -10276,8 +10258,8 @@ parse_pattern_constant_path(yp_parser_t *parser, yp_node_t *node) {
pattern_node->base.location.end = closing.end;

pattern_node->constant = node;
pattern_node->opening_loc = (yp_location_t) { .start = opening.start, .end = opening.end };
pattern_node->closing_loc = (yp_location_t) { .start = closing.start, .end = closing.end };
pattern_node->opening_loc = YP_LOCATION_TOKEN_VALUE(&opening);
pattern_node->closing_loc = YP_LOCATION_TOKEN_VALUE(&closing);

return (yp_node_t *) pattern_node;
}
Expand Down Expand Up @@ -10433,8 +10415,8 @@ parse_pattern_primitive(yp_parser_t *parser, const char *message) {
pattern_node->base.location.start = opening.start;
pattern_node->base.location.end = closing.end;

pattern_node->opening_loc = (yp_location_t) { .start = opening.start, .end = opening.end };
pattern_node->closing_loc = (yp_location_t) { .start = closing.start, .end = closing.end };
pattern_node->opening_loc = YP_LOCATION_TOKEN_VALUE(&opening);
pattern_node->closing_loc = YP_LOCATION_TOKEN_VALUE(&closing);

return (yp_node_t *) pattern_node;
}
Expand All @@ -10447,8 +10429,8 @@ parse_pattern_primitive(yp_parser_t *parser, const char *message) {
pattern_node->base.location.start = opening.start;
pattern_node->base.location.end = closing.end;

pattern_node->opening_loc = (yp_location_t) { .start = opening.start, .end = opening.end };
pattern_node->closing_loc = (yp_location_t) { .start = closing.start, .end = closing.end };
pattern_node->opening_loc = YP_LOCATION_TOKEN_VALUE(&opening);
pattern_node->closing_loc = YP_LOCATION_TOKEN_VALUE(&closing);

return (yp_node_t *) pattern_node;
}
Expand Down Expand Up @@ -10510,8 +10492,8 @@ parse_pattern_primitive(yp_parser_t *parser, const char *message) {
node->base.location.start = opening.start;
node->base.location.end = closing.end;

node->opening_loc = (yp_location_t) { .start = opening.start, .end = opening.end };
node->closing_loc = (yp_location_t) { .start = closing.start, .end = closing.end };
node->opening_loc = YP_LOCATION_TOKEN_VALUE(&opening);
node->closing_loc = YP_LOCATION_TOKEN_VALUE(&closing);
}

parser->pattern_matching_newlines = previous_pattern_matching_newlines;
Expand Down Expand Up @@ -10953,8 +10935,8 @@ parse_expression_prefix(yp_parser_t *parser, yp_binding_power_t binding_power) {
yp_multi_write_node_t *multi_statement = (yp_multi_write_node_t *) statement;

if (multi_statement->value == NULL) {
yp_location_t lparen_loc = { .start = opening.start, .end = opening.end };
yp_location_t rparen_loc = { .start = parser->previous.start, .end = parser->previous.end };
yp_location_t lparen_loc = YP_LOCATION_TOKEN_VALUE(&opening);
yp_location_t rparen_loc = YP_LOCATION_TOKEN_VALUE(&parser->previous);
yp_multi_write_node_t *multi_write;

if (multi_statement->lparen_loc.start == NULL) {
Expand Down Expand Up @@ -11934,7 +11916,7 @@ parse_expression_prefix(yp_parser_t *parser, yp_binding_power_t binding_power) {
&lparen,
expression,
&rparen,
&(yp_location_t) { .start = keyword.start, .end = keyword.end }
&YP_LOCATION_TOKEN_VALUE(&keyword)
);
}
case YP_TOKEN_KEYWORD_END_UPCASE: {
Expand Down Expand Up @@ -12020,18 +12002,18 @@ parse_expression_prefix(yp_parser_t *parser, yp_binding_power_t binding_power) {
accept(parser, YP_TOKEN_NEWLINE);

if (accept(parser, YP_TOKEN_PARENTHESIS_LEFT)) {
arguments.opening_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
arguments.opening_loc = YP_LOCATION_TOKEN_VALUE(&parser->previous);

if (accept(parser, YP_TOKEN_PARENTHESIS_RIGHT)) {
arguments.closing_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
arguments.closing_loc = YP_LOCATION_TOKEN_VALUE(&parser->previous);
} else {
receiver = parse_expression(parser, YP_BINDING_POWER_COMPOSITION, "Expected expression after `not`.");
yp_flip_flop(receiver);

if (!parser->recovering) {
accept(parser, YP_TOKEN_NEWLINE);
expect(parser, YP_TOKEN_PARENTHESIS_RIGHT, "Expected ')' after 'not' expression.");
arguments.closing_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
arguments.closing_loc = YP_LOCATION_TOKEN_VALUE(&parser->previous);
}
}
} else {
Expand Down Expand Up @@ -13570,7 +13552,7 @@ parse_expression_infix(yp_parser_t *parser, yp_node_t *node, yp_binding_power_t
parser_lex(parser);

yp_arguments_t arguments = YP_EMPTY_ARGUMENTS;
arguments.opening_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
arguments.opening_loc = YP_LOCATION_TOKEN_VALUE(&parser->previous);

if (!accept(parser, YP_TOKEN_BRACKET_RIGHT)) {
yp_accepts_block_stack_push(parser, true);
Expand All @@ -13582,7 +13564,7 @@ parse_expression_infix(yp_parser_t *parser, yp_node_t *node, yp_binding_power_t
expect(parser, YP_TOKEN_BRACKET_RIGHT, "Expected ']' to close the bracket expression.");
}

arguments.closing_loc = ((yp_location_t) { .start = parser->previous.start, .end = parser->previous.end });
arguments.closing_loc = YP_LOCATION_TOKEN_VALUE(&parser->previous);

// If we have a comma after the closing bracket then this is a multiple
// assignment and we should parse the targets.
Expand Down Expand Up @@ -13933,6 +13915,10 @@ yp_parse_serialize(const uint8_t *source, size_t size, yp_buffer_t *buffer, cons
yp_parser_free(&parser);
}

#undef YP_LOCATION_NULL_VALUE
#undef YP_LOCATION_TOKEN_VALUE
#undef YP_LOCATION_NODE_VALUE
#undef YP_LOCATION_NODE_BASE_VALUE
#undef YP_CASE_KEYWORD
#undef YP_CASE_OPERATOR
#undef YP_CASE_WRITABLE

0 comments on commit bcad93e

Please sign in to comment.