diff options
| -rw-r--r-- | test/yarp/errors_test.rb | 4 | ||||
| -rw-r--r-- | yarp/yarp.c | 22 |
2 files changed, 11 insertions, 15 deletions
diff --git a/test/yarp/errors_test.rb b/test/yarp/errors_test.rb index feecad7c3f..66a9bcd829 100644 --- a/test/yarp/errors_test.rb +++ b/test/yarp/errors_test.rb @@ -283,7 +283,8 @@ module YARP def test_def_with_expression_receiver_and_no_identifier assert_errors expression("def (a); end"), "def (a); end", [ - ["Expected a `.` or `::` after the receiver in a method definition", 7..7] + ["Expected a `.` or `::` after the receiver in a method definition", 7..7], + ["Expected a method name", 7..7] ] end @@ -291,6 +292,7 @@ module YARP assert_errors expression("def (\na\nb\n).c; end"), "def (\na\nb\n).c; end", [ ["Expected a matching `)`", 7..7], ["Expected a `.` or `::` after the receiver in a method definition", 7..7], + ["Expected a method name", 7..7], ["Cannot parse the expression", 10..10], ["Cannot parse the expression", 11..11] ] diff --git a/yarp/yarp.c b/yarp/yarp.c index 924abfa834..bbf3f8cc66 100644 --- a/yarp/yarp.c +++ b/yarp/yarp.c @@ -9774,7 +9774,6 @@ parse_conditional(yp_parser_t *parser, yp_context_t context) { case YP_TOKEN_KEYWORD_TRUE: case YP_TOKEN_KEYWORD_UNDEF: case YP_TOKEN_KEYWORD_UNLESS: case YP_TOKEN_KEYWORD_UNTIL: \ case YP_TOKEN_KEYWORD_WHEN: case YP_TOKEN_KEYWORD_WHILE: case YP_TOKEN_KEYWORD_YIELD - // This macro allows you to define a case statement for all of the operators. // It's meant to be used in a switch statement. #define YP_CASE_OPERATOR YP_TOKEN_AMPERSAND: case YP_TOKEN_BACKTICK: case YP_TOKEN_BANG_EQUAL: \ @@ -10132,7 +10131,7 @@ parse_method_definition_name(yp_parser_t *parser) { parser_lex(parser); return parser->previous; default: - return not_provided(parser); + return (yp_token_t) { .type = YP_TOKEN_MISSING, .start = parser->current.start, .end = parser->current.end }; } } @@ -12032,7 +12031,7 @@ parse_expression_prefix(yp_parser_t *parser, yp_binding_power_t binding_power) { yp_node_t *receiver = NULL; yp_token_t operator = not_provided(parser); - yp_token_t name = not_provided(parser); + yp_token_t name = (yp_token_t) { .type = YP_TOKEN_MISSING, .start = def_keyword.end, .end = def_keyword.end }; context_push(parser, YP_CONTEXT_DEF_PARAMS); parser_lex(parser); @@ -12056,10 +12055,6 @@ parse_expression_prefix(yp_parser_t *parser, yp_binding_power_t binding_power) { operator = parser->previous; name = parse_method_definition_name(parser); - - if (name.type == YP_TOKEN_MISSING) { - yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, YP_ERR_DEF_NAME_AFTER_RECEIVER); - } } else { yp_parser_scope_push(parser, true); name = parser->previous; @@ -12126,9 +12121,6 @@ parse_expression_prefix(yp_parser_t *parser, yp_binding_power_t binding_power) { } name = parse_method_definition_name(parser); - if (name.type == YP_TOKEN_MISSING) { - yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, YP_ERR_DEF_NAME_AFTER_RECEIVER); - } } else { name = identifier; } @@ -12155,13 +12147,15 @@ parse_expression_prefix(yp_parser_t *parser, yp_binding_power_t binding_power) { default: yp_parser_scope_push(parser, true); name = parse_method_definition_name(parser); - - if (name.type == YP_TOKEN_MISSING) { - yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, YP_ERR_DEF_NAME); - } break; } + // If, after all that, we were unable to find a method name, add an + // error to the error list. + if (name.type == YP_TOKEN_MISSING) { + yp_diagnostic_list_append(&parser->error_list, parser->previous.start, parser->previous.end, YP_ERR_DEF_NAME); + } + yp_token_t lparen; yp_token_t rparen; yp_parameters_node_t *params; |