Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #67714 from adamscott/fix-preload-cyclic-references-part2

Browse source 
Fix cyclic references in GDScript 2.0
This commit is contained in:
Rémi Verschelde 2022-11-18 23:08:01 +01:00
commit 80b3813b15
No known key found for this signature in database
GPG key ID: C3336907360768E1
20 changed files with 626 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/gdscript/tests/scripts/analyzer/features/gdscript_to_preload.gd → modules/gdscript/tests/scripts/analyzer/features/gdscript_to_preload.notest.gd
View file

@ -1,7 +1,4 @@
const A := 42
func test():
pass
func something():
return "OK"

2
modules/gdscript/tests/scripts/analyzer/features/preload_constant_types_are_inferred.gd
View file

@ -1,4 +1,4 @@
const Constants = preload("gdscript_to_preload.gd")
const Constants = preload("gdscript_to_preload.notest.gd")
func test():
var a := Constants.A

4
modules/gdscript/tests/scripts/analyzer/features/preload_cyclic_reference.gd Normal file
View file

@ -0,0 +1,4 @@
const A = preload("preload_cyclic_reference_a.notest.gd")
func test():
A.test_cyclic_reference()

1
modules/gdscript/tests/scripts/analyzer/features/gdscript_to_preload.out → modules/gdscript/tests/scripts/analyzer/features/preload_cyclic_reference.out
View file

@ -1 +1,2 @@
GDTEST_OK
godot

12
modules/gdscript/tests/scripts/analyzer/features/preload_cyclic_reference_a.notest.gd Normal file
View file

@ -0,0 +1,12 @@
const B = preload("preload_cyclic_reference_b.notest.gd")
const WAITING_FOR = "godot"
static func test_cyclic_reference():
B.test_cyclic_reference()
static func test_cyclic_reference_2():
B.test_cyclic_reference_2()
static func test_cyclic_reference_3():
B.test_cyclic_reference_3()

10
modules/gdscript/tests/scripts/analyzer/features/preload_cyclic_reference_b.notest.gd Normal file
View file

@ -0,0 +1,10 @@
const A = preload("preload_cyclic_reference_a.notest.gd")
static func test_cyclic_reference():
A.test_cyclic_reference_2()
static func test_cyclic_reference_2():
A.test_cyclic_reference_3()
static func test_cyclic_reference_3():
print(A.WAITING_FOR)

2
modules/gdscript/tests/scripts/analyzer/features/use_preload_script_as_type.gd
View file

@ -1,4 +1,4 @@
const preloaded : GDScript = preload("gdscript_to_preload.gd")
const preloaded : GDScript = preload("gdscript_to_preload.notest.gd")
func test():
var preloaded_instance: preloaded = preloaded.new()