preprocessor/lexer: improve lexer and preprocessor and add length to …

…locations
WerWolv · Nov 12, 2023 · 13c07e7 · 13c07e7
1 parent 867f039
commit 13c07e7
Show file tree

Hide file tree

Showing 9 changed files with 155 additions and 131 deletions.
diff --git a/lib/include/pl/core/lexer.hpp b/lib/include/pl/core/lexer.hpp
@@ -39,7 +39,8 @@ namespace pl::core {
         std::optional<double> parseFloatingPoint(std::string_view literal, char suffix);
         std::optional<u128> parseInteger(std::string_view literal);
 
-        Token makeToken(const Token& token);
+        Token makeToken(const Token& token, size_t length = 1);
+        static Token makeTokenAt(const Token& token, Location& location, size_t length = 1);
         void addToken(const Token& token);
 
         std::string m_sourceCode;

diff --git a/lib/include/pl/core/location.hpp b/lib/include/pl/core/location.hpp
@@ -14,11 +14,12 @@ namespace pl::core {
 
         api::Source* source;
         u32 line, column;
+        size_t length;
 
     };
 
     static constexpr api::Source* EmptySource = nullptr;
-    static constexpr Location EmptyLocation = { EmptySource, 0, 0 };
+    static constexpr Location EmptyLocation = { EmptySource, 0, 0, 0 };
     static constexpr std::string DefaultSource = "<Source Code>";
 
 }
diff --git a/lib/include/pl/pattern_language.hpp b/lib/include/pl/pattern_language.hpp
@@ -200,7 +200,7 @@ namespace pl {
          * @brief Sets the console log callback
          * @param callback Callback to call
          */
-        void setLogCallback(const core::LogConsole::Callback &callback);
+        void setLogCallback(const core::LogConsole::Callback &callback) const;
 
         /**
          * @brief Gets the error that occurred during the last execution

diff --git a/lib/source/pl/core/error.cpp b/lib/source/pl/core/error.cpp
@@ -112,8 +112,9 @@ namespace pl::core::err {
                 errorMessage += fmt::format("{}{}\n", lineNumberPrefix, errorLine);
 
                 {
-                    const auto descriptionSpacing = std::string(lineNumberPrefix.length() + arrowPosition, ' ');
-                    errorMessage += descriptionSpacing + "^\n";
+                    const auto arrowSpacing = std::string(lineNumberPrefix.length() + arrowPosition, ' ');
+                    // add arrow with length of the token
+                    errorMessage += arrowSpacing + std::string(location.length, '^') + '\n';
                 }
             }
         }