-#define PSI_T_INT 12
-#define PSI_T_UNSIGNED 13
-#define PSI_T_EOF 14
-#define PSI_T_QUOTED_STRING 15
-#define PSI_T_EOS 16
-#define PSI_T_STRUCT 17
-#define PSI_T_LBRACE 18
-#define PSI_T_RBRACE 19
-#define PSI_T_COLON 20
-#define PSI_T_LPAREN 21
-#define PSI_T_NUMBER 22
-#define PSI_T_RPAREN 23
-#define PSI_T_BOOL 24
-#define PSI_T_FLOAT 25
-#define PSI_T_STRING 26
-#define PSI_T_CONST 27
-#define PSI_T_NSNAME 28
-#define PSI_T_EQUALS 29
-#define PSI_T_TYPEDEF 30
-#define PSI_T_VOID 31
-#define PSI_T_LBRACKET 32
-#define PSI_T_RBRACKET 33
-#define PSI_T_COMMA 34
-#define PSI_T_ELLIPSIS 35
-#define PSI_T_DOUBLE 36
-#define PSI_T_INT8 37
-#define PSI_T_UINT8 38
-#define PSI_T_INT16 39
-#define PSI_T_UINT16 40
-#define PSI_T_INT32 41
-#define PSI_T_UINT32 42
-#define PSI_T_INT64 43
-#define PSI_T_UINT64 44
-#define PSI_T_FUNCTION 45
-#define PSI_T_NULL 46
-#define PSI_T_TRUE 47
-#define PSI_T_FALSE 48
-#define PSI_T_DOLLAR 49
-#define PSI_T_CALLOC 50
-#define PSI_T_OBJVAL 51
-#define PSI_T_ARRVAL 52
-#define PSI_T_PATHVAL 53
-#define PSI_T_STRLEN 54
-#define PSI_T_STRVAL 55
-#define PSI_T_FLOATVAL 56
-#define PSI_T_INTVAL 57
-#define PSI_T_BOOLVAL 58
-#define PSI_T_TO_OBJECT 59
-#define PSI_T_TO_ARRAY 60
-#define PSI_T_TO_STRING 61
-#define PSI_T_TO_INT 62
-#define PSI_T_TO_FLOAT 63
-#define PSI_T_TO_BOOL 64
-#define PSI_T_MIXED 65
-#define PSI_T_ARRAY 66
-#define PSI_T_OBJECT 67
-#define PSI_T_AMPERSAND 68
+#define PSI_T_CHAR 12
+#define PSI_T_SHORT 13
+#define PSI_T_INT 14
+#define PSI_T_LONG 15
+#define PSI_T_SIGNED 16
+#define PSI_T_UNSIGNED 17
+#define PSI_T_EOF 18
+#define PSI_T_QUOTED_STRING 19
+#define PSI_T_EOS 20
+#define PSI_T_STRUCT 21
+#define PSI_T_LBRACE 22
+#define PSI_T_RBRACE 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_FLOAT 29
+#define PSI_T_STRING 30
+#define PSI_T_CONST 31
+#define PSI_T_NSNAME 32
+#define PSI_T_EQUALS 33
+#define PSI_T_TYPEDEF 34
+#define PSI_T_VOID 35
+#define PSI_T_LBRACKET 36
+#define PSI_T_RBRACKET 37
+#define PSI_T_COMMA 38
+#define PSI_T_ELLIPSIS 39
+#define PSI_T_DOUBLE 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