godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-20 14:45:44 +00:00
Code Releases Wiki Activity

Improve error messages for lambda functions without a body

Browse Source
This commit is contained in:
Aaron Franke
2025-08-12 19:32:13 -07:00
parent 0c51ede243
commit b73597292b
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/gdscript/gdscript_analyzer.cpp
View File

@@ -1987,16 +1987,18 @@ void GDScriptAnalyzer::resolve_function_body(GDScriptParser::FunctionNode *p_fun
} }
p_function->resolved_body = true; p_function->resolved_body = true;
if (p_function->is_abstract) { if (p_function->body->statements.is_empty()) {
// Abstract functions don't have a body. // Non-abstract functions must have a body.
if (!p_function->body->statements.is_empty()) { if (p_function->source_lambda != nullptr) {
push_error(R"(Abstract function cannot have a body.)", p_function->body); push_error(R"(A lambda function must have a ":" followed by a body.)", p_function);
} else if (!p_function->is_abstract) {
push_error(R"(A function must either have a ":" followed by a body, or be marked as "@abstract".)", p_function);
} }
return; return;
} else { } else {
// Non-abstract functions must have a body. // Abstract functions must not have a body.
if (p_function->body->statements.is_empty()) { if (p_function->is_abstract) {
push_error(R"(A function must either have a ":" followed by a body, or be marked as "@abstract".)", p_function); push_error(R"(An abstract function cannot have a body.)", p_function->body);
return; return;
} }
} }

3
modules/gdscript/tests/scripts/analyzer/errors/abstract_methods.gd
View File

@@ -37,5 +37,8 @@ class Test4 extends AbstractClass:
@abstract @abstract class DuplicateAbstract: @abstract @abstract class DuplicateAbstract:
pass pass
func holding_some_invalid_lambda(invalid_default_arg = func():):
var some_invalid_lambda = (func():)
func test(): func test():
pass pass

4
modules/gdscript/tests/scripts/analyzer/errors/abstract_methods.out
View File

@@ -2,10 +2,12 @@ GDTEST_ANALYZER_ERROR
>> ERROR at line 37: "@abstract" annotation can only be used once per class. >> ERROR at line 37: "@abstract" annotation can only be used once per class.
>> ERROR at line 28: "@abstract" annotation can only be used once per function. >> ERROR at line 28: "@abstract" annotation can only be used once per function.
>> ERROR at line 35: "@abstract" annotation cannot be applied to static functions. >> ERROR at line 35: "@abstract" annotation cannot be applied to static functions.
>> ERROR at line 40: A lambda function must have a ":" followed by a body.
>> ERROR at line 41: A lambda function must have a ":" followed by a body.
>> ERROR at line 11: Class "Test1" is not abstract but contains abstract methods. Mark the class as "@abstract" or remove "@abstract" from all methods in this class. >> ERROR at line 11: Class "Test1" is not abstract but contains abstract methods. Mark the class as "@abstract" or remove "@abstract" from all methods in this class.
>> ERROR at line 14: Class "Test2" must implement "AbstractClass.some_func()" and other inherited abstract methods or be marked as "@abstract". >> ERROR at line 14: Class "Test2" must implement "AbstractClass.some_func()" and other inherited abstract methods or be marked as "@abstract".
>> ERROR at line 17: Class "Test3" must implement "AbstractClassAgain.some_func()" and other inherited abstract methods or be marked as "@abstract". >> ERROR at line 17: Class "Test3" must implement "AbstractClassAgain.some_func()" and other inherited abstract methods or be marked as "@abstract".
>> ERROR at line 22: Cannot call the parent class' abstract function "some_func()" because it hasn't been defined. >> ERROR at line 22: Cannot call the parent class' abstract function "some_func()" because it hasn't been defined.
>> ERROR at line 25: Cannot call the parent class' abstract function "some_func()" because it hasn't been defined. >> ERROR at line 25: Cannot call the parent class' abstract function "some_func()" because it hasn't been defined.
>> ERROR at line 32: Abstract function cannot have a body. >> ERROR at line 32: An abstract function cannot have a body.
>> ERROR at line 35: A function must either have a ":" followed by a body, or be marked as "@abstract". >> ERROR at line 35: A function must either have a ":" followed by a body, or be marked as "@abstract".