]> git.ipfire.org Git - pakfire.git/commitdiff
parser: Remove hack to match beginning of line
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Feb 2021 10:33:41 +0000 (10:33 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Feb 2021 10:33:41 +0000 (10:33 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/parser/scanner.l

index b2fd90d60e65cf3c524fa906bc491a5af668c108..5b6ac0a7ee4e606683ccca80c7d4b2b3a2bc0701 100644 (file)
@@ -149,12 +149,7 @@ scriptlet                          script(let)?
                                                        abort();
                                                }
 
-{subparsers}$                  {
-                                                       // Hack because we cannot use ^ after calling yyless()
-                                                       // in the INDENT stage.
-                                                       if (current_indent > 0)
-                                                               REJECT;
-
+^{subparsers}$                 {
                                                        yylval.string = strdup(yytext);
 
                                                        return T_SUBPARSER;
@@ -257,6 +252,10 @@ scriptlet                          script(let)?
                                                        // Put the read character back for the next round
                                                        yyless(0);
 
+                                                       // Mark beginning of line to match ^
+                                                       if (current_indent == 0)
+                                                               yy_set_bol(1);
+
                                                        // --> - More indentation?
                                                        if (current_indent > indent_level) {
                                                                indent_level++;