]> git.ipfire.org Git - pakfire.git/commitdiff
libpakfire: parser: assignments and block assigments are the same thing
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 11 Mar 2019 10:02:07 +0000 (10:02 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 11 Mar 2019 10:02:07 +0000 (10:02 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/parser/grammar.y

index c380f75c4839cb1e951e8ef95d61cdb45480f036..0288a9c0984b68f4fbfd34073e0a4b3d2f150c1b 100644 (file)
@@ -153,7 +153,6 @@ block                                               : block_opening assignments block_closing;
 
 assignments                                    : assignments assignment
                                                        | assignments empty
-                                                       | assignments block_assignment
                                                        | /* empty */
                                                        ;
 
@@ -162,9 +161,8 @@ assignment                                  : whitespace variable whitespace ASSIGN whitespace value whitespa
                                                                int r = pakfire_parser_add_declaration($2, $6);
                                                                if (r < 0)
                                                                        ABORT;
-                                                       };
-
-block_assignment                       : whitespace DEFINE WHITESPACE variable NEWLINE text whitespace END NEWLINE
+                                                       }
+                                                       | whitespace DEFINE WHITESPACE variable NEWLINE text whitespace END NEWLINE
                                                        {
                                                                int r = pakfire_parser_add_declaration($4, $6);
                                                                if (r < 0)