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

[ruby/prism] Do not put empty statements in while because of -n

Browse Source 
Fixes [Bug #21085]

https://github.com/ruby/prism/commit/ebb9c36a10
This commit is contained in:
Kevin Newton 2025-01-22 13:59:35 -05:00 committed by git
parent 495b1cad04
commit 241ada7b1c
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
prism/prism.c
View File

@ -22186,6 +22186,10 @@ parse_expression(pm_parser_t *parser, pm_binding_power_t binding_power, bool acc
static pm_statements_node_t * static pm_statements_node_t *
wrap_statements(pm_parser_t *parser, pm_statements_node_t *statements) { wrap_statements(pm_parser_t *parser, pm_statements_node_t *statements) {
if (PM_PARSER_COMMAND_LINE_OPTION_P(parser)) { if (PM_PARSER_COMMAND_LINE_OPTION_P(parser)) {
if (statements == NULL) {
statements = pm_statements_node_create(parser);
}
pm_arguments_node_t *arguments = pm_arguments_node_create(parser); pm_arguments_node_t *arguments = pm_arguments_node_create(parser);
pm_arguments_node_arguments_append( pm_arguments_node_arguments_append(
arguments, arguments,
@ -22201,6 +22205,10 @@ wrap_statements(pm_parser_t *parser, pm_statements_node_t *statements) {
if (PM_PARSER_COMMAND_LINE_OPTION_N(parser)) { if (PM_PARSER_COMMAND_LINE_OPTION_N(parser)) {
if (PM_PARSER_COMMAND_LINE_OPTION_A(parser)) { if (PM_PARSER_COMMAND_LINE_OPTION_A(parser)) {
if (statements == NULL) {
statements = pm_statements_node_create(parser);
}
pm_arguments_node_t *arguments = pm_arguments_node_create(parser); pm_arguments_node_t *arguments = pm_arguments_node_create(parser);
pm_arguments_node_arguments_append( pm_arguments_node_arguments_append(
arguments, arguments,
@ -22269,9 +22277,7 @@ parse_program(pm_parser_t *parser) {
parser_lex(parser); parser_lex(parser);
pm_statements_node_t *statements = parse_statements(parser, PM_CONTEXT_MAIN, 0); pm_statements_node_t *statements = parse_statements(parser, PM_CONTEXT_MAIN, 0);
if (statements == NULL) { if (statements != NULL && !parser->parsing_eval) {
statements = pm_statements_node_create(parser);
} else if (!parser->parsing_eval) {
// If we have statements, then the top-level statement should be // If we have statements, then the top-level statement should be
// explicitly checked as well. We have to do this here because // explicitly checked as well. We have to do this here because
// everywhere else we check all but the last statement. // everywhere else we check all but the last statement.
@ -22283,13 +22289,6 @@ parse_program(pm_parser_t *parser) {
pm_locals_order(parser, &parser->current_scope->locals, &locals, true); pm_locals_order(parser, &parser->current_scope->locals, &locals, true);
pm_parser_scope_pop(parser); pm_parser_scope_pop(parser);
// If this is an empty file, then we're still going to parse all of the
// statements in order to gather up all of the comments and such. Here we'll
// correct the location information.
if (pm_statements_node_body_length(statements) == 0) {
pm_statements_node_location_set(statements, parser->start, parser->start);
}
// At the top level, see if we need to wrap the statements in a program // At the top level, see if we need to wrap the statements in a program
// node with a while loop based on the options. // node with a while loop based on the options.
if (parser->command_line & (PM_OPTIONS_COMMAND_LINE_P | PM_OPTIONS_COMMAND_LINE_N)) { if (parser->command_line & (PM_OPTIONS_COMMAND_LINE_P | PM_OPTIONS_COMMAND_LINE_N)) {
@ -22299,6 +22298,14 @@ parse_program(pm_parser_t *parser) {
pm_node_list_free(&current_block_exits); pm_node_list_free(&current_block_exits);
} }
// If this is an empty file, then we're still going to parse all of the
// statements in order to gather up all of the comments and such. Here we'll
// correct the location information.
if (statements == NULL) {
statements = pm_statements_node_create(parser);
pm_statements_node_location_set(statements, parser->start, parser->start);
}
return (pm_node_t *) pm_program_node_create(parser, &locals, statements); return (pm_node_t *) pm_program_node_create(parser, &locals, statements);
} }