]> git.ipfire.org Git - pakfire.git/commitdiff
libpakfire: parser: Use end rule for closing blocks
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 29 Apr 2019 22:22:29 +0000 (23:22 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 29 Apr 2019 22:22:29 +0000 (23:22 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/parser/grammar.y

index ead88d59782d46236c78d1bc546b7f95a36338bd..00eedc25c20ea702d87249a1198cef8ec8870633 100644 (file)
@@ -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) {