From c268e3a235d0855d572799b5caf0457f5b64bd3d Mon Sep 17 00:00:00 2001
From: kleonc <9283098+kleonc@users.noreply.github.com>
Date: Tue, 1 Nov 2022 17:07:40 +0100
Subject: GDScript Fix type mismatch in optimized single arg `range`

---
 modules/gdscript/gdscript_analyzer.cpp             |  2 +-
 .../range_optimized_in_for_has_int_iterator.gd     | 60 +++++++++++++++++
 .../range_optimized_in_for_has_int_iterator.out    |  1 +
 .../scripts/runtime/features/range_returns_ints.gd | 77 ++++++++++++++++++++++
 .../runtime/features/range_returns_ints.out        |  1 +
 5 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 modules/gdscript/tests/scripts/runtime/features/range_optimized_in_for_has_int_iterator.gd
 create mode 100644 modules/gdscript/tests/scripts/runtime/features/range_optimized_in_for_has_int_iterator.out
 create mode 100644 modules/gdscript/tests/scripts/runtime/features/range_returns_ints.gd
 create mode 100644 modules/gdscript/tests/scripts/runtime/features/range_returns_ints.out

(limited to 'modules')

diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp
index 1401e4b94b..27b91d9dea 100644
--- a/modules/gdscript/gdscript_analyzer.cpp
+++ b/modules/gdscript/gdscript_analyzer.cpp
@@ -1377,7 +1377,7 @@ void GDScriptAnalyzer::resolve_for(GDScriptParser::ForNode *p_for) {
 					if (all_is_constant) {
 						switch (args.size()) {
 							case 1:
-								reduced = args[0];
+								reduced = (int32_t)args[0];
 								break;
 							case 2:
 								reduced = Vector2i(args[0], args[1]);
diff --git a/modules/gdscript/tests/scripts/runtime/features/range_optimized_in_for_has_int_iterator.gd b/modules/gdscript/tests/scripts/runtime/features/range_optimized_in_for_has_int_iterator.gd
new file mode 100644
index 0000000000..e24137a20d
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/range_optimized_in_for_has_int_iterator.gd
@@ -0,0 +1,60 @@
+func test():
+	# All combinations of 1/2/3 arguments, each being int/float.
+
+	for number in range(5):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	for number in range(5.2):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+
+	for number in range(1, 5):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	for number in range(1, 5.2):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	for number in range(1.2, 5):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	for number in range(1.2, 5.2):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+
+	for number in range(1, 5, 2):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	for number in range(1, 5, 2.2):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	for number in range(1, 5.2, 2):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	for number in range(1, 5.2, 2.2):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	for number in range(1.2, 5, 2):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	for number in range(1.2, 5.2, 2):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	for number in range(1.2, 5, 2.2):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	for number in range(1.2, 5.2, 2.2):
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
diff --git a/modules/gdscript/tests/scripts/runtime/features/range_optimized_in_for_has_int_iterator.out b/modules/gdscript/tests/scripts/runtime/features/range_optimized_in_for_has_int_iterator.out
new file mode 100644
index 0000000000..d73c5eb7cd
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/range_optimized_in_for_has_int_iterator.out
@@ -0,0 +1 @@
+GDTEST_OK
diff --git a/modules/gdscript/tests/scripts/runtime/features/range_returns_ints.gd b/modules/gdscript/tests/scripts/runtime/features/range_returns_ints.gd
new file mode 100644
index 0000000000..63c3b84305
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/range_returns_ints.gd
@@ -0,0 +1,77 @@
+func test():
+	# All combinations of 1/2/3 arguments, each being int/float.
+	# Store result in variable to ensure actual array is created (avoid `for` + `range` optimization).
+
+	var result
+
+	result = range(5)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	result = range(5.2)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+
+	result = range(1, 5)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	result = range(1, 5.2)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	result = range(1.2, 5)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	result = range(1.2, 5.2)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+
+	result = range(1, 5, 2)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	result = range(1, 5, 2.2)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	result = range(1, 5.2, 2)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	result = range(1, 5.2, 2.2)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	result = range(1.2, 5, 2)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	result = range(1.2, 5.2, 2)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	result = range(1.2, 5, 2.2)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
+
+	result = range(1.2, 5.2, 2.2)
+	for number in result:
+		if typeof(number) != TYPE_INT:
+			print("Number returned from `range` was not an int!")
diff --git a/modules/gdscript/tests/scripts/runtime/features/range_returns_ints.out b/modules/gdscript/tests/scripts/runtime/features/range_returns_ints.out
new file mode 100644
index 0000000000..d73c5eb7cd
--- /dev/null
+++ b/modules/gdscript/tests/scripts/runtime/features/range_returns_ints.out
@@ -0,0 +1 @@
+GDTEST_OK
-- 
cgit v1.2.3