Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

GDScript: Removed spurious UNASSIGNED_VARIABLE warning for locals 

Variable->assignment needs to be incremented when assigned a value.
Also fixed and improved unit test 'variable_declaration.gd'.
Fixes #52551
4.0
ZuBsPaCe 2021-09-10 22:08:02 +07:00
parent 68563b5760
commit 1d1aa7a02f
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gdscript/gdscript_parser.cpp
Unescape Escape View File

@ -2369,8 +2369,12 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_assignment(ExpressionNode
} }
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (has_operator && source_variable != nullptr && source_variable->assignments == 0) { if (source_variable != nullptr) {
push_warning(assignment, GDScriptWarning::UNASSIGNED_VARIABLE_OP_ASSIGN, source_variable->identifier->name); if (has_operator && source_variable->assignments == 0) {
push_warning(assignment, GDScriptWarning::UNASSIGNED_VARIABLE_OP_ASSIGN, source_variable->identifier->name);
}
source_variable->assignments += 1;
} }
#endif #endif

21
modules/gdscript/tests/scripts/parser/features/variable_declaration.gd
Unescape Escape View File

@ -1,12 +1,19 @@
var a # No init. var m1 # No init.
var b = 42 # Init. var m2 = 22 # Init.
var m3: String # No init, typed.
var m4: String = "44" # Init, typed.
func test(): func test():
var c # No init, local. var loc5 # No init, local.
var d = 23 # Init, local. var loc6 = 66 # Init, local.
var loc7: String # No init, typed.
var loc8: String = "88" # Init, typed.
a = 1 m1 = 11
c = 2 m3 = "33"
prints(a, b, c, d) loc5 = 55
loc7 = "77"
prints(m1, m2, m3, m4, loc5, loc6, loc7, loc8)
print("OK") print("OK")

6
modules/gdscript/tests/scripts/parser/features/variable_declaration.out
Unescape Escape View File

@ -1,7 +1,3 @@
GDTEST_OK GDTEST_OK
>> WARNING 11 22 33 44 55 66 77 88
>> Line: 5
>> UNASSIGNED_VARIABLE
>> The variable 'c' was used but never assigned a value.
1 42 2 23
OK OK