include/engine/core/engine.hpp

@@ -8,7 +8,8 @@
 #include <vector>
 
 /// Magic Srolls engine core
-class MscEngine : public IMscEngineModuleAPI {
+class MscEngine : public IMscEngineModuleAPI
+{
 private:
   /// Loaded modules list
   std::vector<std::shared_ptr<MscEngineModule>> _modules;

include/engine/core/engine_module.hpp

@@ -2,12 +2,14 @@
 #define __MCS_ENGINE_MODULE_HPP__
 
 #include "engine/utils/rev_range.hpp"
+#include "engine/core/engine_module_api.hpp"
 #include <cstdint>
 #include <string>
 #include <unordered_map>
 
 /// Engine module base class
-class MscEngineModule {
+class MscEngineModule
+{
 public:
   virtual ~MscEngineModule() = default;
 
@@ -22,7 +24,7 @@ public:
   getDependencies() const = 0;
 
   /// Module initialization phase
-  virtual void onInitialize();
+  virtual void onInitialize(IMscEngineModuleAPI &engine) = 0;
 };
 
 #endif // __MCS_ENGINE_MODULE_HPP__

include/engine/core/engine_module_api.hpp

@@ -3,7 +3,8 @@
 
 typedef void UNIMPL;
 
-class IMscEngineModuleAPI {
+class IMscEngineModuleAPI
+{
 public:
   virtual ~IMscEngineModuleAPI() = default;
 

include/engine/modules/test1/test1.hpp

@@ -2,9 +2,11 @@
 #define __MSC_TEST_1_MODULE_HPP__
 
 #include "engine/core/engine_module.hpp"
+#include "engine/core/engine_module_api.hpp"
 #include <cstdint>
 
-class Test1Module : public MscEngineModule {
+class Test1Module : public MscEngineModule
+{
 public:
   ~Test1Module() = default;
 
@@ -13,7 +15,7 @@ public:
   const std::unordered_map<std::string, MscRevisionRange> &
   getDependencies() const override;
 
-  void onInitialize() override;
+  void onInitialize(IMscEngineModuleAPI &engine) override;
 };
 
 #endif // __MSC_TEST_1_MODULE_HPP__

include/engine/utils/rev_range.hpp

@@ -2,12 +2,14 @@
 #define __MSC_REV_RANGE_HPP__
 
 #include <cstdint>
-struct MscRevisionRange {
+struct MscRevisionRange
+{
   uint16_t minRevision;
   uint16_t maxRevision;
 
   /// Check provided revision to be in range
-  bool isSatisfied(uint16_t rev) const {
+  bool isSatisfied(uint16_t rev) const
+  {
     return rev >= this->minRevision && rev <= this->maxRevision;
   }
 };

src/engine/core/engine.cpp

@@ -8,33 +8,40 @@
 
 uint16_t MscEngine::REV = 0;
 
-MscEngine::MscEngine(std::vector<std::shared_ptr<MscEngineModule>> modules) {
+MscEngine::MscEngine(std::vector<std::shared_ptr<MscEngineModule>> modules)
+{
   std::unordered_map<std::string, uint16_t> registry;
-  for (const auto &module : modules) {
+  for (const auto &module : modules)
+  {
     if (!module)
       continue;
 
     auto [it, inserted] =
         registry.try_emplace(module->getName(), module->getRev());
-    if (!inserted) {
+    if (!inserted)
+    {
       throw std::runtime_error("Duplicate module detected: " +
                                module->getName());
     }
   }
 
-  for (const auto &module : modules) {
+  for (const auto &module : modules)
+  {
     if (!module)
       continue;
 
-    for (const auto &[dep_name, range] : module->getDependencies()) {
+    for (const auto &[dep_name, range] : module->getDependencies())
+    {
       auto it = registry.find(dep_name);
-      if (it == registry.end()) {
+      if (it == registry.end())
+      {
         throw std::runtime_error("Module " + module->getName() +
                                  " requires missing module: " + dep_name);
       }
 
       int current_rev = it->second;
-      if (!range.isSatisfied(current_rev)) {
+      if (!range.isSatisfied(current_rev))
+      {
         throw std::runtime_error(
             "Module " + module->getName() + " requires " + dep_name +
             " in range [" + std::to_string(range.minRevision) + " <-> " +
@@ -49,6 +56,7 @@ MscEngine::MscEngine(std::vector<std::shared_ptr<MscEngineModule>> modules) {
 
 UNIMPL MscEngine::getBus() const { throw std::runtime_error("Unimplemented"); }
 
-UNIMPL MscEngine::getLoadedModules() const {
+UNIMPL MscEngine::getLoadedModules() const
+{
   throw std::runtime_error("Unimplemented");
 }

src/engine/modules/test1/test1.hpp

@@ -1,4 +1,5 @@
 #include "engine/modules/test1/test1.hpp"
+#include "engine/core/engine_module_api.hpp"
 #include "engine/utils/rev_range.hpp"
 #include <cstdint>
 #include <string>
@@ -9,9 +10,13 @@ std::string Test1Module::getName() const { return "test1"; }
 uint16_t Test1Module::getRev() const { return 1; }
 
 const std::unordered_map<std::string, MscRevisionRange> &
-Test1Module::getDependencies() const {
+Test1Module::getDependencies() const
+{
   static const std::unordered_map<std::string, MscRevisionRange> deps{};
   return deps;
 }
 
-void Test1Module::onInitialize() {}
+void Test1Module::onInitialize(IMscEngineModuleAPI &engine)
+{
+  (void)(engine);
+}

src/main.cpp

@@ -5,7 +5,8 @@
 #include <stdlib.h>
 #include <vector>
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
   auto engine =
       std::make_unique<MscEngine>(std::vector<std::shared_ptr<MscEngineModule>>{
           std::make_shared<Test1Module>()});