-#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_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_SIZE_T 28
-#define PSI_T_SINT8 29
-#define PSI_T_UINT8 30
-#define PSI_T_SINT16 31
-#define PSI_T_UINT16 32
-#define PSI_T_SINT32 33
-#define PSI_T_UINT32 34
-#define PSI_T_SINT64 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_LET 44
-#define PSI_T_CALLOC 45
-#define PSI_T_STRLEN 46
-#define PSI_T_STRVAL 47
-#define PSI_T_INTVAL 48
-#define PSI_T_FLOATVAL 49
-#define PSI_T_BOOLVAL 50
+#define PSI_T_NAME 1
+#define PSI_T_PLUS 2
+#define PSI_T_MINUS 3
+#define PSI_T_SLASH 4
+#define PSI_T_ASTERISK 5
+#define PSI_T_FREE 6
+#define PSI_T_SET 7
+#define PSI_T_LET 8
+#define PSI_T_RETURN 9
+#define PSI_T_LIB 10
+#define PSI_T_INT 11
+#define PSI_T_UNSIGNED 12
+#define PSI_T_EOF 13
+#define PSI_T_QUOTED_STRING 14
+#define PSI_T_EOS 15
+#define PSI_T_STRUCT 16
+#define PSI_T_LBRACE 17
+#define PSI_T_RBRACE 18
+#define PSI_T_COLON 19
+#define PSI_T_LPAREN 20
+#define PSI_T_NUMBER 21
+#define PSI_T_RPAREN 22
+#define PSI_T_BOOL 23
+#define PSI_T_FLOAT 24
+#define PSI_T_STRING 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_DOUBLE 34
+#define PSI_T_INT8 35
+#define PSI_T_UINT8 36
+#define PSI_T_INT16 37
+#define PSI_T_UINT16 38
+#define PSI_T_INT32 39
+#define PSI_T_UINT32 40
+#define PSI_T_INT64 41
+#define PSI_T_UINT64 42
+#define PSI_T_FUNCTION 43
+#define PSI_T_AMPERSAND 44
+#define PSI_T_NULL 45
+#define PSI_T_TRUE 46
+#define PSI_T_FALSE 47
+#define PSI_T_DOLLAR 48
+#define PSI_T_CALLOC 49
+#define PSI_T_OBJVAL 50
#define PSI_T_ARRVAL 51
-#define PSI_T_SET 52
-#define PSI_T_TO_ARRAY 53
-#define PSI_T_TO_STRING 54
-#define PSI_T_TO_INT 55
-#define PSI_T_TO_FLOAT 56
-#define PSI_T_TO_BOOL 57
-#define PSI_T_RETURN 58
-#define PSI_T_FREE 59
-#define PSI_T_MIXED 60
-#define PSI_T_ARRAY 61
-#define PSI_T_POINTER 62
+#define PSI_T_PATHVAL 52
+#define PSI_T_STRLEN 53
+#define PSI_T_STRVAL 54
+#define PSI_T_FLOATVAL 55
+#define PSI_T_INTVAL 56
+#define PSI_T_BOOLVAL 57
+#define PSI_T_TO_OBJECT 58
+#define PSI_T_TO_ARRAY 59
+#define PSI_T_TO_STRING 60
+#define PSI_T_TO_INT 61
+#define PSI_T_TO_FLOAT 62
+#define PSI_T_TO_BOOL 63
+#define PSI_T_MIXED 64
+#define PSI_T_ARRAY 65
+#define PSI_T_OBJECT 66