evaluator: More imported type fixes

Author: WerWolv

lib/include/pl/core/evaluator.hpp

@@ -453,6 +453,8 @@ namespace pl::core {
             }
         }
 
+        u64 getDefaultSection() const { return m_defaultSection; }
+
     private:
         void patternCreated(ptrn::Pattern *pattern);
         void patternDestroyed(ptrn::Pattern *pattern);
@@ -482,6 +484,7 @@ namespace pl::core {
         i8 m_currBitOffset = 0;
         bool m_readOrderReversed = false;
         u64 m_startAddress = 0x00;
+        u64 m_defaultSection = 0;
 
         bool m_evaluated = false;
         bool m_debugMode = false;

lib/include/pl/patterns/pattern.hpp

@@ -376,6 +376,9 @@ namespace pl::ptrn {
             if (this->m_section == id)
                 return;
 
+            if (this->m_section.has_value())
+                return;
+
             if (this->m_section != PatternLocalSectionId && this->m_section != HeapSectionId) {
                 if (this->m_evaluator != nullptr)
                     this->m_evaluator->patternDestroyed(this);
@@ -386,7 +389,7 @@ namespace pl::ptrn {
         }
 
         [[nodiscard]] u64 getSection() const {
-            return this->m_section;
+            return this->m_section.value_or(m_evaluator->getDefaultSection());
         }
 
         virtual void sort(const std::function<bool(const Pattern *left, const Pattern *right)> &comparator) {
@@ -638,7 +641,7 @@ namespace pl::ptrn {
 
         u64 m_offset  = 0x00;
         size_t m_size = 0x00;
-        u64 m_section = 0x00;
+        std::optional<u64> m_section;
 
         u32 m_color = 0x00;
 

lib/source/pl/core/ast/ast_node_imported_type.cpp

@@ -20,6 +20,7 @@ namespace pl::core::ast {
 
         const auto startAddress = evaluator->getReadOffset();
         runtime.setStartAddress(evaluator->getStartAddress() + startAddress);
+        runtime.setDataSize(evaluator->getDataSize() - (evaluator->getStartAddress() + startAddress));
         if (!runtime.executeString(source->content, source->source)) {
             err::E0005.throwError(fmt::format("Error while processing imported type '{}'.", m_importedTypeName), "Check the imported pattern for errors.", getLocation());
         }

lib/source/pl/core/evaluator.cpp

@@ -678,6 +678,9 @@ namespace pl::core {
         if (pattern->getSize() > 0xFFFF'FFFF)
             err::E0003.throwError(fmt::format("Value is too large to place into local variable '{}'.", pattern->getVariableName()));
 
+        if (pattern->isReference() && pattern->getSection() == this->getDefaultSection())
+            return;
+
         // Cast values to type given by pattern
         Token::Literal castedValue = castLiteral(pattern.get(), variableValue);
 
@@ -989,6 +992,11 @@ namespace pl::core {
 
         this->m_subRuntimes.clear();
 
+        if (auto &sectionIds = this->getRuntime().m_sectionData->sectionIdStack; !sectionIds.empty())
+            this->m_defaultSection = sectionIds.back();
+        else
+            this->m_defaultSection = ptrn::Pattern::MainSectionId;
+
         this->setPatternColorPalette(DefaultPatternColorPalette);
 
         if (this->m_allowDangerousFunctions == DangerousFunctionPermission::Deny)
@@ -1143,6 +1151,9 @@ namespace pl::core {
 
             stop_evaluation:
 
+            for (auto &pattern : this->m_patterns)
+                pattern->setSection(this->getDefaultSection());
+
             if (!this->m_mainResult.has_value() && this->m_customFunctions.contains("main")) {
                 auto mainFunction = this->m_customFunctions["main"];
 

lib/source/pl/pattern_language.cpp

@@ -655,6 +655,8 @@ namespace pl {
             auto visibility = pattern->getVisibility();
             if (visibility == pl::ptrn::Visibility::Hidden || visibility == pl::ptrn::Visibility::HighlightHidden)
                 continue;
+            if (pattern->getSection() != ptrn::Pattern::MainSectionId)
+                continue;
 
             results.push_back(pattern->getColor());
         }