From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 26 Feb 2021 10:33:41 +0000 (+0000)
Subject: parser: Remove hack to match beginning of line
X-Git-Tag: 0.9.28~1285^2~689
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f661015d1755fe9be6490e0b55b7d33a8098824d;p=pakfire.git

parser: Remove hack to match beginning of line

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

diff --git a/src/libpakfire/parser/scanner.l b/src/libpakfire/parser/scanner.l
index b2fd90d60..5b6ac0a7e 100644
--- a/src/libpakfire/parser/scanner.l
+++ b/src/libpakfire/parser/scanner.l
@@ -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++;