Skip to content

Commit 238230a

Browse files
committed
Align tests & parser to latest Godot 4
1 parent 8b58ea8 commit 238230a

File tree

7 files changed

+28
-23
lines changed

7 files changed

+28
-23
lines changed

gdtoolkit/parser/gdscript.lark

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ enum_stmt: enum_regular
2525
enum_regular: "enum" enum_body
2626
enum_named: "enum" NAME enum_body
2727
enum_body: "{" [enum_element ("," enum_element)* [trailing_comma]] "}"
28-
enum_element: NAME ["=" test_expr]
28+
enum_element: NAME ["=" type_cast]
2929
signal_stmt: "signal" NAME [signal_args]
3030
signal_args: "(" [signal_arg ("," signal_arg)* [trailing_comma]] ")"
3131
?signal_arg: NAME
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
class X:
22
func foo():
3-
var x = 1 as String as String
4-
var y = 1 as String as String as String as String as String as String as String as String as String
3+
var x = 1 as int as int
4+
var y = 1 as int as int as int as int as int as int as int as int as int as int as int as int as int
Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
class X:
22
func foo():
3-
var x = 1 as String as String
3+
var x = 1 as int as int
44
var y = (
55
1
6-
as String
7-
as String
8-
as String
9-
as String
10-
as String
11-
as String
12-
as String
13-
as String
14-
as String
6+
as int
7+
as int
8+
as int
9+
as int
10+
as int
11+
as int
12+
as int
13+
as int
14+
as int
15+
as int
16+
as int
17+
as int
18+
as int
1519
)

tests/potential-godot-bugs/enum-w-type-cast.gd

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
enum Named { Foo, Bar = 1 if true else 0 }
2+
enum Named2 { Foo, Bar = 1 << 3 }
3+
enum Named3 { Foo, Bar = 1.5 as int }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var x = (
22
1
3-
as String
4-
as String
3+
as int
4+
as int
55
)

tests/valid-gd-scripts/type-cast.gd

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ func foo(x):
66

77

88
func bar():
9-
foo("1" as int)
10-
var x = ["1" as int, 2, 3]
11-
x["1" as int]
9+
foo(1 as int)
10+
var x = [1 as int, 2, 3]
11+
x[1 as int]
1212
var y = {
13-
"1" as int: "1" as int,
13+
1 as int: 1 as int,
1414
}
1515
var z = {
16-
x = "1" as int,
16+
x = 1 as int,
1717
}
18+
print(1.5 as int)

0 commit comments

Comments
 (0)