From decfad5c99cf6bdc206c2e36e7cf511370f412ca Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Sun, 6 Feb 2022 19:46:39 +0100
Subject: [PATCH] pattern: Properly treat calculated pointers as not part of
 the struct

---
 .../include/hex/pattern_language/ast_node.hpp | 31 +++++++++++++++----
 .../hex/pattern_language/pattern_data.hpp     | 13 ++++----
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/lib/libimhex/include/hex/pattern_language/ast_node.hpp b/lib/libimhex/include/hex/pattern_language/ast_node.hpp
index 6a913a48d..86b0e04d4 100644
--- a/lib/libimhex/include/hex/pattern_language/ast_node.hpp
+++ b/lib/libimhex/include/hex/pattern_language/ast_node.hpp
@@ -808,6 +808,8 @@ namespace hex::pl {
         [[nodiscard]] constexpr bool isOutVariable() const { return this->m_outVariable; }
 
         [[nodiscard]] std::vector<PatternData *> createPatterns(Evaluator *evaluator) const override {
+            u64 startOffset = evaluator->dataOffset();
+
             if (this->m_placementOffset != nullptr) {
                 auto offset = dynamic_cast<ASTNodeLiteral *>(this->m_placementOffset->evaluate(evaluator));
                 ON_SCOPE_EXIT { delete offset; };
@@ -824,6 +826,10 @@ namespace hex::pl {
 
             applyVariableAttributes(evaluator, this, pattern);
 
+            if (this->m_placementOffset != nullptr) {
+                evaluator->dataOffset() = startOffset;
+            }
+
             return { pattern };
         }
 
@@ -872,6 +878,8 @@ namespace hex::pl {
         }
 
         [[nodiscard]] std::vector<PatternData *> createPatterns(Evaluator *evaluator) const override {
+            auto startOffset = evaluator->dataOffset();
+
             if (this->m_placementOffset != nullptr) {
                 auto offset = dynamic_cast<ASTNodeLiteral *>(this->m_placementOffset->evaluate(evaluator));
                 ON_SCOPE_EXIT { delete offset; };
@@ -905,6 +913,11 @@ namespace hex::pl {
             }
 
             applyVariableAttributes(evaluator, this, pattern);
+
+            if (this->m_placementOffset != nullptr) {
+                evaluator->dataOffset() = startOffset;
+            }
+
             return { pattern };
         }
 
@@ -1176,6 +1189,8 @@ namespace hex::pl {
         [[nodiscard]] constexpr auto getPlacementOffset() const { return this->m_placementOffset; }
 
         [[nodiscard]] std::vector<PatternData *> createPatterns(Evaluator *evaluator) const override {
+            auto startOffset = evaluator->dataOffset();
+
             if (this->m_placementOffset != nullptr) {
                 auto offset = dynamic_cast<ASTNodeLiteral *>(this->m_placementOffset->evaluate(evaluator));
                 ON_SCOPE_EXIT { delete offset; };
@@ -1187,22 +1202,22 @@ namespace hex::pl {
                     offset->getValue());
             }
 
-            auto startOffset = evaluator->dataOffset();
+            auto pointerStartOffset = evaluator->dataOffset();
 
             auto sizePattern = this->m_sizeType->createPatterns(evaluator).front();
             ON_SCOPE_EXIT { delete sizePattern; };
 
-            auto pattern = new PatternDataPointer(evaluator, startOffset, sizePattern->getSize());
+            auto pattern = new PatternDataPointer(evaluator, pointerStartOffset, sizePattern->getSize());
             pattern->setVariableName(this->m_name);
 
-            auto endOffset = evaluator->dataOffset();
+            auto pointerEndOffset = evaluator->dataOffset();
 
             {
                 u128 pointerAddress = 0;
                 evaluator->getProvider()->read(pattern->getOffset(), &pointerAddress, pattern->getSize());
                 pointerAddress = hex::changeEndianess(pointerAddress, sizePattern->getSize(), sizePattern->getEndian());
 
-                evaluator->dataOffset() = startOffset;
+                evaluator->dataOffset() = pointerStartOffset;
 
                 pattern->setPointedAtAddress(pointerAddress);
                 applyVariableAttributes(evaluator, this, pattern);
@@ -1215,7 +1230,11 @@ namespace hex::pl {
                 pattern->setEndian(sizePattern->getEndian());
             }
 
-            evaluator->dataOffset() = endOffset;
+            if (this->m_placementOffset != nullptr) {
+                evaluator->dataOffset() = startOffset;
+            } else {
+                evaluator->dataOffset() = pointerEndOffset;
+            }
 
             return { pattern };
         }
@@ -2024,7 +2043,7 @@ namespace hex::pl {
 
             if (!functions.contains(this->m_functionName)) {
                 if (this->m_functionName.starts_with("std::")) {
-                    evaluator->getConsole().log(LogConsole::Level::Warning, "This function might be part of the standard library.\nYou can install the standard library though\nthe Content Store found under Help -> Content Store.");
+                    evaluator->getConsole().log(LogConsole::Level::Warning, "This function might be part of the standard library.\nYou can install the standard library though\nthe Content Store found under Help -> Content Store and then\ninclude the correct file.");
                 }
 
                 LogConsole::abortEvaluation(hex::format("call to unknown function '{}'", this->m_functionName), this);
diff --git a/lib/libimhex/include/hex/pattern_language/pattern_data.hpp b/lib/libimhex/include/hex/pattern_language/pattern_data.hpp
index 73c1a3c87..0d762889e 100644
--- a/lib/libimhex/include/hex/pattern_language/pattern_data.hpp
+++ b/lib/libimhex/include/hex/pattern_language/pattern_data.hpp
@@ -885,14 +885,13 @@ namespace hex::pl {
         [[nodiscard]] const PatternData *getPattern(u64 offset) const override {
             if (this->isHidden()) return nullptr;
 
-            auto iter = std::find_if(this->m_entries.begin(), this->m_entries.end(), [offset](PatternData *pattern) {
-                return offset >= pattern->getOffset() && offset < (pattern->getOffset() + pattern->getSize());
-            });
+            for (auto pattern : this->m_entries) {
+                auto result = pattern->getPattern(offset);
+                if (result != nullptr)
+                    return result;
+            }
 
-            if (iter == this->m_entries.end())
-                return nullptr;
-            else
-                return (*iter)->getPattern(offset);
+            return nullptr;
         }
 
         void setEndian(std::endian endian) override {