lexer: Fixed extreme error spam when triggering lexer error

WerWolv · Feb 7, 2025 · c6c63d8 · c6c63d8
1 parent 52860ff
commit c6c63d8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/source/pl/core/lexer.cpp b/lib/source/pl/core/lexer.cpp
@@ -482,7 +482,7 @@ namespace pl::core {
 
         m_tokens.clear();
 
-        while(this->m_cursor < end) {
+        while (this->m_cursor < end) {
             const char& c = this->m_sourceCode[this->m_cursor];
 
             if (c == '\x00') {
@@ -644,6 +644,9 @@ namespace pl::core {
             } else {
                 m_errorLength = 1;
                 error("Unexpected character: {}", c);
+                m_cursor++;
+
+                break;
             }
 
             m_cursor++;

diff --git a/lib/source/pl/core/preprocessor.cpp b/lib/source/pl/core/preprocessor.cpp
@@ -579,9 +579,11 @@ namespace pl::core {
             m_result = std::move(result.value());
         else
             return { std::nullopt, errors };
-        if (!errors.empty())
+        if (!errors.empty()) {
             for (auto &item: errors)
                 this->error(item);
+            return { m_output, collectErrors() };
+        }
 
         m_token = m_result.begin();
         m_initialized = true;