Merge branch 'WerWolv:master' into new_lexer

Author: shewitt-au

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

@@ -52,8 +52,10 @@ namespace pl::core::ast {
         if (this->m_placementSection != nullptr) {
             const auto node = this->m_placementSection->evaluate(evaluator);
             const auto id = dynamic_cast<ASTNodeLiteral *>(node.get());
-            if (id == nullptr)
+            if (id == nullptr) {
+                scopeGuard.release();
                 err::E0010.throwError("Cannot use void expression as section identifier.", {}, this->getLocation());
+            }
 
             evaluator->pushSectionId(u64(id->getValue().toUnsigned()));
         } else {

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

@@ -36,8 +36,10 @@ namespace pl::core::ast {
         if (this->m_placementSection != nullptr) {
             const auto node = this->m_placementSection->evaluate(evaluator);
             const auto id = dynamic_cast<ASTNodeLiteral *>(node.get());
-            if (id == nullptr)
+            if (id == nullptr) {
+                scopeGuard.release();
                 err::E0010.throwError("Cannot use void expression as section identifier.", {}, this->getLocation());
+            }
 
             evaluator->pushSectionId(u64(id->getValue().toUnsigned()));
         } else {
@@ -89,9 +91,11 @@ namespace pl::core::ast {
 
             std::vector<std::shared_ptr<ptrn::Pattern>> pointedAtPatterns;
             ON_SCOPE_EXIT {
-                auto &pointedAtPattern = pointedAtPatterns.front();
+                if (!pointedAtPatterns.empty()) {
+                    auto &pointedAtPattern = pointedAtPatterns.front();
+                    pattern->setPointedAtPattern(std::move(pointedAtPattern));
+                }
 
-                pattern->setPointedAtPattern(std::move(pointedAtPattern));
                 pattern->setSection(evaluator->getSectionId());
             };
 

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

@@ -37,8 +37,10 @@ namespace pl::core::ast {
         if (this->m_placementSection != nullptr) {
             const auto node = this->m_placementSection->evaluate(evaluator);
             const auto id = dynamic_cast<ASTNodeLiteral *>(node.get());
-            if (id == nullptr)
+            if (id == nullptr) {
+                scopeGuard.release();
                 err::E0002.throwError("Cannot use void expression as section identifier.", {}, this->getLocation());
+            }
 
             evaluator->pushSectionId((u64)id->getValue().toUnsigned());
         } else {

lib/source/pl/core/evaluator.cpp

@@ -937,6 +937,9 @@ namespace pl::core {
     }
 
     void Evaluator::popSectionId() {
+        if (this->m_sectionIdStack.empty())
+            return;
+
         this->m_sectionIdStack.pop_back();
     }