Lexer: Add UnfinishedComment error

NazaraEngine · Aug 3, 2023 · 8bfe9f6 · 8bfe9f6
1 parent a3b0e77
commit 8bfe9f6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/include/NZSL/Lang/ErrorList.hpp b/include/NZSL/Lang/ErrorList.hpp
@@ -27,6 +27,7 @@
 // Lexer errors
 NZSL_SHADERLANG_LEXER_ERROR(BadNumber, "bad number")
 NZSL_SHADERLANG_LEXER_ERROR(NumberOutOfRange, "number is out of range")
+NZSL_SHADERLANG_LEXER_ERROR(UnfinishedComment, "unfinished block comment")
 NZSL_SHADERLANG_LEXER_ERROR(UnfinishedString, "unfinished string")
 NZSL_SHADERLANG_LEXER_ERROR(UnrecognizedChar, "unrecognized character")
 NZSL_SHADERLANG_LEXER_ERROR(UnrecognizedToken, "unrecognized token")

diff --git a/src/NZSL/Lexer.cpp b/src/NZSL/Lexer.cpp
@@ -181,7 +181,7 @@ namespace nzsl
 					else if (next == '*')
 					{
 						// Block comment
-						do
+						for (;;)
 						{
 							currentPos++;
 							next = Peek();
@@ -196,8 +196,14 @@ namespace nzsl
 							}
 							else if (next == '\n')
 								HandleNewLine();
+							else if (next == '\0')
+							{
+								token.location.endColumn = token.location.startColumn + 1;
+								token.location.endLine = token.location.startLine;
+
+								throw LexerUnfinishedCommentError{ token.location };
+							}
 						}
-						while (next != '\0');
 					}
 					else if (next == '=')
 					{

diff --git a/tests/src/Tests/ErrorsTests.cpp b/tests/src/Tests/ErrorsTests.cpp
@@ -14,6 +14,16 @@ TEST_CASE("errors", "[Shader]")
 		CHECK_THROWS_WITH(nzsl::Tokenize("\"Hello world"), "(1,1 -> 13): LUnfinishedString error: unfinished string");
 		CHECK_THROWS_WITH(nzsl::Tokenize(R"("hello \p")"), "(1,1 -> 9): LUnrecognizedChar error: unrecognized character");
 		CHECK_THROWS_WITH(nzsl::Tokenize("$"), "(1, 1): LUnrecognizedToken error: unrecognized token");
+		CHECK_THROWS_WITH(nzsl::Tokenize(R"(
+[nzsl_version("1.0")]
+module;
+
+fn main()
+{/*
+	let x = 42.0;
+	return;
+}
+)"), "(6,2 -> 3): LUnfinishedComment error: unfinished block comment");
 	}
 
 	SECTION("Checking parser errors")