X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.re;h=0922ba1b0f23f6ceb3debb4b9ffbe8c058aa77ae;hp=69e76c8f124244f9c7920844569dfa5da11c3a80;hb=7e4b0ccdd2123647b6fff8065c0abc61be3fb44d;hpb=e16c15d5936c3b57b05e49570fb9526920de8188

diff --git a/src/parser.re b/src/parser.re
index 69e76c8..0922ba1 100644
--- a/src/parser.re
+++ b/src/parser.re
@@ -1,3 +1,4 @@
+#include <stddef.h>
 #include <stdio.h>
 #include <assert.h>
 
@@ -47,20 +48,6 @@ PSI_Parser *PSI_ParserInit(PSI_Parser *P, const char *filename, psi_error_cb err
 	return P;
 }
 
-void PSI_ParserSyntaxError(PSI_Parser *P, const char *fn, size_t ln, const char *msg, ...) {
-	char buf[0x1000] = {0};
-	va_list argv;
-
-	va_start(argv, msg);
-	vsnprintf(buf, 0x1000-1, msg, argv);
-	va_end(argv);
-
-	P->error(PSI_WARNING, "PSI syntax error on line %zu in '%s'%s%s",
-			ln, fn, msg ? ": ": "", buf);
-
-	++P->errors;
-}
-
 size_t PSI_ParserFill(PSI_Parser *P, size_t n)
 {
 	if (P->flags & PSI_PARSER_DEBUG) {
@@ -214,7 +201,7 @@ void PSI_ParserFree(PSI_Parser **P)
 #define RETURN(t) do { \
 	P->num = t; \
 	if (P->flags & PSI_PARSER_DEBUG) { \
-		fprintf(stderr, "PSI> TOKEN: %d %.*s (EOF=%d %s:%zu:%zu)\n", \
+		fprintf(stderr, "PSI> TOKEN: %d %.*s (EOF=%d %s:%u:%u)\n", \
 				P->num, (int) (P->cur-P->tok), P->tok, P->num == PSI_T_EOF, \
 				P->psi.file.fn, P->line, P->col); \
 	} \
@@ -277,7 +264,10 @@ 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);}
 		'INT8_T' {RETURN(PSI_T_INT8);}
@@ -289,6 +279,7 @@ token_t PSI_ParserScan(PSI_Parser *P)
 		'INT64_T' {RETURN(PSI_T_INT64);}
 		'UINT64_T' {RETURN(PSI_T_UINT64);}
 		'UNSIGNED' {RETURN(PSI_T_UNSIGNED);}
+		'SIGNED' {RETURN(PSI_T_SIGNED);}
 		'STRING' {RETURN(PSI_T_STRING);}
 		'ARRAY' {RETURN(PSI_T_ARRAY);}
 		'OBJECT' {RETURN(PSI_T_OBJECT);}