X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Fparser_proc_grammar.y;h=38194e9764131f0cc9b12728e0bff65b8caf5b50;hb=e42201d972c98549b7d5edfaf4a89e2aac101afe;hp=a32600fec0b63f883a304b36fe9d1f9ff4b14bd8;hpb=b282753558305fe44bd0d268833e131e5ccf82e8;p=m6w6%2Fext-psi

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index a32600f..38194e9 100644
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -456,12 +456,8 @@ block:
 	}
 }
 |	lib {
-	if (P->file.ln) {
-		P->error(PSI_DATA(P), $lib, PSI_WARNING,
-				"Extra 'lib \"%s\"' statement has no effect", $lib->text);
-	} else {
-		P->file.ln = strndup($lib->text, $lib->size);
-	}
+	char *libname = strdup($lib->text);
+	P->file.libnames = psi_plist_add(P->file.libnames, &libname);
 }
 |	constant {
 	psi_parser_proc_add_const(P, $constant);
@@ -1115,9 +1111,10 @@ decl_extvar_stmt[list]:
 			if (psi_decl_extvar_is_blacklisted(var->name)) {
 				psi_decl_var_free(&var);
 			} else {
-				list = psi_plist_add(list, psi_decl_extvar_init(
-					psi_decl_arg_init(psi_decl_type_copy($decl_arg->type), var)));
-				}
+				struct psi_decl_extvar *evar = psi_decl_extvar_init(
+					psi_decl_arg_init(psi_decl_type_copy($decl_arg->type), var));
+				list = psi_plist_add(list, &evar);
+			}
 		}
 		free($vars);
 	}
@@ -1152,20 +1149,20 @@ decl_vars[vars]:
 ;
 
 ignored_decl:
-	STATIC decl_body ignored_decl_body {
-	$ignored_decl = $decl_body;
-}
-|	STATIC CPP_INLINE decl_body ignored_decl_body {
-	$ignored_decl = $decl_body;
-}
-|	CPP_INLINE decl_body ignored_decl_body {
-	$ignored_decl = $decl_body;
-}
-|	NAME CPP_INLINE decl_body ignored_decl_body {
+	ignored_decl_qualifiers decl_body ignored_decl_body {
 	$ignored_decl = $decl_body;
 }
 ;
 
+ignored_decl_qualifiers:
+	STATIC
+|	STATIC CPP_INLINE
+|	CPP_EXTENSION CPP_INLINE
+|	CPP_EXTENSION STATIC CPP_INLINE
+|	CPP_INLINE
+|	NAME CPP_INLINE
+;
+
 ignored_decl_body:
 	LBRACE ignored_decl_body_stmts RBRACE
 ;