X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fparser_proc.h;h=344fdb9a9fdf9ceae2eb50124a3593a9639a0817;hb=8d2ff6a3b85203ea5f8398f846a7764fd0e1d126;hp=7fe90fd3c6acddfa4c16302bbad790c7e2201200;hpb=39831a9cf4a4aa9f126bc9a949f03ae232e3794b;p=m6w6%2Fext-psi

diff --git a/src/parser_proc.h b/src/parser_proc.h
index 7fe90fd..344fdb9 100644
--- a/src/parser_proc.h
+++ b/src/parser_proc.h
@@ -8,65 +8,69 @@
 #define PSI_T_SET                              8
 #define PSI_T_LET                              9
 #define PSI_T_RETURN                          10
-#define PSI_T_LIB                             11
-#define PSI_T_CHAR                            12
-#define PSI_T_SHORT                           13
-#define PSI_T_INT                             14
-#define PSI_T_LONG                            15
-#define PSI_T_SIGNED                          16
-#define PSI_T_UNSIGNED                        17
-#define PSI_T_EOF                             18
-#define PSI_T_QUOTED_STRING                   19
-#define PSI_T_EOS                             20
-#define PSI_T_STRUCT                          21
-#define PSI_T_LBRACE                          22
-#define PSI_T_RBRACE                          23
+#define PSI_T_CALLOC                          11
+#define PSI_T_LIB                             12
+#define PSI_T_STRING                          13
+#define PSI_T_EOF                             14
+#define PSI_T_EOS                             15
+#define PSI_T_QUOTED_STRING                   16
+#define PSI_T_ENUM                            17
+#define PSI_T_LBRACE                          18
+#define PSI_T_RBRACE                          19
+#define PSI_T_COMMA                           20
+#define PSI_T_EQUALS                          21
+#define PSI_T_UNION                           22
+#define PSI_T_STRUCT                          23
 #define PSI_T_COLON                           24
 #define PSI_T_LPAREN                          25
 #define PSI_T_NUMBER                          26
 #define PSI_T_RPAREN                          27
 #define PSI_T_BOOL                            28
-#define PSI_T_FLOAT                           29
-#define PSI_T_STRING                          30
+#define PSI_T_INT                             29
+#define PSI_T_FLOAT                           30
 #define PSI_T_CONST                           31
 #define PSI_T_NSNAME                          32
-#define PSI_T_EQUALS                          33
-#define PSI_T_TYPEDEF                         34
-#define PSI_T_VOID                            35
-#define PSI_T_LBRACKET                        36
-#define PSI_T_RBRACKET                        37
-#define PSI_T_COMMA                           38
-#define PSI_T_ELLIPSIS                        39
-#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_TYPEDEF                         33
+#define PSI_T_VOID                            34
+#define PSI_T_LBRACKET                        35
+#define PSI_T_RBRACKET                        36
+#define PSI_T_ELLIPSIS                        37
+#define PSI_T_CHAR                            38
+#define PSI_T_SHORT                           39
+#define PSI_T_LONG                            40
+#define PSI_T_DOUBLE                          41
+#define PSI_T_UNSIGNED                        42
+#define PSI_T_SIGNED                          43
+#define PSI_T_INT8                            44
+#define PSI_T_UINT8                           45
+#define PSI_T_INT16                           46
+#define PSI_T_UINT16                          47
+#define PSI_T_INT32                           48
+#define PSI_T_UINT32                          49
+#define PSI_T_INT64                           50
+#define PSI_T_UINT64                          51
+#define PSI_T_FUNCTION                        52
+#define PSI_T_NULL                            53
+#define PSI_T_TRUE                            54
+#define PSI_T_FALSE                           55
+#define PSI_T_DOLLAR_NAME                     56
+#define PSI_T_OBJVAL                          57
+#define PSI_T_ARRVAL                          58
+#define PSI_T_PATHVAL                         59
+#define PSI_T_STRLEN                          60
+#define PSI_T_STRVAL                          61
+#define PSI_T_FLOATVAL                        62
+#define PSI_T_INTVAL                          63
+#define PSI_T_BOOLVAL                         64
+#define PSI_T_CALLBACK                        65
+#define PSI_T_TO_OBJECT                       66
+#define PSI_T_TO_ARRAY                        67
+#define PSI_T_TO_STRING                       68
+#define PSI_T_TO_INT                          69
+#define PSI_T_TO_FLOAT                        70
+#define PSI_T_TO_BOOL                         71
+#define PSI_T_MIXED                           72
+#define PSI_T_ARRAY                           73
+#define PSI_T_OBJECT                          74
+#define PSI_T_CALLABLE                        75
+#define PSI_T_AMPERSAND                       76