From d990ee102ab909b955dd2c4eaf576a0dd1247b6c Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Wed, 7 Sep 2022 23:11:24 +0200
Subject: [PATCH] sys: More cleanup

---
 lib/libimhex/include/hex/providers/provider.hpp              | 4 ----
 plugins/builtin/CMakeLists.txt                               | 3 +--
 .../builtin/include/{ => content/helpers}/math_evaluator.hpp | 2 +-
 plugins/builtin/source/content/command_palette_commands.cpp  | 2 +-
 .../builtin/source/{ => content/helpers}/math_evaluator.cpp  | 5 ++---
 plugins/builtin/source/content/tools_entries.cpp             | 2 +-
 plugins/builtin/source/content/views/view_hex_editor.cpp     | 2 +-
 plugins/builtin/source/content/views/view_pattern_data.cpp   | 1 -
 8 files changed, 7 insertions(+), 14 deletions(-)
 rename plugins/builtin/include/{ => content/helpers}/math_evaluator.hpp (98%)
 rename plugins/builtin/source/{ => content/helpers}/math_evaluator.cpp (99%)

diff --git a/lib/libimhex/include/hex/providers/provider.hpp b/lib/libimhex/include/hex/providers/provider.hpp
index 62faa8c31..82deefaa7 100644
--- a/lib/libimhex/include/hex/providers/provider.hpp
+++ b/lib/libimhex/include/hex/providers/provider.hpp
@@ -14,10 +14,6 @@
 
 #include <nlohmann/json.hpp>
 
-namespace pl {
-    class PatternLanguage;
-}
-
 namespace hex::prv {
 
     class Provider {
diff --git a/plugins/builtin/CMakeLists.txt b/plugins/builtin/CMakeLists.txt
index 11b5941d1..8fa472615 100644
--- a/plugins/builtin/CMakeLists.txt
+++ b/plugins/builtin/CMakeLists.txt
@@ -52,9 +52,8 @@ add_library(${PROJECT_NAME} SHARED
         source/content/views/view_provider_settings.cpp
         source/content/views/view_find.cpp
 
-
+        source/content/helpers/math_evaluator.cpp
         source/content/helpers/pattern_drawer.cpp
-        source/pattern_drawer.cpp
 
         source/lang/de_DE.cpp
         source/lang/en_US.cpp
diff --git a/plugins/builtin/include/math_evaluator.hpp b/plugins/builtin/include/content/helpers/math_evaluator.hpp
similarity index 98%
rename from plugins/builtin/include/math_evaluator.hpp
rename to plugins/builtin/include/content/helpers/math_evaluator.hpp
index 82674522b..181b0a123 100644
--- a/plugins/builtin/include/math_evaluator.hpp
+++ b/plugins/builtin/include/content/helpers/math_evaluator.hpp
@@ -98,7 +98,7 @@ namespace hex {
         };
 
         static i16 comparePrecedence(const Operator &a, const Operator &b);
-        static bool isLeftAssociative(const Operator op);
+        static bool isLeftAssociative(const Operator &op);
         static std::pair<Operator, size_t> toOperator(const std::string &input);
 
     private:
diff --git a/plugins/builtin/source/content/command_palette_commands.cpp b/plugins/builtin/source/content/command_palette_commands.cpp
index bd6cd7c94..a5a95bd33 100644
--- a/plugins/builtin/source/content/command_palette_commands.cpp
+++ b/plugins/builtin/source/content/command_palette_commands.cpp
@@ -5,7 +5,7 @@
 #include <hex/helpers/utils.hpp>
 #include <hex/helpers/fmt.hpp>
 
-#include "math_evaluator.hpp"
+#include <content/helpers/math_evaluator.hpp>
 
 namespace hex::plugin::builtin {
 
diff --git a/plugins/builtin/source/math_evaluator.cpp b/plugins/builtin/source/content/helpers/math_evaluator.cpp
similarity index 99%
rename from plugins/builtin/source/math_evaluator.cpp
rename to plugins/builtin/source/content/helpers/math_evaluator.cpp
index 1c230c851..7f6f8b2fc 100644
--- a/plugins/builtin/source/math_evaluator.cpp
+++ b/plugins/builtin/source/content/helpers/math_evaluator.cpp
@@ -1,4 +1,4 @@
-#include "math_evaluator.hpp"
+#include <content/helpers/math_evaluator.hpp>
 
 #include <hex/helpers/utils.hpp>
 #include <hex/helpers/concepts.hpp>
@@ -6,7 +6,6 @@
 #include <string>
 #include <queue>
 #include <stack>
-#include <stdexcept>
 #include <cmath>
 #include <cstdint>
 #include <optional>
@@ -19,7 +18,7 @@ namespace hex {
     }
 
     template<typename T>
-    bool MathEvaluator<T>::isLeftAssociative(const Operator op) {
+    bool MathEvaluator<T>::isLeftAssociative(const Operator &op) {
         return (static_cast<u32>(op) & 0xF00) == 0;
     }
 
diff --git a/plugins/builtin/source/content/tools_entries.cpp b/plugins/builtin/source/content/tools_entries.cpp
index 1d7d7465c..3e5ff9307 100644
--- a/plugins/builtin/source/content/tools_entries.cpp
+++ b/plugins/builtin/source/content/tools_entries.cpp
@@ -19,7 +19,7 @@
 #include <limits>
 
 #include <llvm/Demangle/Demangle.h>
-#include "math_evaluator.hpp"
+#include <content/helpers/math_evaluator.hpp>
 
 #include <imgui.h>
 #define IMGUI_DEFINE_MATH_OPERATORS
diff --git a/plugins/builtin/source/content/views/view_hex_editor.cpp b/plugins/builtin/source/content/views/view_hex_editor.cpp
index 5dafc88d3..fc36d666b 100644
--- a/plugins/builtin/source/content/views/view_hex_editor.cpp
+++ b/plugins/builtin/source/content/views/view_hex_editor.cpp
@@ -5,7 +5,7 @@
 #include <hex/providers/buffered_reader.hpp>
 #include <hex/helpers/crypto.hpp>
 
-#include "math_evaluator.hpp"
+#include <content/helpers/math_evaluator.hpp>
 
 #include <imgui_internal.h>
 #include <nlohmann/json.hpp>
diff --git a/plugins/builtin/source/content/views/view_pattern_data.cpp b/plugins/builtin/source/content/views/view_pattern_data.cpp
index cadc4ac05..bcbc4487b 100644
--- a/plugins/builtin/source/content/views/view_pattern_data.cpp
+++ b/plugins/builtin/source/content/views/view_pattern_data.cpp
@@ -2,7 +2,6 @@
 
 #include <hex/providers/provider.hpp>
 
-#include <pl/pattern_language.hpp>
 #include <pl/patterns/pattern.hpp>
 
 #include <provider_extra_data.hpp>