-#define PSI_T_COMMENT 1
-#define PSI_T_LIB 2
-#define PSI_T_QUOTED_STRING 3
-#define PSI_T_EOS 4
-#define PSI_T_STRUCT 5
-#define PSI_T_NAME 6
+#define PSI_T_NAME 1
+#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_RBRACKET 21
#define PSI_T_COMMA 22
#define PSI_T_VOID 23
-#define PSI_T_CHAR 24
-#define PSI_T_SHORT 25
-#define PSI_T_LONG 26
-#define PSI_T_DOUBLE 27
-#define PSI_T_SINT8 28
-#define PSI_T_UINT8 29
-#define PSI_T_SINT16 30
-#define PSI_T_UINT16 31
-#define PSI_T_SINT32 32
-#define PSI_T_UINT32 33
-#define PSI_T_SINT64 34
-#define PSI_T_UINT64 35
-#define PSI_T_FUNCTION 36
-#define PSI_T_COLON 37
-#define PSI_T_REFERENCE 38
-#define PSI_T_NULL 39
-#define PSI_T_TRUE 40
-#define PSI_T_FALSE 41
-#define PSI_T_DOLLAR 42
-#define PSI_T_LET 43
-#define PSI_T_CALLOC 44
-#define PSI_T_STRLEN 45
-#define PSI_T_STRVAL 46
-#define PSI_T_INTVAL 47
-#define PSI_T_FLOATVAL 48
-#define PSI_T_BOOLVAL 49
-#define PSI_T_SET 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_RETURN 56
-#define PSI_T_FREE 57
-#define PSI_T_MIXED 58
-#define PSI_T_ARRAY 59
-#define PSI_T_POINTER 60
+#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