From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 29 Apr 2019 22:22:29 +0000 (+0100)
Subject: libpakfire: parser: Use end rule for closing blocks
X-Git-Tag: 0.9.28~1285^2~1041
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bbc227345dfe8e266cdc9c13b66b1a88fa335bc;p=pakfire.git

libpakfire: parser: Use end rule for closing blocks

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

diff --git a/src/libpakfire/parser/grammar.y b/src/libpakfire/parser/grammar.y
index ead88d597..00eedc25c 100644
--- a/src/libpakfire/parser/grammar.y
+++ b/src/libpakfire/parser/grammar.y
@@ -147,6 +147,8 @@ text						: text line
 							| line
 							;
 
+end							: T_END T_EOL;
+
 if_stmt						: T_IF T_WORD T_EQUALS T_WORD T_EOL block_assignments end
 							{
 								printf("IF STATEMENT NOT EVALUATED, YET: %s %s\n", $2, $4);
@@ -157,7 +159,7 @@ block_opening				: variable T_EOL
 								current_block = pakfire_strdup($1);
 							};
 
-block_closing				: T_END T_EOL
+block_closing				: end
 							{
 								pakfire_free(current_block);
 								current_block = NULL;
@@ -200,8 +202,6 @@ define						: T_DEFINE variable T_EOL
 								$$ = $1;
 							};
 
-end							: T_END T_EOL;
-
 %%
 
 static void cleanup(void) {