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

[ruby/prism] Fix assertion failure for fwd params after rest

Browse Source 
https://github.com/ruby/prism/commit/f86bff6dd7
This commit is contained in:
Haldun Bayhantopcu 2023-09-27 21:31:49 +02:00 committed by git
parent bf335bcb11
commit 0084bac47a
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
prism/diagnostic.c
View File

@ -202,6 +202,7 @@ static const char* const diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
[PM_ERR_PARAMETER_ORDER] = "Unexpected parameter order", [PM_ERR_PARAMETER_ORDER] = "Unexpected parameter order",
[PM_ERR_PARAMETER_SPLAT_MULTI] = "Unexpected multiple `*` splat parameters", [PM_ERR_PARAMETER_SPLAT_MULTI] = "Unexpected multiple `*` splat parameters",
[PM_ERR_PARAMETER_STAR] = "Unexpected parameter `*`", [PM_ERR_PARAMETER_STAR] = "Unexpected parameter `*`",
[PM_ERR_PARAMETER_UNEXPECTED_FWD] = "Unexpected `...` in parameters",
[PM_ERR_PARAMETER_WILD_LOOSE_COMMA] = "Unexpected `,` in parameters", [PM_ERR_PARAMETER_WILD_LOOSE_COMMA] = "Unexpected `,` in parameters",
[PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET] = "Expected a pattern expression after the `[` operator", [PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET] = "Expected a pattern expression after the `[` operator",
[PM_ERR_PATTERN_EXPRESSION_AFTER_COMMA] = "Expected a pattern expression after `,`", [PM_ERR_PATTERN_EXPRESSION_AFTER_COMMA] = "Expected a pattern expression after `,`",

1
prism/diagnostic.h
View File

@ -168,6 +168,7 @@ typedef enum {
PM_ERR_PARAMETER_ORDER, PM_ERR_PARAMETER_ORDER,
PM_ERR_PARAMETER_SPLAT_MULTI, PM_ERR_PARAMETER_SPLAT_MULTI,
PM_ERR_PARAMETER_STAR, PM_ERR_PARAMETER_STAR,
PM_ERR_PARAMETER_UNEXPECTED_FWD,
PM_ERR_PARAMETER_WILD_LOOSE_COMMA, PM_ERR_PARAMETER_WILD_LOOSE_COMMA,
PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET, PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET,
PM_ERR_PATTERN_EXPRESSION_AFTER_HROCKET, PM_ERR_PATTERN_EXPRESSION_AFTER_HROCKET,

8
prism/prism.c
View File

@ -9292,6 +9292,14 @@ parse_parameters(
pm_parser_local_add_token(parser, &parser->previous); pm_parser_local_add_token(parser, &parser->previous);
pm_forwarding_parameter_node_t *param = pm_forwarding_parameter_node_create(parser, &parser->previous); pm_forwarding_parameter_node_t *param = pm_forwarding_parameter_node_create(parser, &parser->previous);
if (params->keyword_rest != NULL) {
// If we already have a keyword rest parameter, then we replace it with the
// forwarding parameter and move the keyword rest parameter to the posts list.
pm_node_t *keyword_rest = params->keyword_rest;
pm_parameters_node_posts_append(params, keyword_rest);
pm_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, PM_ERR_PARAMETER_UNEXPECTED_FWD);
params->keyword_rest = NULL;
}
pm_parameters_node_keyword_rest_set(params, (pm_node_t *)param); pm_parameters_node_keyword_rest_set(params, (pm_node_t *)param);
} else { } else {
update_parameter_state(parser, &parser->current, &order); update_parameter_state(parser, &parser->current, &order);

7
test/prism/errors_test.rb
View File

@ -1348,6 +1348,13 @@ module Prism
] ]
end end
def test_forwarding_arg_after_keyword_rest
source = "def f(**,...);end"
assert_errors expression(source), source, [
["Unexpected `...` in parameters", 9..12],
]
end
private private
def assert_errors(expected, source, errors, compare_ripper: RUBY_ENGINE == "ruby") def assert_errors(expected, source, errors, compare_ripper: RUBY_ENGINE == "ruby")