Merge branch 'master' into BrakepointFixes

WerWolv · Oct 23, 2024 · 80f5975 · 80f5975
2 parents db753a6 + 3739bcc
commit 80f5975
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ cmake-build-*/
 build*/
 local/
 venv/
+.cache/
 
 *.mgc
 *.kdev4

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,6 +32,7 @@ include("${IMHEX_BASE_FOLDER}/cmake/ide_helpers.cmake")
 # Basic compiler and cmake configurations
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
 
 # Setup project

diff --git a/lib/external/pattern_language b/lib/external/pattern_language
diff --git a/lib/third_party/imgui/ColorTextEditor/source/TextEditor.cpp b/lib/third_party/imgui/ColorTextEditor/source/TextEditor.cpp
@@ -1336,8 +1336,6 @@ void TextEditor::EnterCharacter(ImWchar aChar, bool aShift) {
     auto coord    = GetActualCursorCoordinates();
     u.mAddedStart = coord;
 
-    assert(!mLines.empty());
-
     if (aChar == '\n') {
         InsertLine(coord.mLine + 1);
         auto &line    = mLines[coord.mLine];

diff --git a/main/gui/source/window/linux_window.cpp b/main/gui/source/window/linux_window.cpp
@@ -74,7 +74,7 @@ namespace hex {
                     && FcPatternGetString(font, FC_FAMILY, 0, &fullName) != FcResultMatch) {
                     continue;
                 }
-                
+
                 registerFont(reinterpret_cast<const char *>(fullName), reinterpret_cast<const char *>(file));
             }
 
@@ -123,7 +123,7 @@ namespace hex {
         glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);
 
         #if defined(GLFW_WAYLAND_APP_ID)
-                glfwWindowHintString(GLFW_WAYLAND_APP_ID, "imhex");
+            glfwWindowHintString(GLFW_WAYLAND_APP_ID, "imhex");
         #endif
     }
 
@@ -190,4 +190,4 @@ namespace hex {
 
 }
 
-#endif
+#endif
diff --git a/plugins/builtin/include/content/views/view_pattern_editor.hpp b/plugins/builtin/include/content/views/view_pattern_editor.hpp
@@ -252,7 +252,7 @@ namespace hex::plugin::builtin {
         PerProvider<std::unordered_set<u32>> m_breakpoints;
         PerProvider<std::optional<pl::core::err::PatternLanguageError>> m_lastEvaluationError;
         PerProvider<std::vector<pl::core::err::CompileError>> m_lastCompileError;
-        PerProvider<std::vector<const pl::core::ast::ASTNode*>> m_callStack;
+        PerProvider<const std::vector<std::unique_ptr<pl::core::ast::ASTNode>>*> m_callStack;
         PerProvider<std::map<std::string, pl::core::Token::Literal>> m_lastEvaluationOutVars;
         PerProvider<std::map<std::string, PatternVariable>> m_patternVariables;
         PerProvider<std::map<u64, pl::api::Section>> m_sections;

diff --git a/plugins/builtin/source/content/pl_pragmas.cpp b/plugins/builtin/source/content/pl_pragmas.cpp
@@ -9,7 +9,7 @@ namespace hex::plugin::builtin {
 
     void registerPatternLanguagePragmas() {
 
-        ContentRegistry::PatternLanguage::addPragma("base_address", [](const pl::PatternLanguage &runtime, const std::string &value) {
+        ContentRegistry::PatternLanguage::addPragma("base_address", [](pl::PatternLanguage &runtime, const std::string &value) {
             auto baseAddress = strtoull(value.c_str(), nullptr, 0);
 
             ImHexApi::Provider::get()->setBaseAddress(baseAddress);
@@ -27,4 +27,4 @@ namespace hex::plugin::builtin {
         });
     }
 
-}
+}
diff --git a/plugins/builtin/source/content/views/view_pattern_editor.cpp b/plugins/builtin/source/content/views/view_pattern_editor.cpp
@@ -1353,8 +1353,8 @@ namespace hex::plugin::builtin {
                 };
 
                 TextEditor::ErrorMarkers errorMarkers;
-                if (!m_callStack->empty()) {
-                    for (const auto &frame : *m_callStack | std::views::reverse) {
+                if (!(*m_callStack)->empty()) {
+                    for (const auto &frame : **m_callStack | std::views::reverse) {
                         auto location = frame->getLocation();
                         std::string message;
                         if (location.source->source == pl::api::Source::DefaultSource) {
@@ -1816,7 +1816,7 @@ namespace hex::plugin::builtin {
             if (!m_lastEvaluationResult) {
                 *m_lastEvaluationError = runtime.getEvalError();
                 *m_lastCompileError    = runtime.getCompileErrors();
-                *m_callStack           = reinterpret_cast<const std::vector<const pl::core::ast::ASTNode *> &>(runtime.getInternals().evaluator->getCallStack());
+                *m_callStack           = &runtime.getInternals().evaluator->getCallStack();
             }
 
             TaskManager::doLater([code] {

diff --git a/plugins/ui/include/ui/pattern_drawer.hpp b/plugins/ui/include/ui/pattern_drawer.hpp
@@ -130,5 +130,6 @@ namespace hex::ui {
         std::function<void(const pl::ptrn::Pattern *)> m_hoverCallback = [](const pl::ptrn::Pattern *) { };
 
         pl::gen::fmt::FormatterArray m_formatters;
+        u64 m_lastRunId = 0;
     };
 }
diff --git a/plugins/ui/source/ui/pattern_drawer.cpp b/plugins/ui/source/ui/pattern_drawer.cpp
@@ -1214,6 +1214,16 @@ namespace hex::ui {
     }
 
     void PatternDrawer::draw(const std::vector<std::shared_ptr<pl::ptrn::Pattern>> &patterns, const pl::PatternLanguage *runtime, float height) {
+        if (runtime == nullptr) {
+            this->reset();
+        } else {
+            auto runId = runtime->getRunId();
+            if (runId != m_lastRunId) {
+                this->reset();
+                m_lastRunId = runId;
+            }
+        }
+
         std::scoped_lock lock(s_resetDrawMutex);
 
         m_hoverCallback(nullptr);