#define PSI_T_LIB 2
#define PSI_T_QUOTED_STRING 3
#define PSI_T_EOS 4
-#define PSI_T_TYPEDEF 5
+#define PSI_T_STRUCT 5
#define PSI_T_NAME 6
-#define PSI_T_LPAREN 7
-#define PSI_T_RPAREN 8
-#define PSI_T_COMMA 9
-#define PSI_T_VOID 10
-#define PSI_T_INT 11
-#define PSI_T_FLOAT 12
-#define PSI_T_DOUBLE 13
-#define PSI_T_SINT8 14
-#define PSI_T_UINT8 15
-#define PSI_T_SINT16 16
-#define PSI_T_UINT16 17
-#define PSI_T_SINT32 18
-#define PSI_T_UINT32 19
-#define PSI_T_SINT64 20
-#define PSI_T_UINT64 21
-#define PSI_T_LBRACE 22
-#define PSI_T_RBRACE 23
-#define PSI_T_FUNCTION 24
-#define PSI_T_NSNAME 25
-#define PSI_T_COLON 26
-#define PSI_T_NULL 27
-#define PSI_T_NUMBER 28
-#define PSI_T_TRUE 29
-#define PSI_T_FALSE 30
-#define PSI_T_DOLLAR 31
-#define PSI_T_REFERENCE 32
-#define PSI_T_EQUALS 33
-#define PSI_T_LET 34
-#define PSI_T_STRLEN 35
-#define PSI_T_STRVAL 36
-#define PSI_T_INTVAL 37
-#define PSI_T_FLOATVAL 38
-#define PSI_T_BOOLVAL 39
-#define PSI_T_SET 40
-#define PSI_T_TO_STRING 41
-#define PSI_T_TO_INT 42
-#define PSI_T_TO_FLOAT 43
-#define PSI_T_TO_BOOL 44
-#define PSI_T_RET 45
-#define PSI_T_MIXED 46
-#define PSI_T_BOOL 47
-#define PSI_T_STRING 48
-#define PSI_T_ARRAY 49
-#define PSI_T_POINTER 50
+#define PSI_T_LBRACE 7
+#define PSI_T_RBRACE 8
+#define PSI_T_BOOL 9
+#define PSI_T_INT 10
+#define PSI_T_FLOAT 11
+#define PSI_T_STRING 12
+#define PSI_T_CONST 13
+#define PSI_T_NSNAME 14
+#define PSI_T_EQUALS 15
+#define PSI_T_TYPEDEF 16
+#define PSI_T_LPAREN 17
+#define PSI_T_RPAREN 18
+#define PSI_T_LBRACKET 19
+#define PSI_T_NUMBER 20
+#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