godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GDScript: Fix if after lambda being seen as ternary

Browse Source
This commit is contained in:
George Marques 2022-05-23 21:13:25 -03:00
parent 0a28b4cd94
commit 969f1980d2
No known key found for this signature in database
GPG Key ID: 046BD46A3201E43D
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gdscript_parser.cpp
View File

@ -2103,7 +2103,7 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_precedence(Precedence p_pr
ExpressionNode *previous_operand = (this->*prefix_rule)(nullptr, p_can_assign); ExpressionNode *previous_operand = (this->*prefix_rule)(nullptr, p_can_assign);
while (p_precedence <= get_rule(current.type)->precedence) { while (p_precedence <= get_rule(current.type)->precedence) {
if (previous_operand == nullptr || (p_stop_on_assign && current.type == GDScriptTokenizer::Token::EQUAL)) { if (previous_operand == nullptr || (p_stop_on_assign && current.type == GDScriptTokenizer::Token::EQUAL) || (previous_operand->type == Node::LAMBDA && lambda_ended)) {
return previous_operand; return previous_operand;
} }
// Also switch multiline mode on here for infix operators. // Also switch multiline mode on here for infix operators.

7
modules/gdscript/tests/scripts/parser/features/if_after_lambda.gd Normal file
View File

@ -0,0 +1,7 @@
# https://github.com/godotengine/godot/issues/61231
func test():
var my_lambda = func():
print("hello")
if 0 == 0:
my_lambda.call()

2
modules/gdscript/tests/scripts/parser/features/if_after_lambda.out Normal file
View File

@ -0,0 +1,2 @@
GDTEST_OK
hello