X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.re;h=0eae9439b88c4f6f4f5b8fda20eec78d437a672c;hp=0782b8fe3a09d88e841e7e4a39f16ff9beda71b8;hb=d560a27ff8431c678d25ecf4d8190b562a766f41;hpb=0aa69939e1a89ad7647ee853a742b8b7cc37f75f

diff --git a/src/parser.re b/src/parser.re
index 0782b8f..0eae943 100644
--- 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;
@@ -204,13 +204,13 @@ token_t PSI_ParserScan(PSI_Parser *P)
 		'INT' {RETURN(PSI_T_INT);}
 		'FLOAT' {RETURN(PSI_T_FLOAT);}
 		'DOUBLE' {RETURN(PSI_T_DOUBLE);}
-		'INT8_T' {RETURN(PSI_T_SINT8);}
+		'INT8_T' {RETURN(PSI_T_INT8);}
 		'UINT8_T' {RETURN(PSI_T_UINT8);}
-		'INT16_T' {RETURN(PSI_T_SINT16);}
+		'INT16_T' {RETURN(PSI_T_INT16);}
 		'UINT16_T' {RETURN(PSI_T_UINT16);}
-		'INT32_T' {RETURN(PSI_T_SINT32);}
+		'INT32_T' {RETURN(PSI_T_INT32);}
 		'UINT32_T' {RETURN(PSI_T_UINT32);}
-		'INT64_T' {RETURN(PSI_T_SINT64);}
+		'INT64_T' {RETURN(PSI_T_INT64);}
 		'UINT64_T' {RETURN(PSI_T_UINT64);}
 		'STRING' {RETURN(PSI_T_STRING);}
 		'ARRAY' {RETURN(PSI_T_ARRAY);}