Merge pull request #247 from scratchcpp/compiler_target_property

Add target property to Compiler

Author: adazem009

include/scratchcpp/compiler.h

@@ -34,7 +34,7 @@ class LIBSCRATCHCPP_EXPORT Compiler
             IfStatement
         };
 
-        Compiler(IEngine *engine);
+        Compiler(IEngine *engine, Target *target = nullptr);
         Compiler(const Compiler &) = delete;
 
         void init();
@@ -44,6 +44,7 @@ class LIBSCRATCHCPP_EXPORT Compiler
         const std::vector<unsigned int> &bytecode() const;
 
         IEngine *engine() const;
+        Target *target() const;
 
         const std::vector<InputValue *> &constInputValues() const;
         std::vector<Value> constValues() const;

src/engine/compiler.cpp

@@ -14,8 +14,8 @@ using namespace libscratchcpp;
 using namespace vm;
 
 /*! Constructs Compiler. */
-Compiler::Compiler(IEngine *engine) :
-    impl(spimpl::make_unique_impl<CompilerPrivate>(engine))
+Compiler::Compiler(IEngine *engine, Target *target) :
+    impl(spimpl::make_unique_impl<CompilerPrivate>(engine, target))
 {
 }
 
@@ -87,6 +87,11 @@ IEngine *Compiler::engine() const
     return impl->engine;
 }
 
+Target *Compiler::target() const
+{
+    return impl->target;
+}
+
 /*! Returns the list of constant input values. */
 const std::vector<InputValue *> &Compiler::constInputValues() const
 {

src/engine/compiler_p.cpp

@@ -7,8 +7,9 @@
 using namespace libscratchcpp;
 using namespace vm;
 
-CompilerPrivate::CompilerPrivate(IEngine *engine) :
-    engine(engine)
+CompilerPrivate::CompilerPrivate(IEngine *engine, Target *target) :
+    engine(engine),
+    target(target)
 {
     assert(engine);
 }

src/engine/compiler_p.h

@@ -11,7 +11,7 @@ namespace libscratchcpp
 
 struct CompilerPrivate
 {
-        CompilerPrivate(IEngine *engine);
+        CompilerPrivate(IEngine *engine, Target *target);
         CompilerPrivate(const CompilerPrivate &) = delete;
 
         void addInstruction(vm::Opcode opcode, std::initializer_list<unsigned int> args = {});
@@ -20,7 +20,8 @@ struct CompilerPrivate
 
         void substackEnd();
 
-        IEngine *engine;
+        IEngine *engine = nullptr;
+        Target *target = nullptr;
         std::shared_ptr<Block> block;
         std::vector<std::pair<std::pair<std::shared_ptr<Block>, std::shared_ptr<Block>>, Compiler::SubstackType>> substackTree;
 

src/engine/internal/engine.cpp

@@ -84,7 +84,7 @@ void Engine::compile()
     for (auto target : m_targets) {
         std::cout << "Compiling scripts in target " << target->name() << "..." << std::endl;
         std::unordered_map<std::string, unsigned int *> procedureBytecodeMap;
-        Compiler compiler(this);
+        Compiler compiler(this, target.get());
         auto blocks = target->blocks();
         for (auto block : blocks) {
             if (block->topLevel()) {

test/compiler/compiler_test.cpp

@@ -44,8 +44,14 @@ class CompilerTest : public testing::Test
 TEST_F(CompilerTest, Constructors)
 {
     Engine engine;
-    Compiler compiler(&engine);
-    ASSERT_EQ(compiler.engine(), &engine);
+    Compiler compiler1(&engine);
+    ASSERT_EQ(compiler1.engine(), &engine);
+    ASSERT_EQ(compiler1.target(), nullptr);
+
+    Sprite sprite;
+    Compiler compiler2(&engine, &sprite);
+    ASSERT_EQ(compiler2.engine(), &engine);
+    ASSERT_EQ(compiler2.target(), &sprite);
 }
 
 TEST_F(CompilerTest, Block)