evaluator: Prioritise local parameters over template parameters in AST node rvalue evaluation (#147)

AkiSakurai · web-flow · commit 69b71a2c4326 · 2025-02-16T12:49:44.000+01:00
Prioritize local parameters over template parameters in AST node rvalue evaluation
diff --git a/lib/source/pl/core/ast/ast_node_rvalue.cpp b/lib/source/pl/core/ast/ast_node_rvalue.cpp
@@ -164,13 +164,13 @@ namespace pl::core::ast {
         }
 
         {
-            const auto &currScope = evaluator->getScope(0);
-            std::copy(currScope.scope->begin(), currScope.scope->end(), std::back_inserter(searchScope));
+            const auto &templateParameters = evaluator->getTemplateParameters();
+            std::copy(templateParameters.begin(), templateParameters.end(), std::back_inserter(searchScope));
         }
 
         {
-            const auto &templateParameters = evaluator->getTemplateParameters();
-            std::copy(templateParameters.begin(), templateParameters.end(), std::back_inserter(searchScope));
+            const auto &currScope = evaluator->getScope(0);
+            std::copy(currScope.scope->begin(), currScope.scope->end(), std::back_inserter(searchScope));
         }
 
         for (const auto &part : this->getPath()) {

Original file line number	Diff line number	Diff line change
`@@ -164,13 +164,13 @@ namespace pl::core::ast {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`{`
`167`		`- const auto &currScope = evaluator->getScope(0);`
`168`		`- std::copy(currScope.scope->begin(), currScope.scope->end(), std::back_inserter(searchScope));`
	`167`	`+ const auto &templateParameters = evaluator->getTemplateParameters();`
	`168`	`+ std::copy(templateParameters.begin(), templateParameters.end(), std::back_inserter(searchScope));`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`{`
`172`		`- const auto &templateParameters = evaluator->getTemplateParameters();`
`173`		`- std::copy(templateParameters.begin(), templateParameters.end(), std::back_inserter(searchScope));`
	`172`	`+ const auto &currScope = evaluator->getScope(0);`
	`173`	`+ std::copy(currScope.scope->begin(), currScope.scope->end(), std::back_inserter(searchScope));`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`for (const auto &part : this->getPath()) {`