most of expressions handled

Author: Scony

gdscript.lark

@@ -60,8 +60,20 @@ comparison: bitw_or (comp_op bitw_or)*
 comp_op: ">" | "<" | "==" | "!=" | "<=" | ">="
 bitw_or: bitw_xor ("|" bitw_xor)*
 bitw_xor: bitw_and ("^" bitw_and)*
-bitw_and: atom ("&" atom)*
-atom: NAME | literal
+bitw_and: shift_expr ("&" shift_expr)*
+shift_expr: subtr_expr (("<<"|">>") subtr_expr)*
+subtr_expr: addn_expr ("-" addn_expr)*
+addn_expr: mdr_expr ("+" mdr_expr)*
+mdr_expr: neg_expr (("*" | "/" | "%") neg_expr)*
+neg_expr: "-" neg_expr | bitw_not
+bitw_not: "~" bitw_not | type_test
+type_test: attr_expr ("is" atom)*
+attr_expr: subscr_expr ("." NAME)*
+subscr_expr: call_expr ["[" atom "]"] // TODO: expr inside []
+call_expr: atom ["(" ")"]             // TODO: expr(s,) inside ()
+atom: "(" expr ")"
+    | NAME
+    | literal
 literal: NUMBER
 
 TYPE: NAME

makefile

@@ -0,0 +1,2 @@
+all:
+	pytest -v

scripts/expressions.gd

@@ -1,3 +1,5 @@
+func bar():
+	pass
 func foo():
 	var x
 	1 if true else 2
@@ -17,3 +19,17 @@ func foo():
 	3 | 3
 	6 ^ 5
 	8 & 7
+	5 >> 7
+	7 << 5
+	5 - 6
+	6 + 7
+	7 * 7
+	7 / 8
+	6 % 3
+	-8
+	~8
+	x is int
+	x.attr
+	x[10]
+	bar()
+	(2+2)