mirrors/ruby
0
0 Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-10-28 16:36:20 +08:00
Code Activity

[ruby/prism] Pop block stack before finishing command call arguments within parenthesized call

Browse Source 
https://github.com/ruby/prism/commit/26cfb915e8
This commit is contained in:
Kevin Newton authored and git committed 2026-06-23 20:33:39 +00:00
1 parent daffaaee73
commit 11d005d6ba
2 files changed
+39 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

prism/prism.c
+18 -3
View File
@@ -19055,8 +19055,11 @@ parse_parentheses(pm_parser_t *parser, pm_binding_power_t binding_power, uint8_t
lex_state_set(parser, PM_LEX_STATE_ENDARG);
}
parser_lex(parser);
/* Pop before consuming the closing `)` so the following token (e.g. a
* `do`) is lexed in the enclosing context rather than as a block
* belonging to the parenthesized expression. */
pm_accepts_block_stack_pop(parser);
parser_lex(parser);
pop_block_exits(parser, previous_block_exits);
if (PM_NODE_TYPE_P(statement, PM_MULTI_TARGET_NODE) || PM_NODE_TYPE_P(statement, PM_SPLAT_NODE)) {
@@ -19327,6 +19330,13 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, u
accept1(parser, PM_TOKEN_NEWLINE);
/* Pop before consuming the closing `]` so the following token (e.g.
* a `do`) is lexed in the enclosing context rather than as a block
* belonging to the array's interior. Otherwise a `do` block would
* wrongly bind to a command with an array argument, as in
* `foo(m [] do end)`. */
pm_accepts_block_stack_pop(parser);
if (!accept1(parser, PM_TOKEN_BRACKET_RIGHT)) {
PM_PARSER_ERR_TOKEN_FORMAT(parser, &parser->current, PM_ERR_ARRAY_TERM, pm_token_str(parser->current.type));
parser->previous.start = parser->previous.end;
@@ -19334,7 +19344,6 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, u
}
pm_array_node_close_set(parser, array, &parser->previous);
pm_accepts_block_stack_pop(parser);
return UP(array);
}
@@ -20653,6 +20662,11 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, u
}
parser_warn_indentation_mismatch(parser, opening_newline_index, &operator, false, false);
/* Pop before consuming the closing `}` so the following token
* (e.g. a `do`) is lexed in the enclosing context rather than
* as a block belonging to the lambda's interior. */
pm_accepts_block_stack_pop(parser);
expect1_opening(parser, PM_TOKEN_BRACE_RIGHT, PM_ERR_LAMBDA_TERM_BRACE, &opening);
} else {
expect1(parser, PM_TOKEN_KEYWORD_DO, PM_ERR_LAMBDA_OPEN);
@@ -20669,6 +20683,8 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, u
parser_warn_indentation_mismatch(parser, opening_newline_index, &operator, false, false);
}
/* As with the brace case above, pop before consuming `end`. */
pm_accepts_block_stack_pop(parser);
expect1_opening(parser, PM_TOKEN_KEYWORD_END, PM_ERR_LAMBDA_TERM_END, &operator);
}
@@ -20677,7 +20693,6 @@ parse_expression_prefix(pm_parser_t *parser, pm_binding_power_t binding_power, u
pm_node_t *parameters = parse_blocklike_parameters(parser, UP(block_parameters), &operator, &parser->previous);
pm_parser_scope_pop(parser);
pm_accepts_block_stack_pop(parser);
return UP(pm_lambda_node_create(parser, &locals, &operator, &opening, &parser->previous, parameters, body));
}
test/prism/errors/do_block_in_command_args.txt
+21
View File
@@ -0,0 +1,21 @@
foo(m [] do end)
^~ unexpected 'do'; expected a `)` to close the arguments
^~ unexpected 'do', expecting end-of-input
^~ unexpected 'do', ignoring it
^~~ unexpected 'end', ignoring it
^ unexpected ')', ignoring it
foo(m -> {} do end)
^~ unexpected 'do'; expected a `)` to close the arguments
^~ unexpected 'do', expecting end-of-input
^~ unexpected 'do', ignoring it
^~~ unexpected 'end', ignoring it
^ unexpected ')', ignoring it
foo(m (1) do end)
^~ unexpected 'do'; expected a `)` to close the arguments
^~ unexpected 'do', expecting end-of-input
^~ unexpected 'do', ignoring it
^~~ unexpected 'end', ignoring it
^ unexpected ')', ignoring it