-#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
+#define PSI_T_CHAR 40
+#define PSI_T_SHORT 41
+#define PSI_T_LONG 42
+#define PSI_T_DOUBLE 43
+#define PSI_T_UNSIGNED 44
+#define PSI_T_SIGNED 45
+#define PSI_T_INT8 46
+#define PSI_T_UINT8 47
+#define PSI_T_INT16 48
+#define PSI_T_UINT16 49
+#define PSI_T_INT32 50
+#define PSI_T_UINT32 51
+#define PSI_T_INT64 52
+#define PSI_T_UINT64 53
+#define PSI_T_FUNCTION 54
+#define PSI_T_NULL 55
+#define PSI_T_TRUE 56
+#define PSI_T_FALSE 57
+#define PSI_T_DOLLAR_NAME 58
+#define PSI_T_OBJVAL 59
+#define PSI_T_ARRVAL 60
+#define PSI_T_PATHVAL 61
+#define PSI_T_STRLEN 62
+#define PSI_T_STRVAL 63
+#define PSI_T_FLOATVAL 64
+#define PSI_T_INTVAL 65
+#define PSI_T_BOOLVAL 66
+#define PSI_T_TO_OBJECT 67
+#define PSI_T_TO_ARRAY 68
+#define PSI_T_TO_STRING 69
+#define PSI_T_TO_INT 70
+#define PSI_T_TO_FLOAT 71
+#define PSI_T_TO_BOOL 72
+#define PSI_T_MIXED 73
+#define PSI_T_ARRAY 74
+#define PSI_T_OBJECT 75
+#define PSI_T_CALLABLE 76
+#define PSI_T_AMPERSAND 77