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