Skip to content

Commit 5ce7701

Browse files
SomeRanDevSomeRanDev
committed
Update tests
1 parent 8e0bd85 commit 5ce7701

20 files changed

Lines changed: 69 additions & 75 deletions

‎DevEnv.hxml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
--macro nullSafety("gdcompiler")
77
-lib reflaxe
88
-cp src
9-
gdcompiler
9+
gdcompiler

‎test/godot_project/gdscript/out/EReg.gd‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ class_name EReg
22

33
var regObj
44
var regexStr: String
5-
var m
5+
var m = null
66

77
func _init(r: String, opt: String) -> void:
8-
self.m = null
98
self.regObj = RegEx.new()
109
self.regexStr = r
1110

@@ -61,11 +60,11 @@ func matchSub(s: String, pos: int, len: int = -1) -> bool:
6160

6261
return !(!self.m)
6362

64-
func split(s: String) -> Array:
63+
func split(s: String) -> Array[String]:
6564
if (s == null || s.length() <= 0):
66-
return [s]
65+
return ([s] as Array[String])
6766

68-
var result: Array = []
67+
var result: Array[String] = ([] as Array[String])
6968
var index: int = 0
7069

7170
while (true):

‎test/godot_project/gdscript/out/Log.gd‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
@tool
12
class_name Log
23

3-
static var trace = func(v, infos = null):
4+
static var trace = func(v, infos = null) -> void:
45
var str: String = Log.formatOutput(v, infos)
56
print(str)
67

7-
func _init():
8+
func _init() -> void:
89
pass
910

1011
static func formatOutput(v, infos: Dictionary) -> String:

‎test/godot_project/gdscript/out/Reflect.gd‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class_name Reflect
22

3-
func _init():
3+
func _init() -> void:
44
pass
55

66
static func hasField(o, fieldName: String) -> bool:
@@ -31,12 +31,12 @@ static func setProperty(o, fieldName: String, value) -> void:
3131
else:
3232
Reflect.setField(o, fieldName, value)
3333

34-
static func callMethod(o, _func, args: Array):
34+
static func callMethod(o, _func, args: Array[Variant]):
3535
return _func.callv(args)
3636

37-
static func fields(o) -> Array:
38-
var list: Array = o.get_property_list.call()
39-
var result: Array = []
37+
static func fields(o) -> Array[String]:
38+
var list: Array[Dictionary] = o.get_property_list.call()
39+
var result: Array[String] = ([] as Array[String])
4040
var _g: int = 0
4141

4242
while (_g < list.size()):
@@ -88,12 +88,12 @@ static func copy(o):
8888
assert(false, "Only anonymous structures (Dictionaries) may be used with `Reflect.copy`.")
8989

9090
static func makeVarArgs(f):
91-
return func(args: Array):
91+
return func(args: Array[Variant]):
9292
var tempArray
9393
if true:
94-
var _g: Array = []
94+
var _g: Array[Variant] = ([] as Array[Variant])
9595
var _g1: int = 0
96-
var _g2: Array = args
96+
var _g2: Array[Variant] = args
9797
while (_g1 < _g2.size()):
9898
var v = _g2[_g1]
9999
_g1 += 1

‎test/godot_project/gdscript/out/StringTools.gd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class_name StringTools
22

3-
func _init():
3+
func _init() -> void:
44
pass
55

66
static func startsWith(s: String, start: String) -> bool:

‎test/godot_project/gdscript/out/TestAll.gd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class_name TestAll
22

3-
func _init():
3+
func _init() -> void:
44
pass
55

66
static func test() -> void:

‎test/godot_project/gdscript/out/TestArray.gd‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
class_name TestArray
22

3-
func _init():
3+
func _init() -> void:
44
pass
55

66
static func test() -> void:
7-
var arr: Array = []
7+
var arr: Array[int] = []
88

