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

GDScript: Consolidate behavior for assigning enum types

Browse Source 
This makes sure that assigning values to enum-typed variables are
consistent. Same enum is always valid, different enum is always
invalid (without casting) and assigning `int` creates a warning
if there is no casting.

There are new test cases to ensure this behavior doesn't break in
the future.
This commit is contained in:
George Marques
2022-01-27 11:34:33 -03:00
parent 82efb1d262
commit ad6e2e82a9
27 changed files with 185 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/gdscript/tests/scripts/analyzer/features/enum_assign_enum_to_int_typed_var.gd Normal file
View File

@@ -0,0 +1,13 @@
enum MyEnum { ENUM_VALUE_1, ENUM_VALUE_2 }
var class_var: int = MyEnum.ENUM_VALUE_1
func test():
print(class_var)
class_var = MyEnum.ENUM_VALUE_2
print(class_var)
var local_var: int = MyEnum.ENUM_VALUE_1
print(local_var)
local_var = MyEnum.ENUM_VALUE_2
print(local_var)

5
modules/gdscript/tests/scripts/analyzer/features/enum_assign_enum_to_int_typed_var.out Normal file
View File

@@ -0,0 +1,5 @@
GDTEST_OK
0
1
0
1

13
modules/gdscript/tests/scripts/analyzer/features/enum_assign_int_cast_to_same_enum.gd Normal file
View File

@@ -0,0 +1,13 @@
enum MyEnum { ENUM_VALUE_1, ENUM_VALUE_2 }
var class_var: MyEnum = 0 as MyEnum
func test():
print(class_var)
class_var = 1 as MyEnum
print(class_var)
var local_var: MyEnum = 0 as MyEnum
print(local_var)
local_var = 1 as MyEnum
print(local_var)

5
modules/gdscript/tests/scripts/analyzer/features/enum_assign_int_cast_to_same_enum.out Normal file
View File

@@ -0,0 +1,5 @@
GDTEST_OK
0
1
0
1

14
modules/gdscript/tests/scripts/analyzer/features/enum_assign_other_enum_cast_to_same_enum.gd Normal file
View File

@@ -0,0 +1,14 @@
enum MyEnum { ENUM_VALUE_1, ENUM_VALUE_2 }
enum MyOtherEnum { OTHER_ENUM_VALUE_1, OTHER_ENUM_VALUE_2 }
var class_var: MyEnum = MyOtherEnum.OTHER_ENUM_VALUE_1 as MyEnum
func test():
print(class_var)
class_var = MyOtherEnum.OTHER_ENUM_VALUE_2 as MyEnum
print(class_var)
var local_var: MyEnum = MyOtherEnum.OTHER_ENUM_VALUE_1 as MyEnum
print(local_var)
local_var = MyOtherEnum.OTHER_ENUM_VALUE_2 as MyEnum
print(local_var)

5
modules/gdscript/tests/scripts/analyzer/features/enum_assign_other_enum_cast_to_same_enum.out Normal file
View File

@@ -0,0 +1,5 @@
GDTEST_OK
0
1
0
1

13
modules/gdscript/tests/scripts/analyzer/features/enum_assign_same_enum.gd Normal file
View File

@@ -0,0 +1,13 @@
enum MyEnum { ENUM_VALUE_1, ENUM_VALUE_2 }
var class_var: MyEnum = MyEnum.ENUM_VALUE_1
func test():
print(class_var)
class_var = MyEnum.ENUM_VALUE_2
print(class_var)
var local_var: MyEnum = MyEnum.ENUM_VALUE_1
print(local_var)
local_var = MyEnum.ENUM_VALUE_2
print(local_var)

5
modules/gdscript/tests/scripts/analyzer/features/enum_assign_same_enum.out Normal file
View File

@@ -0,0 +1,5 @@
GDTEST_OK
0
1
0
1