pattern: Fixed many code inconsistencies and bugs

sarvex · Jan 31, 2022 · 61fc479 · 61fc479
1 parent 8f8f3c5
commit 61fc479
Show file tree

Hide file tree

Showing 22 changed files with 303 additions and 246 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,6 @@ add_subdirectory(main)
 add_custom_target(imhex ALL DEPENDS main)
 
 # Add unit tests
-enable_testing()
 add_subdirectory(tests EXCLUDE_FROM_ALL)
 
 # Configure packaging

diff --git a/lib/libimhex/include/hex/helpers/concepts.hpp b/lib/libimhex/include/hex/helpers/concepts.hpp
@@ -159,3 +159,14 @@ namespace hex {
     concept has_size = sizeof(T) == Size;
 
 }
+
+
+namespace hex {
+
+    template<typename T>
+    class Cloneable {
+    public:
+        [[nodiscard]] virtual T* clone() const = 0;
+    };
+
+}
diff --git a/lib/libimhex/include/hex/pattern_language/ast_node.hpp b/lib/libimhex/include/hex/pattern_language/ast_node.hpp
diff --git a/lib/libimhex/include/hex/pattern_language/error.hpp b/lib/libimhex/include/hex/pattern_language/error.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <hex.hpp>
+
+#include <stdexcept>
+#include <string>
+
+namespace hex::pl {
+
+    class PatternLanguageError : public std::exception {
+    public:
+        PatternLanguageError(u32 lineNumber, std::string message) : m_lineNumber(lineNumber), m_message(std::move(message)) { }
+
+        [[nodiscard]] const char *what() const noexcept override {
+                return this->m_message.c_str();
+        }
+
+        [[nodiscard]] u32 getLineNumber() const {
+            return this->m_lineNumber;
+        }
+
+    private:
+        u32 m_lineNumber;
+        std::string m_message;
+    };
+
+}
diff --git a/lib/libimhex/include/hex/pattern_language/lexer.hpp b/lib/libimhex/include/hex/pattern_language/lexer.hpp
@@ -12,18 +12,16 @@ namespace hex::pl {
 
     class Lexer {
     public:
-        using LexerError = std::pair<u32, std::string>;
-
         Lexer() = default;
 
         std::optional<std::vector<Token>> lex(const std::string &code);
-        const std::optional<LexerError> &getError() { return this->m_error; }
+        const std::optional<PatternLanguageError> &getError() { return this->m_error; }
 
     private:
-        std::optional<LexerError> m_error;
+        std::optional<PatternLanguageError> m_error;
 
-        [[noreturn]] void throwLexerError(const std::string &error, u32 lineNumber) const {
-            throw LexerError(lineNumber, "Lexer: " + error);
+        [[noreturn]] static void throwLexerError(const std::string &error, u32 lineNumber) {
+            throw PatternLanguageError(lineNumber, "Lexer: " + error);
         }
     };
 

diff --git a/lib/libimhex/include/hex/pattern_language/log_console.hpp b/lib/libimhex/include/hex/pattern_language/log_console.hpp
@@ -8,6 +8,8 @@
 #include <utility>
 #include <vector>
 
+#include <hex/pattern_language/error.hpp>
+
 namespace hex::pl {
 
     class ASTNode;
@@ -23,8 +25,6 @@ namespace hex::pl {
 
         [[nodiscard]] const auto &getLog() const { return this->m_consoleLog; }
 
-        using EvaluateError = std::pair<u32, std::string>;
-
         void log(Level level, const std::string &message);
 
         [[noreturn]] static void abortEvaluation(const std::string &message);
@@ -33,13 +33,13 @@ namespace hex::pl {
 
         void clear();
 
-        void setHardError(const EvaluateError &error) { this->m_lastHardError = error; }
+        void setHardError(const PatternLanguageError &error) { this->m_lastHardError = error; }
 
-        [[nodiscard]] const std::optional<EvaluateError> &getLastHardError() { return this->m_lastHardError; };
+        [[nodiscard]] const std::optional<PatternLanguageError> &getLastHardError() { return this->m_lastHardError; };
 
     private:
         std::vector<std::pair<Level, std::string>> m_consoleLog;
-        std::optional<EvaluateError> m_lastHardError;
+        std::optional<PatternLanguageError> m_lastHardError;
     };
 
 }
diff --git a/lib/libimhex/include/hex/pattern_language/parser.hpp b/lib/libimhex/include/hex/pattern_language/parser.hpp
@@ -3,6 +3,7 @@
 #include <hex.hpp>
 #include <hex/helpers/utils.hpp>
 
+#include <hex/pattern_language/error.hpp>
 #include <hex/pattern_language/token.hpp>
 #include <hex/pattern_language/ast_node.hpp>
 
@@ -16,16 +17,15 @@ namespace hex::pl {
     class Parser {
     public:
         using TokenIter = std::vector<Token>::const_iterator;
-        using ParseError = std::pair<u32, std::string>;
 
         Parser() = default;
         ~Parser() = default;
 
         std::optional<std::vector<ASTNode *>> parse(const std::vector<Token> &tokens);
-        const std::optional<ParseError> &getError() { return this->m_error; }
+        const std::optional<PatternLanguageError> &getError() { return this->m_error; }
 
     private:
-        std::optional<ParseError> m_error;
+        std::optional<PatternLanguageError> m_error;
         TokenIter m_curr;
         TokenIter m_originalPosition, m_partOriginalPosition;
 
@@ -47,7 +47,7 @@ namespace hex::pl {
             auto value = std::get_if<T>(&this->m_curr[index].value);
 
             if (value == nullptr)
-                throwParseError("failed to decode token. Invalid type.", getLineNumber(index));
+                throwParserError("failed to decode token. Invalid type.", getLineNumber(index));
 
             return *value;
         }
@@ -143,8 +143,8 @@ namespace hex::pl {
             return program;
         }
 
-        [[noreturn]] void throwParseError(const std::string &error, i32 token = -1) const {
-            throw ParseError(this->m_curr[token].lineNumber, "Parser: " + error);
+        [[noreturn]] void throwParserError(const std::string &error, i32 token = -1) const {
+            throw PatternLanguageError(this->m_curr[token].lineNumber, "Parser: " + error);
         }
 
         /* Token consuming */