99
if true:
1010
var cond: bool = arr.size() == 0
@@ -18,7 +18,7 @@ static func test() -> void:
1818
var cond: bool = arr.size() == 3
1919
assert(cond, "Test assert failed.")
2020
if true:
21-
var cond: bool = (arr + [4, 5, 6]).size() == 6
21+
var cond: bool = (arr + ([4, 5, 6] as Array[int])).size() == 6
2222
assert(cond, "Test assert failed.")
2323
if true:
2424
var cond: bool = arr.has(3)
@@ -32,7 +32,7 @@ static func test() -> void:
3232
if true:
3333
var tempRight
3434
if true:
35-
var _g: Array = []
35+
var _g: Array[int] = ([] as Array[int])
3636
if true:
3737
var _g1: int = 0
3838
while (_g1 < arr.size()):
@@ -45,9 +45,9 @@ static func test() -> void:
4545
if true:
4646
var tempArray
4747
if true:
48-
var temp = func(i: int):
48+
var temp = func(i: int) -> bool:
4949
return i != 1
50-
var result: Array = []
50+
var result: Array[int] = ([] as Array[int])
5151
if true:
5252
var _g: int = 0
5353
while (_g < arr.size()):
@@ -128,9 +128,9 @@ static func test() -> void:
128128
var tempArray1
129129

130130
if true:
131-
var temp = func(i: int):
131+
var temp = func(i: int) -> int:
132132
return i * 2
133-
var result: Array = []
133+
var result: Array[int] = ([] as Array[int])
134134
if true:
135135
var _g: int = 0
136136
while (_g < arr.size()):
@@ -157,7 +157,7 @@ static func test() -> void:
157157
assert(keyTotal == 10, "Test assert failed.")
158158
assert(doubleTotal == 20, "Test assert failed.")
159159

160-
var stack: Array = [84, 29, 655]
160+
var stack: Array[int] = ([84, 29, 655] as Array[int])
161161

162162
if true:
163163
var cond: bool = stack.pop_back() == 655
@@ -185,37 +185,37 @@ static func test() -> void:
185185
else:
186186
assert(false, "Test assert failed.")
187187

188-
var ordered: Array = [3, 6, 9, 12]
188+
var ordered: Array[int] = ([3, 6, 9, 12] as Array[int])
189189

190190
ordered.reverse()
191-
assert(ordered == [12, 9, 6, 3], "Test assert failed.")
191+
assert(ordered == ([12, 9, 6, 3] as Array[int]), "Test assert failed.")
192192

193193
if true:
194194
var cond: bool = ordered.pop_front() == 12
195195
assert(cond, "Test assert failed.")
196196

197-
var newArr: Array = [22, 44, 66, 88]
197+
var newArr: Array[int] = ([22, 44, 66, 88] as Array[int])
198198

199199
if true:
200-
var cond: bool = newArr.slice(1) == [44, 66, 88]
200+
var cond: bool = newArr.slice(1) == ([44, 66, 88] as Array[int])
201201
assert(cond, "Test assert failed.")
202202
if true:
203-
var cond: bool = newArr.slice(2, 3) == [66]
203+
var cond: bool = newArr.slice(2, 3) == ([66] as Array[int])
204204
assert(cond, "Test assert failed.")
205205

206-
var sortable: Array = [2, 7, 1, 4, 0, 4]
207-
var f = func(a: int, b: int):
206+
var sortable: Array[int] = ([2, 7, 1, 4, 0, 4] as Array[int])
207+
var f = func(a: int, b: int) -> int:
208208
return a - b
209209

