godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Merge pull request #52906 from vnen/gdscript-show-error-on-yield

Browse Source
This commit is contained in:
Rémi Verschelde
2021-09-21 20:36:39 +02:00
committed by GitHub
parent b3b4860d2e 262d6c6bef
commit 679f70c1e1
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gdscript/gdscript_parser.cpp
View File

@@ -2822,6 +2822,11 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_lambda(ExpressionNode *p_p
return lambda; return lambda;
} }
GDScriptParser::ExpressionNode *GDScriptParser::parse_yield(ExpressionNode *p_previous_operand, bool p_can_assign) {
push_error(R"("yield" was removed in Godot 4.0. Use "await" instead.)");
return nullptr;
}
GDScriptParser::ExpressionNode *GDScriptParser::parse_invalid_token(ExpressionNode *p_previous_operand, bool p_can_assign) { GDScriptParser::ExpressionNode *GDScriptParser::parse_invalid_token(ExpressionNode *p_previous_operand, bool p_can_assign) {
// Just for better error messages. // Just for better error messages.
GDScriptTokenizer::Token::Type invalid = previous.type; GDScriptTokenizer::Token::Type invalid = previous.type;
@@ -3178,7 +3183,7 @@ GDScriptParser::ParseRule *GDScriptParser::get_rule(GDScriptTokenizer::Token::Ty
{ nullptr, nullptr, PREC_NONE }, // TRAIT, { nullptr, nullptr, PREC_NONE }, // TRAIT,
{ nullptr, nullptr, PREC_NONE }, // VAR, { nullptr, nullptr, PREC_NONE }, // VAR,
{ nullptr, nullptr, PREC_NONE }, // VOID, { nullptr, nullptr, PREC_NONE }, // VOID,
{ nullptr, nullptr, PREC_NONE }, // YIELD, { &GDScriptParser::parse_yield, nullptr, PREC_NONE }, // YIELD,
// Punctuation // Punctuation
{ &GDScriptParser::parse_array, &GDScriptParser::parse_subscript, PREC_SUBSCRIPT }, // BRACKET_OPEN, { &GDScriptParser::parse_array, &GDScriptParser::parse_subscript, PREC_SUBSCRIPT }, // BRACKET_OPEN,
{ nullptr, nullptr, PREC_NONE }, // BRACKET_CLOSE, { nullptr, nullptr, PREC_NONE }, // BRACKET_CLOSE,

1
modules/gdscript/gdscript_parser.h
View File

@@ -1388,6 +1388,7 @@ private:
ExpressionNode *parse_attribute(ExpressionNode *p_previous_operand, bool p_can_assign); ExpressionNode *parse_attribute(ExpressionNode *p_previous_operand, bool p_can_assign);
ExpressionNode *parse_subscript(ExpressionNode *p_previous_operand, bool p_can_assign); ExpressionNode *parse_subscript(ExpressionNode *p_previous_operand, bool p_can_assign);
ExpressionNode *parse_lambda(ExpressionNode *p_previous_operand, bool p_can_assign); ExpressionNode *parse_lambda(ExpressionNode *p_previous_operand, bool p_can_assign);
ExpressionNode *parse_yield(ExpressionNode *p_previous_operand, bool p_can_assign);
ExpressionNode *parse_invalid_token(ExpressionNode *p_previous_operand, bool p_can_assign); ExpressionNode *parse_invalid_token(ExpressionNode *p_previous_operand, bool p_can_assign);
TypeNode *parse_type(bool p_allow_void = false); TypeNode *parse_type(bool p_allow_void = false);
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED

6
modules/gdscript/tests/scripts/parser/errors/yield_instead_of_await.gd Normal file
View File

@@ -0,0 +1,6 @@
#GDTEST_PARSER_ERROR
signal event
func test():
yield("event")

2
modules/gdscript/tests/scripts/parser/errors/yield_instead_of_await.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
"yield" was removed in Godot 4.0. Use "await" instead.