Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GDScript: Improve type inference for arrays and dictionaries #83718

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+158 −40
Draft

GDScript: Improve type inference for arrays and dictionaries #83718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion modules/gdscript/gdscript_analyzer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2158,7 +2158,10 @@ void GDScriptAnalyzer::resolve_for(GDScriptParser::ForNode *p_for) {
} else {
push_error(vformat(R"(Unable to iterate on object of type "%s".)", list_type.to_string()), p_for->list);
}
} else if (list_type.builtin_type == Variant::ARRAY || list_type.builtin_type == Variant::DICTIONARY || !list_type.is_hard_type()) {
} else if (list_type.builtin_type == Variant::ARRAY || list_type.builtin_type == Variant::DICTIONARY) {
variable_type.type_source = list_type.type_source;
variable_type.kind = GDScriptParser::DataType::VARIANT;
} else if (!list_type.is_hard_type()) {
variable_type.kind = GDScriptParser::DataType::VARIANT;
} else {
push_error(vformat(R"(Unable to iterate on value of type "%s".)", list_type.to_string()), p_for->list);
Expand Down
142 changes: 116 additions & 26 deletions modules/gdscript/tests/scripts/runtime/features/for_loop_iterator_types.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,141 @@
const constant_float = 1.0
const constant_int = 1
enum { enum_value = 1 }

class Iterator:
func _iter_init(_count):
return true
func _iter_next(_count):
return false
func _iter_get(_count) -> StringName:
return &'custom'
return &"custom"

func test():
var hard_float := 1.0
var hard_int := 1
var hard_string := '0'
var hard_vector_2i := Vector2i(1, 2)
var hard_vector_3i := Vector3i(1, 2, 1)
var hard_float := 1.0
var hard_vector_2 := Vector2(1.0, 2.0)
var hard_vector_3 := Vector3(1.0, 2.0, 1.0)
var hard_string := "a"
var hard_array := ["elem"]
var hard_int_array: Array[int] = [123]
var hard_packed_color_array: PackedColorArray = [Color.RED]
var hard_dictionary := {key = "value"}
var hard_iterator := Iterator.new()

var variant_float: Variant = hard_float
var variant_int: Variant = hard_int
var variant_vector_2i: Variant = hard_vector_2i
var variant_vector_3i: Variant = hard_vector_3i
var variant_float: Variant = hard_float
var variant_vector_2: Variant = hard_vector_2
var variant_vector_3: Variant = hard_vector_3
var variant_string: Variant = hard_string
var variant_array: Variant = hard_array
var variant_int_array: Variant = hard_int_array
var variant_packed_color_array: Variant = hard_packed_color_array
var variant_dictionary: Variant = hard_dictionary
var variant_iterator: Variant = hard_iterator

for i in 1.0:
print(typeof(i) == TYPE_FLOAT)
for i in 1:
print(typeof(i) == TYPE_INT)
for i in 'a':
print(typeof(i) == TYPE_STRING)
var _i := i
print(var_to_str(i))
for i in Vector2i(1, 2):
var _i := i
print(var_to_str(i))
for i in Vector3i(1, 2, 1):
var _i := i
print(var_to_str(i))
for i in 1.0:
var _i := i
print(var_to_str(i))
for i in Vector2(1.0, 2.0):
var _i := i
print(var_to_str(i))
for i in Vector3(1.0, 2.0, 1.0):
var _i := i
print(var_to_str(i))
for i in "a":
var _i := i
print(var_to_str(i))
for i in ["elem"]:
@warning_ignore("inference_on_variant")
var _i := i
print(var_to_str(i))
for i in [123] as Array[int]:
var _i := i
print(var_to_str(i))
for i in PackedColorArray([Color.RED]):
var _i := i
print(var_to_str(i))
for i in {key = "value"}:
@warning_ignore("inference_on_variant")
var _i := i
print(var_to_str(i))
for i in Iterator.new():
print(typeof(i) == TYPE_STRING_NAME)
var _i := i
print(var_to_str(i))

print("=====")

for i in hard_float:
print(typeof(i) == TYPE_FLOAT)
for i in hard_int:
print(typeof(i) == TYPE_INT)
var _i := i
print(var_to_str(i))
for i in hard_vector_2i:
var _i := i
print(var_to_str(i))
for i in hard_vector_3i:
var _i := i
print(var_to_str(i))
for i in hard_float:
var _i := i
print(var_to_str(i))
for i in hard_vector_2:
var _i := i
print(var_to_str(i))
for i in hard_vector_3:
var _i := i
print(var_to_str(i))
for i in hard_string:
print(typeof(i) == TYPE_STRING)
var _i := i
print(var_to_str(i))
for i in hard_array:
@warning_ignore("inference_on_variant")
var _i := i
print(var_to_str(i))
for i in hard_int_array:
var _i := i
print(var_to_str(i))
for i in hard_packed_color_array:
var _i := i
print(var_to_str(i))
for i in hard_dictionary:
@warning_ignore("inference_on_variant")
var _i := i
print(var_to_str(i))
for i in hard_iterator:
print(typeof(i) == TYPE_STRING_NAME)
var _i := i
print(var_to_str(i))

print("=====")

for i in variant_float:
print(typeof(i) == TYPE_FLOAT)
for i in variant_int:
print(typeof(i) == TYPE_INT)
print(var_to_str(i))
for i in variant_vector_2i:
print(var_to_str(i))
for i in variant_vector_3i:
print(var_to_str(i))
for i in variant_float:
print(var_to_str(i))
for i in variant_vector_2:
print(var_to_str(i))
for i in variant_vector_3:
print(var_to_str(i))
for i in variant_string:
print(typeof(i) == TYPE_STRING)
print(var_to_str(i))
for i in variant_array:
print(var_to_str(i))
for i in variant_int_array:
print(var_to_str(i))
for i in variant_packed_color_array:
print(var_to_str(i))
for i in variant_dictionary:
print(var_to_str(i))
for i in variant_iterator:
print(typeof(i) == TYPE_STRING_NAME)

print('ok')
print(var_to_str(i))
51 changes: 38 additions & 13 deletions modules/gdscript/tests/scripts/runtime/features/for_loop_iterator_types.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,39 @@
GDTEST_OK
true
true
true
true
true
true
true
true
true
true
true
true
ok
0
1
1
0.0
1.0
1.0
"a"
"elem"
123
Color(1, 0, 0, 1)
"key"
&"custom"
=====
0
1
1
0.0
1.0
1.0
"a"
"elem"
123
Color(1, 0, 0, 1)
"key"
&"custom"
=====
0
1
1
0.0
1.0
1.0
"a"
"elem"
123
Color(1, 0, 0, 1)
"key"
&"custom"