210-
sortable.sort_custom(func(a: int, b: int):
210+
sortable.sort_custom(func(a: int, b: int) -> bool:
211211
return f.call(a, b) < 0)
212-
assert(sortable == [0, 1, 2, 4, 4, 7], "Test assert failed.")
212+
assert(sortable == ([0, 1, 2, 4, 4, 7] as Array[int]), "Test assert failed.")
213213

214214
if true:
215215
var tempLeft1
216216
if true:
217217
var pos: int = 2
218-
var result: Array = []
218+
var result: Array[int] = ([] as Array[int])
219219
if (pos < 0):
220220
pos = 0
221221
var i: int = pos + 1 - 1
@@ -226,13 +226,13 @@ static func test() -> void:
226226
sortable.remove_at(pos)
227227
i -= 1
228228
tempLeft1 = result
229-
var cond: bool = tempLeft1 == [2]
229+
var cond: bool = tempLeft1 == ([2] as Array[int])
230230
assert(cond, "Test assert failed.")
231231
if true:
232232
var tempLeft2
233233
if true:
234234
var pos: int = 1
235-
var result: Array = []
235+
var result: Array[int] = ([] as Array[int])
236236
if (pos < 0):
237237
pos = 0
238238
var i: int = pos + 3 - 1
@@ -243,15 +243,15 @@ static func test() -> void:
243243
sortable.remove_at(pos)
244244
i -= 1
245245
tempLeft2 = result
246-
var cond: bool = tempLeft2 == [1, 4, 4]
246+
var cond: bool = tempLeft2 == ([1, 4, 4] as Array[int])
247247
assert(cond, "Test assert failed.")
248248
if true:
249249
var cond: bool = str(sortable) == "[0, 7]"
250250
assert(cond, "Test assert failed.")
251251

252-
var unfinished: Array = [3, 4, 5]
252+
var unfinished: Array[int] = ([3, 4, 5] as Array[int])
253253

254254
unfinished.push_front(2)
255255
unfinished.push_front(1)
256-
assert(unfinished == [1, 2, 3, 4, 5], "Test assert failed.")
256+
assert(unfinished == ([1, 2, 3, 4, 5] as Array[int]), "Test assert failed.")
257257

‎test/godot_project/gdscript/out/TestClass.gd‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
class_name TestClass
22

3-
var a: int
4-
var b: float
5-
var c: bool
3+
var a: int = 2
4+
var b: float = 3
5+
var c: bool = false
66

77
func _init() -> void:
8-
self.c = false
9-
self.b = 3
10-
self.a = 2
11-
128
if (!self.c):
139
Log.trace.call(self.a, {
1410
"fileName": "src/test/TestClass.hx",
1511
"lineNumber": 10,
1612
"className": "test.TestClass",
1713
"methodName": "new",
18-
"customParams": [self.b]
14+
"customParams": ([self.b] as Array[Variant])
1915
})
2016

2117
static func test() -> void:

‎test/godot_project/gdscript/out/TestEReg.gd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class_name TestEReg
22

3-
func _init():
3+
func _init() -> void:
44
pass
55

66
static func test() -> void:
@@ -25,7 +25,7 @@ static func test() -> void:
2525
var cond: bool = EReg.new("abc", "").matchSub("abcabc", 1, -1)
2626
assert(cond, "Test assert failed.")
2727
if true:
28-
var cond: bool = EReg.new("\\s*,\\s*", "").split("one,two ,three, four") == ["one", "two", "three", "four"]
28+
var cond: bool = EReg.new("\\s*,\\s*", "").split("one,two ,three, four") == (["one", "two", "three", "four"] as Array[String])
2929
assert(cond, "Test assert failed.")
3030
if true:
3131
var cond: bool = reg.replace("123abc", "456") == "123456"

‎test/godot_project/gdscript/out/TestEnum.gd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
class_name TestEnum
22

3-
func _init():
3+
func _init() -> void:
44
pass
55

66
static func test() -> void:
7-
var a: Dictionary = { "_index": 0 }
8-
var b: Dictionary = { "_index": 1, "i": 123 }
9-
var c: Dictionary = { "_index": 2, "s": "Test" }
7+
var a: Variant = { "_index": 0 }
8+
var b: Variant = { "_index": 1, "i": 123 }
9+
var c: Variant = { "_index": 2, "s": "Test" }
1010

1111
match (b._index):
1212
0:

0 commit comments

Comments
 (0)