#define PSI_T_NAME 1
-#define PSI_T_FREE 2
-#define PSI_T_SET 3
-#define PSI_T_LET 4
-#define PSI_T_RETURN 5
-#define PSI_T_LIB 6
-#define PSI_T_INT 7
-#define PSI_T_UNSIGNED 8
-#define PSI_T_EOF 9
-#define PSI_T_QUOTED_STRING 10
-#define PSI_T_EOS 11
-#define PSI_T_STRUCT 12
-#define PSI_T_LBRACE 13
-#define PSI_T_RBRACE 14
-#define PSI_T_COLON 15
-#define PSI_T_LPAREN 16
-#define PSI_T_NUMBER 17
-#define PSI_T_RPAREN 18
-#define PSI_T_BOOL 19
-#define PSI_T_FLOAT 20
-#define PSI_T_STRING 21
-#define PSI_T_CONST 22
-#define PSI_T_NSNAME 23
-#define PSI_T_EQUALS 24
-#define PSI_T_TYPEDEF 25
-#define PSI_T_VOID 26
-#define PSI_T_LBRACKET 27
-#define PSI_T_RBRACKET 28
-#define PSI_T_COMMA 29
-#define PSI_T_DOUBLE 30
-#define PSI_T_INT8 31
-#define PSI_T_UINT8 32
-#define PSI_T_INT16 33
-#define PSI_T_UINT16 34
-#define PSI_T_INT32 35
-#define PSI_T_UINT32 36
-#define PSI_T_INT64 37
-#define PSI_T_UINT64 38
-#define PSI_T_FUNCTION 39
-#define PSI_T_REFERENCE 40
-#define PSI_T_NULL 41
-#define PSI_T_TRUE 42
-#define PSI_T_FALSE 43
-#define PSI_T_DOLLAR 44
-#define PSI_T_CALLOC 45
-#define PSI_T_ARRVAL 46
-#define PSI_T_STRLEN 47
-#define PSI_T_STRVAL 48
-#define PSI_T_FLOATVAL 49
-#define PSI_T_INTVAL 50
-#define PSI_T_BOOLVAL 51
-#define PSI_T_TO_ARRAY 52
-#define PSI_T_TO_STRING 53
-#define PSI_T_TO_INT 54
-#define PSI_T_TO_FLOAT 55
-#define PSI_T_TO_BOOL 56
-#define PSI_T_MIXED 57
-#define PSI_T_ARRAY 58
-#define PSI_T_POINTER 59
+#define PSI_T_PLUS 2
+#define PSI_T_MINUS 3
+#define PSI_T_SLASH 4
+#define PSI_T_ASTERISK 5
+#define PSI_T_TEMP 6
+#define PSI_T_FREE 7
+#define PSI_T_SET 8
+#define PSI_T_LET 9
+#define PSI_T_RETURN 10
+#define PSI_T_LIB 11
+#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