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

Merge pull request #61345 from vnen/gdscript-lambda-issues 

GDScript: A few fixes for lambda issues
This commit is contained in:
Rémi Verschelde 2022-05-24 08:14:48 +02:00 committed by GitHub
parent 3555b970bf 1b76a9d705
commit db5a86339b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/gdscript/gdscript_parser.cpp
View File

@ -1624,6 +1624,10 @@ GDScriptParser::Node *GDScriptParser::parse_statement() {
case Node::AWAIT:
// Fine.
break;
case Node::LAMBDA:
// Standalone lambdas can't be used, so make this an error.
push_error("Standalone lambdas cannot be accessed. Consider assigning it to a variable.", expression);
break;
default:
push_warning(expression, GDScriptWarning::STANDALONE_EXPRESSION);
}
@ -2099,7 +2103,7 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_precedence(Precedence p_pr
ExpressionNode *previous_operand = (this->*prefix_rule)(nullptr, p_can_assign);
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;
}
// Also switch multiline mode on here for infix operators.
@ -2922,6 +2926,9 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_lambda(ExpressionNode *p_p
current_function = function;
SuiteNode *body = alloc_node<SuiteNode>();
body->parent_function = current_function;
body->parent_block = current_suite;
SuiteNode *previous_suite = current_suite;
current_suite = body;

3
modules/gdscript/tests/scripts/parser/errors/lambda_standalone.gd Normal file
View File

@ -0,0 +1,3 @@
func test():
func standalone():
print("can't be accessed")

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

@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
Standalone lambdas cannot be accessed. Consider assigning it to a variable.

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

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

@ -0,0 +1,7 @@
# https://github.com/godotengine/godot/issues/56751
func test():
var x = "local"
var lambda = func(param = x):
print(param)
lambda.call()

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

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