flush

[m6w6/ext-psi] / src / parser.re

diff --git a/src/parser.re b/src/parser.re
index 58deda2234e214c6bf4e02a04974edae8bb29b5a..0eae9439b88c4f6f4f5b8fda20eec78d437a672c 100644 (file)
--- a/src/parser.re
+++ b/src/parser.re
@@ -30,8 +30,8 @@ PSI_Parser *PSI_ParserInit(PSI_Parser *P, const char *filename, psi_error_cb err
        }
        memset(P, 0, sizeof(*P));
 
+       P->psi.file.fn = strdup(filename);
        P->fp = fp;
-       P->fn = strdup(filename);
        P->line = 1;
        P->error = error;
        P->flags = flags;
@@ -201,21 +201,17 @@ token_t PSI_ParserScan(PSI_Parser *P)
                'MIXED' {RETURN(PSI_T_MIXED);}
                'VOID' {RETURN(PSI_T_VOID);}
                'BOOL' {RETURN(PSI_T_BOOL);}
-               'CHAR' {RETURN(PSI_T_CHAR);}
-               'SHORT' {RETURN(PSI_T_SHORT);}
                'INT' {RETURN(PSI_T_INT);}
-               'LONG' {RETURN(PSI_T_LONG);}
                'FLOAT' {RETURN(PSI_T_FLOAT);}
                'DOUBLE' {RETURN(PSI_T_DOUBLE);}
-               'SIZE_T' {RETURN(PSI_T_SIZE_T);}
-               'SINT8' {RETURN(PSI_T_SINT8);}
-               'UINT8' {RETURN(PSI_T_UINT8);}
-               'SINT16' {RETURN(PSI_T_SINT16);}
-               'UINT16' {RETURN(PSI_T_UINT16);}
-               'SINT32' {RETURN(PSI_T_SINT32);}
-               'UINT32' {RETURN(PSI_T_UINT32);}
-               'SINT64' {RETURN(PSI_T_SINT64);}
-               'UINT64' {RETURN(PSI_T_UINT64);}
+               'INT8_T' {RETURN(PSI_T_INT8);}
+               'UINT8_T' {RETURN(PSI_T_UINT8);}
+               'INT16_T' {RETURN(PSI_T_INT16);}
+               'UINT16_T' {RETURN(PSI_T_UINT16);}
+               'INT32_T' {RETURN(PSI_T_INT32);}
+               'UINT32_T' {RETURN(PSI_T_UINT32);}
+               'INT64_T' {RETURN(PSI_T_INT64);}
+               'UINT64_T' {RETURN(PSI_T_UINT64);}
                'STRING' {RETURN(PSI_T_STRING);}
                'ARRAY' {RETURN(PSI_T_ARRAY);}
                'FUNCTION' {RETURN(PSI_T_FUNCTION);}