Add target to LLVMCodeBuilder

Author: adazem009

src/dev/engine/compiler.cpp

@@ -38,7 +38,7 @@ std::shared_ptr<libscratchcpp::Block> Compiler::block() const
 /*! Compiles the script starting with the given block. */
 std::shared_ptr<ExecutableCode> Compiler::compile(std::shared_ptr<Block> startBlock)
 {
-    impl->builder = impl->builderFactory->create(startBlock->id(), false);
+    impl->builder = impl->builderFactory->create(impl->target, startBlock->id(), false);
     impl->substackTree.clear();
     impl->substackHit = false;
     impl->warp = false;

src/dev/engine/internal/codebuilderfactory.cpp

@@ -12,7 +12,7 @@ std::shared_ptr<CodeBuilderFactory> CodeBuilderFactory::instance()
     return m_instance;
 }
 
-std::shared_ptr<ICodeBuilder> CodeBuilderFactory::create(const std::string &id, bool warp) const
+std::shared_ptr<ICodeBuilder> CodeBuilderFactory::create(Target *target, const std::string &id, bool warp) const
 {
-    return std::make_shared<LLVMCodeBuilder>(id, warp);
+    return std::make_shared<LLVMCodeBuilder>(target, id, warp);
 }

src/dev/engine/internal/codebuilderfactory.h

@@ -11,7 +11,7 @@ class CodeBuilderFactory : public ICodeBuilderFactory
 {
     public:
         static std::shared_ptr<CodeBuilderFactory> instance();
-        std::shared_ptr<ICodeBuilder> create(const std::string &id, bool warp) const override;
+        std::shared_ptr<ICodeBuilder> create(Target *target, const std::string &id, bool warp) const override;
 
     private:
         static std::shared_ptr<CodeBuilderFactory> m_instance;

src/dev/engine/internal/icodebuilderfactory.h

@@ -8,13 +8,14 @@ namespace libscratchcpp
 {
 
 class ICodeBuilder;
+class Target;
 
 class ICodeBuilderFactory
 {
     public:
         virtual ~ICodeBuilderFactory() { }
 
-        virtual std::shared_ptr<ICodeBuilder> create(const std::string &id, bool warp) const = 0;
+        virtual std::shared_ptr<ICodeBuilder> create(Target *target, const std::string &id, bool warp) const = 0;
 };
 
 } // namespace libscratchcpp

src/dev/engine/internal/llvmcodebuilder.cpp

@@ -13,7 +13,8 @@ using namespace libscratchcpp;
 static std::unordered_map<ValueType, Compiler::StaticType>
     TYPE_MAP = { { ValueType::Number, Compiler::StaticType::Number }, { ValueType::Bool, Compiler::StaticType::Bool }, { ValueType::String, Compiler::StaticType::String } };
 
-LLVMCodeBuilder::LLVMCodeBuilder(const std::string &id, bool warp) :
+LLVMCodeBuilder::LLVMCodeBuilder(Target *target, const std::string &id, bool warp) :
+    m_target(target),
     m_id(id),
     m_module(std::make_unique<llvm::Module>(id, m_ctx)),
     m_builder(m_ctx),

src/dev/engine/internal/llvmcodebuilder.h

@@ -17,7 +17,7 @@ class Target;
 class LLVMCodeBuilder : public ICodeBuilder
 {
     public:
-        LLVMCodeBuilder(const std::string &id, bool warp);
+        LLVMCodeBuilder(Target *target, const std::string &id, bool warp);
 
         std::shared_ptr<ExecutableCode> finalize() override;
 

test/dev/compiler/compiler_test.cpp

@@ -41,7 +41,7 @@ class CompilerTest : public testing::Test
         {
             ASSERT_EQ(compiler.block(), nullptr);
             // TODO: Test warp
-            EXPECT_CALL(m_builderFactory, create(block->id(), false)).WillOnce(Return(m_builder));
+            EXPECT_CALL(m_builderFactory, create(compiler.target(), block->id(), false)).WillOnce(Return(m_builder));
             EXPECT_CALL(*m_builder, finalize()).WillOnce(Return(m_code));
             ASSERT_EQ(compiler.compile(block), m_code);
             ASSERT_EQ(compiler.block(), nullptr);

test/dev/llvm/llvmcodebuilder_test.cpp

@@ -19,7 +19,8 @@ class LLVMCodeBuilderTest : public testing::Test
             test_function(nullptr, nullptr); // force dependency
         }
 
-        void createBuilder(bool warp) { m_builder = std::make_unique<LLVMCodeBuilder>("test", warp); }
+        void createBuilder(Target *target, bool warp) { m_builder = std::make_unique<LLVMCodeBuilder>(target, "test", warp); }
+        void createBuilder(bool warp) { createBuilder(nullptr, warp); }
 
         void callConstFuncForType(ValueType type)
         {

test/mocks/codebuilderfactorymock.h

@@ -8,5 +8,5 @@ using namespace libscratchcpp;
 class CodeBuilderFactoryMock : public ICodeBuilderFactory
 {
     public:
-        MOCK_METHOD(std::shared_ptr<ICodeBuilder>, create, (const std::string &, bool), (const, override));
+        MOCK_METHOD(std::shared_ptr<ICodeBuilder>, create, (Target *, const std::string &, bool), (const, override));
 };