godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #70656 from vonagam/fix-void-returns

Browse Source 
GDScript: Disallow return with value in void functions
This commit is contained in:
Rémi Verschelde
2023-01-03 12:20:33 +01:00
parent 6d7f6c1eb9 9507f65e25
commit e4c1103af4
7 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gdscript/gdscript_analyzer.cpp
View File

@@ -2047,6 +2047,9 @@ void GDScriptAnalyzer::resolve_return(GDScriptParser::ReturnNode *p_return) {
update_array_literal_element_type(expected_type, static_cast<GDScriptParser::ArrayNode *>(p_return->return_value)); update_array_literal_element_type(expected_type, static_cast<GDScriptParser::ArrayNode *>(p_return->return_value));
} }
} }
if (has_expected_type && expected_type.is_hard_type() && expected_type.kind == GDScriptParser::DataType::BUILTIN && expected_type.builtin_type == Variant::NIL) {
push_error("A void function cannot return a value.", p_return);
}
result = p_return->return_value->get_datatype(); result = p_return->return_value->get_datatype();
} else { } else {
// Return type is null by default. // Return type is null by default.

2
modules/gdscript/tests/scripts/analyzer/errors/return_null_in_void_func.gd Normal file
View File

@@ -0,0 +1,2 @@
func test() -> void:
return null

2
modules/gdscript/tests/scripts/analyzer/errors/return_null_in_void_func.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
A void function cannot return a value.

4
modules/gdscript/tests/scripts/analyzer/errors/return_variant_in_void_func.gd Normal file
View File

@@ -0,0 +1,4 @@
func test() -> void:
var a
a = 1
return a

2
modules/gdscript/tests/scripts/analyzer/errors/return_variant_in_void_func.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
A void function cannot return a value.

5
modules/gdscript/tests/scripts/analyzer/features/return_variant_typed.gd Normal file
View File

@@ -0,0 +1,5 @@
func variant() -> Variant:
return 'variant'
func test():
print(variant())

2
modules/gdscript/tests/scripts/analyzer/features/return_variant_typed.out Normal file
View File

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