refactor: removing the MacroExecutorPipeline and integrating it direc…

…tly inside the MacroProcessor

It was in fact just a class to hold a vector and a single public method
to run a loop and call methods on the objects inside the vector.

include/Ark/Compiler/Macros/Processor.hpp

@@ -14,13 +14,15 @@
 
 #include <Ark/Compiler/AST/Node.hpp>
 #include <Ark/Compiler/Macros/MacroScope.hpp>
-#include <Ark/Compiler/Macros/Pipeline.hpp>
 
 #include <unordered_map>
+#include <memory>
 #include <string>
 
 namespace Ark::internal
 {
+    class MacroExecutor;
+
     /**
      * @brief The class handling the macros definitions and calls, given an AST
      *
@@ -55,7 +57,7 @@ namespace Ark::internal
         unsigned m_debug;                  ///< The debug level
         Node m_ast;                        ///< The modified AST
         std::vector<MacroScope> m_macros;  ///< Handling macros in a scope fashion
-        MacroExecutorPipeline m_executor_pipeline;
+        std::vector<std::shared_ptr<MacroExecutor>> m_executors;
         std::vector<std::string> m_predefined_macros;  ///< Already existing macros, non-keywords, non-builtins
         std::unordered_map<std::string, Node> m_defined_functions;
 

src/arkreactor/Compiler/Macros/Processor.cpp

@@ -9,6 +9,7 @@
 #include <Ark/Constants.hpp>
 #include <Ark/Exceptions.hpp>
 #include <Ark/Builtins/Builtins.hpp>
+#include <Ark/Compiler/Macros/Executor.hpp>
 #include <Ark/Compiler/Macros/Executors/Symbol.hpp>
 #include <Ark/Compiler/Macros/Executors/Function.hpp>
 #include <Ark/Compiler/Macros/Executors/Conditional.hpp>
@@ -19,10 +20,9 @@ namespace Ark::internal
         m_debug(debug)
     {
         // create executors pipeline
-        m_executor_pipeline = MacroExecutorPipeline(
-            { std::make_shared<SymbolExecutor>(this),
-              std::make_shared<ConditionalExecutor>(this),
-              std::make_shared<FunctionExecutor>(this) });
+        m_executors = { { std::make_shared<SymbolExecutor>(this),
+                          std::make_shared<ConditionalExecutor>(this),
+                          std::make_shared<FunctionExecutor>(this) } };
 
         m_predefined_macros = {
             "symcat",
@@ -205,7 +205,15 @@ namespace Ark::internal
                     MaxMacroProcessingDepth),
                 node);
 
-        return m_executor_pipeline.applyMacro(node, depth);
+        for (const auto& executor : m_executors)
+        {
+            if (executor->canHandle(node))
+            {
+                if (executor->applyMacro(node, depth))
+                    return true;
+            }
+        }
+        return false;
     }
 
     void MacroProcessor::unify(const std::unordered_map<std::string, Node>& map, Node& target, Node* parent, const std::size_t index, const std::size_t unify_depth)