-#define PSI_T_COMMENT 2
-#define PSI_T_LIB 3
-#define PSI_T_QUOTED_STRING 4
-#define PSI_T_EOS 5
-#define PSI_T_STRUCT 6
-#define PSI_T_LBRACE 7
-#define PSI_T_RBRACE 8
-#define PSI_T_BOOL 9
-#define PSI_T_INT 10
-#define PSI_T_FLOAT 11
-#define PSI_T_STRING 12
-#define PSI_T_CONST 13
-#define PSI_T_NSNAME 14
-#define PSI_T_EQUALS 15
-#define PSI_T_TYPEDEF 16
-#define PSI_T_LPAREN 17
-#define PSI_T_RPAREN 18
-#define PSI_T_LBRACKET 19
-#define PSI_T_NUMBER 20
-#define PSI_T_RBRACKET 21
-#define PSI_T_COMMA 22
-#define PSI_T_VOID 23
-#define PSI_T_DOUBLE 24
-#define PSI_T_INT8 25
-#define PSI_T_UINT8 26
-#define PSI_T_INT16 27
-#define PSI_T_UINT16 28
-#define PSI_T_INT32 29
-#define PSI_T_UINT32 30
-#define PSI_T_INT64 31
-#define PSI_T_UINT64 32
-#define PSI_T_FUNCTION 33
-#define PSI_T_COLON 34
-#define PSI_T_REFERENCE 35
-#define PSI_T_NULL 36
-#define PSI_T_TRUE 37
-#define PSI_T_FALSE 38
-#define PSI_T_DOLLAR 39
-#define PSI_T_LET 40
-#define PSI_T_CALLOC 41
-#define PSI_T_STRLEN 42
-#define PSI_T_STRVAL 43
-#define PSI_T_INTVAL 44
-#define PSI_T_FLOATVAL 45
-#define PSI_T_BOOLVAL 46
-#define PSI_T_ARRVAL 47
-#define PSI_T_SET 48
-#define PSI_T_TO_ARRAY 49
-#define PSI_T_TO_STRING 50
-#define PSI_T_TO_INT 51
-#define PSI_T_TO_FLOAT 52
-#define PSI_T_TO_BOOL 53
-#define PSI_T_RETURN 54
-#define PSI_T_FREE 55
-#define PSI_T_MIXED 56
-#define PSI_T_ARRAY 57
-#define PSI_T_POINTER 58
+#define PSI_T_PLUS 2
+#define PSI_T_MINUS 3
+#define PSI_T_SLASH 4
+#define PSI_T_ASTERISK 5
+#define PSI_T_TEMP 6
+#define PSI_T_FREE 7
+#define PSI_T_SET 8
+#define PSI_T_LET 9
+#define PSI_T_RETURN 10
+#define PSI_T_CALLOC 11
+#define PSI_T_LIB 12
+#define PSI_T_STRING 13
+#define PSI_T_EOF 14
+#define PSI_T_EOS 15
+#define PSI_T_QUOTED_STRING 16
+#define PSI_T_ENUM 17
+#define PSI_T_LBRACE 18
+#define PSI_T_RBRACE 19
+#define PSI_T_COMMA 20
+#define PSI_T_EQUALS 21
+#define PSI_T_UNION 22
+#define PSI_T_STRUCT 23
+#define PSI_T_COLON 24
+#define PSI_T_LPAREN 25
+#define PSI_T_NUMBER 26
+#define PSI_T_RPAREN 27
+#define PSI_T_BOOL 28
+#define PSI_T_INT 29
+#define PSI_T_FLOAT 30
+#define PSI_T_CONST 31
+#define PSI_T_NSNAME 32
+#define PSI_T_TYPEDEF 33
+#define PSI_T_VOID 34
+#define PSI_T_LBRACKET 35
+#define PSI_T_RBRACKET 36
+#define PSI_T_ELLIPSIS 37
+#define PSI_T_CHAR 38
+#define PSI_T_SHORT 39
+#define PSI_T_LONG 40
+#define PSI_T_DOUBLE 41
+#define PSI_T_UNSIGNED 42
+#define PSI_T_SIGNED 43
+#define PSI_T_INT8 44
+#define PSI_T_UINT8 45
+#define PSI_T_INT16 46
+#define PSI_T_UINT16 47
+#define PSI_T_INT32 48
+#define PSI_T_UINT32 49
+#define PSI_T_INT64 50
+#define PSI_T_UINT64 51
+#define PSI_T_FUNCTION 52
+#define PSI_T_NULL 53
+#define PSI_T_TRUE 54
+#define PSI_T_FALSE 55
+#define PSI_T_DOLLAR_NAME 56
+#define PSI_T_OBJVAL 57
+#define PSI_T_ARRVAL 58
+#define PSI_T_PATHVAL 59
+#define PSI_T_STRLEN 60
+#define PSI_T_STRVAL 61
+#define PSI_T_FLOATVAL 62
+#define PSI_T_INTVAL 63
+#define PSI_T_BOOLVAL 64
+#define PSI_T_CALLBACK 65
+#define PSI_T_TO_OBJECT 66
+#define PSI_T_TO_ARRAY 67
+#define PSI_T_TO_STRING 68
+#define PSI_T_TO_INT 69
+#define PSI_T_TO_FLOAT 70
+#define PSI_T_TO_BOOL 71
+#define PSI_T_MIXED 72
+#define PSI_T_ARRAY 73
+#define PSI_T_OBJECT 74
+#define PSI_T_CALLABLE 75
+#define PSI_T_AMPERSAND 76