X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc.y;h=81a013ceecb7f2e899d31b6feece3b6b0434f3a8;hp=b606cf0ab7547d57640004f3dfdaea4934562c2c;hb=7e4c03791c729bce5ebe6226a72786191bc67f8f;hpb=0aa69939e1a89ad7647ee853a742b8b7cc37f75f

diff --git a/src/parser_proc.y b/src/parser_proc.y
index b606cf0..81a013c 100644
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -15,7 +15,7 @@
 %extra_argument {PSI_Parser *P}
 /* TOKEN is defined inside syntax_error */
 %syntax_error {
-	PSI_ParserSyntaxError(P, P->fn, P->line, "Unexpected token '%s'", TOKEN->text);
+	PSI_ParserSyntaxError(P, P->psi.file.fn, P->line, "Unexpected token '%s'", TOKEN->text);
 }
 
 %nonassoc NAME.
@@ -28,10 +28,10 @@ blocks ::= blocks block.
 block ::= COMMENT.
 
 block ::= LIB(T) QUOTED_STRING(libname) EOS. {
-	if (P->lib) {
-		PSI_ParserSyntaxError(P, P->fn, T->line, "Extra 'lib %s' statement has no effect", libname->text);
+	if (P->psi.file.ln) {
+		PSI_ParserSyntaxError(P, P->psi.file.ln, T->line, "Extra 'lib %s' statement has no effect", libname->text);
 	} else {
-		P->lib = strndup(libname->text + 1, libname->size - 2);
+		P->psi.file.ln = strndup(libname->text + 1, libname->size - 2);
 	}
 	free(libname);
 	free(T);
@@ -179,22 +179,6 @@ decl_type(type_) ::= VOID(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
-decl_type(type_) ::= CHAR(T). {
-	type_ = init_decl_type(T->type, T->text);
-	free(T);
-}
-decl_type(type_) ::= SHORT(T). {
-	type_ = init_decl_type(T->type, T->text);
-	free(T);
-}
-decl_type(type_) ::= INT(T). {
-	type_ = init_decl_type(T->type, T->text);
-	free(T);
-}
-decl_type(type_) ::= LONG(T). {
-	type_ = init_decl_type(T->type, T->text);
-	free(T);
-}
 decl_type(type_) ::= FLOAT(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
@@ -203,8 +187,9 @@ decl_type(type_) ::= DOUBLE(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
-decl_type(type_) ::= SIZE_T(T). {
-	type_ = init_decl_type(T->type, T->text);
+/* we have to support plain int here because we have it in our lexer rules */
+decl_type(type_) ::= INT(T). {
+	type_ = init_decl_type(PSI_T_NAME, T->text);
 	free(T);
 }
 decl_type(type_) ::= INT8(T). {