noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

GDScript: Allow out of order member resolution

Browse Source
This commit is contained in:
rune-scape
2022-12-10 21:57:35 -05:00
parent 97df6de4a7
commit 2dfc6d5b69
30 changed files with 797 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/tests/scripts/analyzer/errors/class_name_shadows_builtin_type.out
View File

@@ -1,2 +1,2 @@
GDTEST_ANALYZER_ERROR
The member "Vector2" cannot have the same name as a builtin type.
Class "Vector2" hides a built-in type.

8
modules/gdscript/tests/scripts/analyzer/errors/cyclic_inheritance.gd Normal file
View File

@@ -0,0 +1,8 @@
func test():
print(InnerA.new())
class InnerA extends InnerB:
pass
class InnerB extends InnerA:
pass

2
modules/gdscript/tests/scripts/analyzer/errors/cyclic_inheritance.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Cyclic inheritance.

5
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_const.gd Normal file
View File

@@ -0,0 +1,5 @@
func test():
print(c1)
const c1 = c2
const c2 = c1

2
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_const.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Could not resolve member "c1": Cyclic reference.

5
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_enum.gd Normal file
View File

@@ -0,0 +1,5 @@
func test():
print(E1.V)
enum E1 {V = E2.V}
enum E2 {V = E1.V}

2
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_enum.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Could not resolve member "E1": Cyclic reference.

5
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_enum_value.gd Normal file
View File

@@ -0,0 +1,5 @@
func test():
print(EV1)
enum {EV1 = EV2}
enum {EV2 = EV1}

2
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_enum_value.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Could not resolve member "EV1": Cyclic reference.

6
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_external.gd Normal file
View File

@@ -0,0 +1,6 @@
func test():
print(v)
var v = A.v
const A = preload("cyclic_ref_external_a.notest.gd")

2
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_external.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Could not resolve member "v".

3
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_external_a.notest.gd Normal file
View File

@@ -0,0 +1,3 @@
const B = preload("cyclic_ref_external.gd")
var v = B.v

9
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_func.gd Normal file
View File

@@ -0,0 +1,9 @@
func test():
print(f1())
print(f2())
static func f1(p := f2()) -> int:
return 1
static func f2(p := f1()) -> int:
return 2

2
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_func.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Could not resolve member "f1": Cyclic reference.

12
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_override.gd Normal file
View File

@@ -0,0 +1,12 @@
func test():
print(v)
var v := InnerA.new().f()
class InnerA:
func f(p := InnerB.new().f()) -> int:
return 1
class InnerB extends InnerA:
func f(p := 1) -> int:
return super.f()

2
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_override.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Could not resolve member "f": Cyclic reference.

5
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_var.gd Normal file
View File

@@ -0,0 +1,5 @@
func test():
print(v1)
var v1 := v2
var v2 := v1

2
modules/gdscript/tests/scripts/analyzer/errors/cyclic_ref_var.out Normal file
View File

@@ -0,0 +1,2 @@
GDTEST_ANALYZER_ERROR
Could not resolve member "v1": Cyclic reference.

50
modules/gdscript/tests/scripts/analyzer/features/out_of_order.gd Normal file
View File

@@ -0,0 +1,50 @@
func test():
print("v1: ", v1)
print("v1 is String: ", v1 is String)
print("v2: ", v2)
print("v2 is bool: ", v2 is bool)
print("c1: ", c1)
print("c1 is int: ", c1 is int)
print("c2: ", c2)
print("c2 is int: ", c2 is int)
print("E1.V1: ", E1.V1)
print("E1.V2: ", E1.V2)
print("E2.V: ", E2.V)
print("EV1: ", EV1)
print("EV2: ", EV2)
print("EV3: ", EV3)
var v1 := InnerA.new().fn()
class InnerA extends InnerAB:
func fn(p2 := E1.V2) -> String:
return "%s, p2=%s" % [super.fn(), p2]
class InnerAB:
func fn(p1 := c1) -> String:
return "p1=%s" % p1
var v2 := f()
func f() -> bool:
return true
const c1 := E1.V1
enum E1 {
V1 = E2.V + 2,
V2 = V1 - 1
}
enum E2 {V = 2}
const c2 := EV2
enum {
EV1 = 42,
EV2 = EV3 + 1
}
enum {
EV3 = EV1 + 1
}

15
modules/gdscript/tests/scripts/analyzer/features/out_of_order.out Normal file
View File

@@ -0,0 +1,15 @@
GDTEST_OK
v1: p1=4, p2=3
v1 is String: true
v2: true
v2 is bool: true
c1: 4
c1 is int: true
c2: 44
c2 is int: true
E1.V1: 4
E1.V2: 3
E2.V: 2
EV1: 42
EV2: 44
EV3: 43

39
modules/gdscript/tests/scripts/analyzer/features/out_of_order_external.gd Normal file
View File

@@ -0,0 +1,39 @@
const B = preload("out_of_order_external_a.notest.gd")
func test():
print("v1: ", v1)
print("v1 is String: ", v1 is String)
print("v2: ", v2)
print("v2 is bool: ", v2 is bool)
print("c1: ", c1)
print("c1 is int: ", c1 is int)
print("c2: ", c2)
print("c2 is int: ", c2 is int)
print("E1.V1: ", E1.V1)
print("E1.V2: ", E1.V2)
print("B.E2.V: ", B.E2.V)
print("EV1: ", EV1)
print("EV2: ", EV2)
print("B.EV3: ", B.EV3)
var v1 := Inner.new().fn()
class Inner extends B.Inner:
func fn(p2 := E1.V2) -> String:
return "%s, p2=%s" % [super.fn(), p2]
var v2 := B.new().f()
const c1 := E1.V1
enum E1 {
V1 = B.E2.V + 2,
V2 = V1 - 1
}
const c2 := EV2
enum {
EV1 = 42,
EV2 = B.EV3 + 1
}

15
modules/gdscript/tests/scripts/analyzer/features/out_of_order_external.out Normal file
View File

@@ -0,0 +1,15 @@
GDTEST_OK
v1: p1=4, p2=3
v1 is String: true
v2: true
v2 is bool: true
c1: 4
c1 is int: true
c2: 44
c2 is int: true
E1.V1: 4
E1.V2: 3
B.E2.V: 2
EV1: 42
EV2: 44
B.EV3: 43

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

@@ -0,0 +1,12 @@
const A = preload("out_of_order_external.gd")
class Inner:
func fn(p1 := A.c1) -> String:
return "p1=%s" % p1
func f(p := A.c1) -> bool:
return p is int
enum E2 {V = 2}
enum {EV3 = A.EV1 + 1}