From eef5e1b498cd0739246b9a39b440503cf3eaa7f8 Mon Sep 17 00:00:00 2001
From: Christoffer Lerno <christoffer@aegik.com>
Date: Fri, 3 Dec 2021 00:48:12 +0100
Subject: [PATCH] Fix detection of EOF and \n in string.

---
 src/compiler/lexer.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/compiler/lexer.c b/src/compiler/lexer.c
index b61529c4b..609fa96d7 100644
--- a/src/compiler/lexer.c
+++ b/src/compiler/lexer.c
@@ -1084,10 +1084,15 @@ static inline bool scan_string(Lexer *lexer)
 	{
 		return scan_multiline_string(lexer);
 	}
-	char c;
+	char c = 0;
 	const char *current = lexer->current;
-	while ((c = *(current++)) != '"' && c != '\n' && c != '\0')
+	while ((c = *(current++)) != '"')
 	{
+		if (c == '\n' || c == '\0')
+		{
+			current++;
+			break;
+		}
 		if (c == '\\' && *current == '"')
 		{
 			current++;
@@ -1102,6 +1107,7 @@ static inline bool scan_string(Lexer *lexer)
 		c = next(lexer);
 		if (c == '\0' || (c == '\\' && peek(lexer) == '\0'))
 		{
+			if (c == '\0') backtrack(lexer);
 			add_error_token_at(lexer, lexer->current - 1, 1, "The end of the file was reached "
 			                                                 "while parsing the string. "
 			                                                 "Did you forget (or accidentally add) a '\"' somewhere?");