-#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_INT8 22
-#define PSI_T_UINT8 23
-#define PSI_T_INT16 24
-#define PSI_T_UINT16 25
-#define PSI_T_INT32 26
-#define PSI_T_UINT32 27
-#define PSI_T_INT64 28
-#define PSI_T_UINT64 29
-#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_ENUM 57
-#define PSI_T_LBRACE 58
-#define PSI_T_RBRACE 59
-#define PSI_T_COMMA 60
-#define PSI_T_EQUALS 61
-#define PSI_T_UNION 62
-#define PSI_T_STRUCT 63
+#define PSI_T_BOOL 1
+#define PSI_T_INT 2
+#define PSI_T_FLOAT 3
+#define PSI_T_STRING 4
+#define PSI_T_DOUBLE 5
+#define PSI_T_INT8 6
+#define PSI_T_UINT8 7
+#define PSI_T_INT16 8
+#define PSI_T_UINT16 9
+#define PSI_T_INT32 10
+#define PSI_T_UINT32 11
+#define PSI_T_INT64 12
+#define PSI_T_UINT64 13
+#define PSI_T_NAME 14
+#define PSI_T_NULL 15
+#define PSI_T_NUMBER 16
+#define PSI_T_TRUE 17
+#define PSI_T_FALSE 18
+#define PSI_T_QUOTED_STRING 19
+#define PSI_T_NSNAME 20
+#define PSI_T_PIPE 21
+#define PSI_T_CARET 22
+#define PSI_T_AMPERSAND 23
+#define PSI_T_LSHIFT 24
+#define PSI_T_RSHIFT 25
+#define PSI_T_PLUS 26
+#define PSI_T_MINUS 27
+#define PSI_T_ASTERISK 28
+#define PSI_T_SLASH 29
+#define PSI_T_MODULO 30
+#define PSI_T_TILDE 31
+#define PSI_T_NOT 32
+#define PSI_T_ZVAL 33
+#define PSI_T_OBJVAL 34
+#define PSI_T_ARRVAL 35
+#define PSI_T_PATHVAL 36
+#define PSI_T_STRLEN 37
+#define PSI_T_STRVAL 38
+#define PSI_T_FLOATVAL 39
+#define PSI_T_INTVAL 40
+#define PSI_T_BOOLVAL 41
+#define PSI_T_COUNT 42
+#define PSI_T_TO_OBJECT 43
+#define PSI_T_TO_ARRAY 44
+#define PSI_T_TO_STRING 45
+#define PSI_T_TO_INT 46
+#define PSI_T_TO_FLOAT 47
+#define PSI_T_TO_BOOL 48
+#define PSI_T_VOID 49
+#define PSI_T_MIXED 50
+#define PSI_T_ARRAY 51
+#define PSI_T_OBJECT 52
+#define PSI_T_CALLABLE 53
+#define PSI_T_TEMP 54
+#define PSI_T_FREE 55
+#define PSI_T_SET 56
+#define PSI_T_LET 57
+#define PSI_T_RETURN 58
+#define PSI_T_CALLOC 59
+#define PSI_T_CALLBACK 60
+#define PSI_T_LIB 61
+#define PSI_T_EOF 62
+#define PSI_T_EOS 63