From dbf8332bf0aa136ba80a3d9db77d040696db9a21 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Sat, 13 Aug 2016 12:21:16 +0200
Subject: [PATCH] Fixed a small bug where two line number directives next to
 each other wouldn't be parsed properly (the second one would be treated as
 Modula-2 syntax).

---
 lang/m2/comp/LLlex.c | 78 +++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/lang/m2/comp/LLlex.c b/lang/m2/comp/LLlex.c
index c118e997a..1eacae76f 100644
--- a/lang/m2/comp/LLlex.c
+++ b/lang/m2/comp/LLlex.c
@@ -188,55 +188,57 @@ CheckForLineDirective()
 	register char	*c = buf;
 
 
-	if (ch != '#') {
-		PushBack();
-		return;
-	}
-	do {	/*
-		 * Skip to next digit
-		 * Do not skip newlines
-		 */
-		ch = getch();
-		if (class(ch) == STNL || class(ch) == STEOI) {
-			LineNumber++;
-			error(s_error);
+	for (;;) {
+		if (ch != '#') {
+			PushBack();
 			return;
 		}
-	} while (class(ch) != STNUM);
-	while (class(ch) == STNUM)  {
-		i = i*10 + (ch - '0');
-		ch = getch();
-	}
-	while (ch != '"' && class(ch) != STNL && class(ch) != STEOI)
-		ch = getch();
-	if (ch == '"') {
-		c = buf;
-		do {
+		do {	/*
+			 * Skip to next digit
+			 * Do not skip newlines
+			 */
 			ch = getch();
-			if (c < &buf[IDFSIZE]) *c++ = ch;
 			if (class(ch) == STNL || class(ch) == STEOI) {
 				LineNumber++;
 				error(s_error);
 				return;
 			}
-		} while (ch != '"');
-		*--c = '\0';
-		do {
+		} while (class(ch) != STNUM);
+		while (class(ch) == STNUM)  {
+			i = i*10 + (ch - '0');
 			ch = getch();
-		} while (class(ch) != STNL && class(ch) != STEOI);
-		/*
-		 * Remember the file name
-		 */
-		if (class(ch) == STNL && strcmp(FileName,buf)) {
-			FileName = Salloc(buf,(unsigned) strlen(buf) + 1);
-			WorkingDir = getwdir(FileName);
 		}
+		while (ch != '"' && class(ch) != STNL && class(ch) != STEOI)
+			ch = getch();
+		if (ch == '"') {
+			c = buf;
+			do {
+				ch = getch();
+				if (c < &buf[IDFSIZE]) *c++ = ch;
+				if (class(ch) == STNL || class(ch) == STEOI) {
+					LineNumber++;
+					error(s_error);
+					return;
+				}
+			} while (ch != '"');
+			*--c = '\0';
+			do {
+				ch = getch();
+			} while (class(ch) != STNL && class(ch) != STEOI);
+			/*
+			 * Remember the file name
+			 */
+			if (class(ch) == STNL && strcmp(FileName,buf)) {
+				FileName = Salloc(buf,(unsigned) strlen(buf) + 1);
+				WorkingDir = getwdir(FileName);
+			}
+		}
+		if (class(ch) == STEOI) {
+			error(s_error);
+			return;
+		}
+		LineNumber = i;
 	}
-	if (class(ch) == STEOI) {
-		error(s_error);
-		return;
-	}
-	LineNumber = i;
 }
 
 STATIC
-- 
2.34.1