From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 14 Mar 2019 04:56:35 +0000 (+0000)
Subject: libpakfire: parser: Make define optional
X-Git-Tag: 0.9.28~1285^2~1064
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acca4e2ef894f3e446c6d0fd499c02b2a2a53692;p=pakfire.git

libpakfire: parser: Make define optional

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/parser/grammar.y b/src/libpakfire/parser/grammar.y
index fd5535bb8..7ffded0af 100644
--- a/src/libpakfire/parser/grammar.y
+++ b/src/libpakfire/parser/grammar.y
@@ -67,6 +67,7 @@ char* current_block = NULL;
 %token WHITESPACE
 %token <string>					WORD
 
+%type <string>					define;
 %type <string>					line;
 %type <string>					text;
 %type <string>					variable;
@@ -168,14 +169,23 @@ assignment					: variable ASSIGN value NEWLINE
 								if (r < 0)
 									ABORT;
 							}
-							| define WHITESPACE variable NEWLINE text whitespace END NEWLINE
+							| define text end
 							{
-								int r = pakfire_parser_add_declaration(pakfire, declarations, $3, $5);
+								int r = pakfire_parser_add_declaration(pakfire, declarations, $1, $2);
 								if (r < 0)
 									ABORT;
 							}
 
-define						: whitespace DEFINE;
+define						: whitespace DEFINE WHITESPACE variable NEWLINE
+							{
+								$$ = $4;
+							}
+							| whitespace variable NEWLINE
+							{
+								$$ = $2;
+							};
+
+end							: whitespace END NEWLINE;
 
 %%