-#define PSI_T_VOID 23
-#define PSI_T_LBRACKET 24
-#define PSI_T_NUMBER 25
-#define PSI_T_RBRACKET 26
-#define PSI_T_COMMA 27
-#define PSI_T_DOUBLE 28
-#define PSI_T_INT8 29
-#define PSI_T_UINT8 30
-#define PSI_T_INT16 31
-#define PSI_T_UINT16 32
-#define PSI_T_INT32 33
-#define PSI_T_UINT32 34
-#define PSI_T_INT64 35
-#define PSI_T_UINT64 36
-#define PSI_T_FUNCTION 37
-#define PSI_T_COLON 38
-#define PSI_T_REFERENCE 39
-#define PSI_T_NULL 40
-#define PSI_T_TRUE 41
-#define PSI_T_FALSE 42
-#define PSI_T_DOLLAR 43
-#define PSI_T_CALLOC 44
-#define PSI_T_ARRVAL 45
-#define PSI_T_STRLEN 46
-#define PSI_T_STRVAL 47
-#define PSI_T_FLOATVAL 48
-#define PSI_T_INTVAL 49
-#define PSI_T_BOOLVAL 50
-#define PSI_T_TO_ARRAY 51
-#define PSI_T_TO_STRING 52
-#define PSI_T_TO_INT 53
-#define PSI_T_TO_FLOAT 54
-#define PSI_T_TO_BOOL 55
-#define PSI_T_MIXED 56
-#define PSI_T_ARRAY 57
-#define PSI_T_POINTER 58
+#define PSI_T_BOOL 23
+#define PSI_T_INT 24
+#define PSI_T_FLOAT 25
+#define PSI_T_CONST 26
+#define PSI_T_NSNAME 27
+#define PSI_T_EQUALS 28
+#define PSI_T_TYPEDEF 29
+#define PSI_T_VOID 30
+#define PSI_T_LBRACKET 31
+#define PSI_T_RBRACKET 32
+#define PSI_T_COMMA 33
+#define PSI_T_ELLIPSIS 34
+#define PSI_T_CHAR 35
+#define PSI_T_SHORT 36
+#define PSI_T_LONG 37
+#define PSI_T_DOUBLE 38
+#define PSI_T_UNSIGNED 39
+#define PSI_T_SIGNED 40
+#define PSI_T_INT8 41
+#define PSI_T_UINT8 42
+#define PSI_T_INT16 43
+#define PSI_T_UINT16 44
+#define PSI_T_INT32 45
+#define PSI_T_UINT32 46
+#define PSI_T_INT64 47
+#define PSI_T_UINT64 48
+#define PSI_T_FUNCTION 49
+#define PSI_T_NULL 50
+#define PSI_T_TRUE 51
+#define PSI_T_FALSE 52
+#define PSI_T_DOLLAR 53
+#define PSI_T_CALLOC 54
+#define PSI_T_OBJVAL 55
+#define PSI_T_ARRVAL 56
+#define PSI_T_PATHVAL 57
+#define PSI_T_STRLEN 58
+#define PSI_T_STRVAL 59
+#define PSI_T_FLOATVAL 60
+#define PSI_T_INTVAL 61
+#define PSI_T_BOOLVAL 62
+#define PSI_T_TO_OBJECT 63
+#define PSI_T_TO_ARRAY 64
+#define PSI_T_TO_STRING 65
+#define PSI_T_TO_INT 66
+#define PSI_T_TO_FLOAT 67
+#define PSI_T_TO_BOOL 68
+#define PSI_T_MIXED 69
+#define PSI_T_ARRAY 70
+#define PSI_T_OBJECT 71
+#define PSI_T_AMPERSAND 72