asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #81332 from dalexeev/gds-fix-update-array-literal-in-weak-context

Browse source 
GDScript: Don't make array literal typed in weak type context
This commit is contained in:
Rémi Verschelde 2023-09-20 13:09:23 +02:00
commit 712ebe7d8a
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/gdscript/gdscript_analyzer.cpp
View file

@ -2609,7 +2609,7 @@ void GDScriptAnalyzer::reduce_assignment(GDScriptParser::AssignmentNode *p_assig
}
// Check if assigned value is an array literal, so we can make it a typed array too if appropriate.
if (p_assignment->assigned_value->type == GDScriptParser::Node::ARRAY && assignee_type.has_container_element_type()) {
if (p_assignment->assigned_value->type == GDScriptParser::Node::ARRAY && assignee_type.is_hard_type() && assignee_type.has_container_element_type()) {
update_array_literal_element_type(static_cast<GDScriptParser::ArrayNode *>(p_assignment->assigned_value), assignee_type.get_container_element_type());
}
@ -3213,7 +3213,7 @@ void GDScriptAnalyzer::reduce_call(GDScriptParser::CallNode *p_call, bool p_is_a
// If the function requires typed arrays we must make literals be typed.
for (const KeyValue<int, GDScriptParser::ArrayNode *> &E : arrays) {
int index = E.key;
if (index < par_types.size() && par_types[index].has_container_element_type()) {
if (index < par_types.size() && par_types[index].is_hard_type() && par_types[index].has_container_element_type()) {
update_array_literal_element_type(E.value, par_types[index].get_container_element_type());
}
}

22
modules/gdscript/tests/scripts/analyzer/features/typed_array_dont_make_literal_typed_with_weak_type.gd Normal file
View file

@ -0,0 +1,22 @@
var _typed_array: Array[int]
func weak_param_func(weak_param = _typed_array):
weak_param = [11] # Don't treat the literal as typed!
return weak_param
func hard_param_func(hard_param := _typed_array):
hard_param = [12]
return hard_param
func test():
var weak_var = _typed_array
print(weak_var.is_typed())
weak_var = [21] # Don't treat the literal as typed!
print(weak_var.is_typed())
print(weak_param_func().is_typed())
var hard_var := _typed_array
print(hard_var.is_typed())
hard_var = [22]
print(hard_var.is_typed())
print(hard_param_func().is_typed())

7
modules/gdscript/tests/scripts/analyzer/features/typed_array_dont_make_literal_typed_with_weak_type.out Normal file
View file

@ -0,0 +1,7 @@
GDTEST_OK
true
false
false
true
true
true