evaluator: Fixed pattern-local variables

Author: WerWolv

lib/include/pl/core/evaluator.hpp

@@ -160,6 +160,7 @@ namespace pl::core {
         void popSectionId();
         [[nodiscard]] u64 getSectionId() const;
         [[nodiscard]] u64 getUserSectionId() const;
+        [[nodiscard]] bool isInUserSection() const;
 
         void setInVariables(const std::map<std::string, Token::Literal> &inVariables) {
             this->m_inVariables = inVariables;

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

@@ -101,7 +101,7 @@ namespace pl::core::ast {
                 evaluator->setBitwiseReadOffset(startOffset);
             }
 
-            if (evaluator->getSectionId() != ptrn::Pattern::MainSectionId && !evaluator->isGlobalScope()) {
+            if (evaluator->isInUserSection() && !evaluator->isGlobalScope()) {
                 evaluator->addPattern(std::move(pattern));
                 resultPatterns.pop_back();
             }

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

@@ -113,7 +113,7 @@ namespace pl::core::ast {
             this->execute(evaluator);
             resultPatterns.clear();
         } else {
-            if (evaluator->getSectionId() != ptrn::Pattern::MainSectionId && !evaluator->isGlobalScope()) {
+            if (evaluator->isInUserSection() && !evaluator->isGlobalScope()) {
                 evaluator->addPattern(std::move(pattern));
                 resultPatterns.clear();
             }

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

@@ -26,10 +26,10 @@ namespace pl::core::ast {
         if (this->m_providerOperation) {
             switch (this->getOperator()) {
                 case Token::Operator::AddressOf:
-                    if (evaluator->getSectionId() != ptrn::Pattern::MainSectionId)
-                        result = u128(0x00);
-                    else
+                    if (evaluator->getSectionId() == ptrn::Pattern::MainSectionId)
                         result = u128(evaluator->getDataBaseAddress());
+                    else
+                        result = u128(0x00);
                     break;
                 case Token::Operator::SizeOf:
                     result = u128(evaluator->getRuntime().getSectionSize(evaluator->getSectionId()));

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

@@ -82,7 +82,7 @@ namespace pl::core::ast {
                         evaluator->setBitwiseReadOffset(startOffset);
                     }
 
-                    if (evaluator->getSectionId() != ptrn::Pattern::MainSectionId && !evaluator->isGlobalScope()) {
+                    if (evaluator->isInUserSection() && !evaluator->isGlobalScope()) {
                         evaluator->addPattern(std::move(pattern));
                     } else {
                         resultPatterns = hlp::moveToVector<std::shared_ptr<ptrn::Pattern>>(std::move(pattern));

lib/source/pl/core/evaluator.cpp

@@ -944,6 +944,14 @@ namespace pl::core {
         return sectionIdStack.back();
     }
 
+    bool Evaluator::isInUserSection() const {
+        auto sectionId = this->getSectionId();
+
+        if (sectionId == ptrn::Pattern::MainSectionId || sectionId == ptrn::Pattern::HeapSectionId || sectionId == ptrn::Pattern::PatternLocalSectionId || sectionId == ptrn::Pattern::InstantiationSectionId)
+            return false;
+        return true;
+    }
+
     u64 Evaluator::getUserSectionId() const {
         const auto &sectionIdStack = this->getRuntime().m_sectionData->sectionIdStack;
         if (sectionIdStack.empty())