ScriptBuilder: Set compile functions of blocks in currentBlock()

Author: adazem009

include/scratchcpp/dev/test/scriptbuilder.h

@@ -44,7 +44,7 @@ class LIBSCRATCHCPP_EXPORT ScriptBuilder
         void addDropdownInput(const std::string &name, const std::string &selectedValue);
         void addDropdownField(const std::string &name, const std::string &selectedValue);
 
-        std::shared_ptr<Block> currentBlock() const;
+        std::shared_ptr<Block> currentBlock();
 
         void build();
         void run();
@@ -53,6 +53,7 @@ class LIBSCRATCHCPP_EXPORT ScriptBuilder
 
     private:
         void addBlock(std::shared_ptr<Block> block);
+        void build(std::shared_ptr<Target> target);
 
         spimpl::unique_impl_ptr<ScriptBuilderPrivate> impl;
 };

src/dev/test/scriptbuilder.cpp

@@ -6,7 +6,7 @@
 #include <scratchcpp/field.h>
 #include <scratchcpp/dev/compilerconstant.h>
 #include <scratchcpp/dev/executablecode.h>
-#include <scratchcpp/stage.h>
+#include <scratchcpp/sprite.h>
 #include <scratchcpp/iengine.h>
 #include <scratchcpp/list.h>
 
@@ -153,31 +153,26 @@ void ScriptBuilder::addDropdownField(const std::string &name, const std::string
     impl->blocks.back()->addField(field);
 }
 
-/*! Returns the current block (can be used e. g. with a custom Compiler instance). */
-std::shared_ptr<Block> ScriptBuilder::currentBlock() const
+/*!
+ * Returns the current block (can be used e. g. with a custom Compiler instance).\n
+ * The script is automatically built to set the compile function of the block.
+ * \note This method is not intended for building scripts, use build() for that.
+ */
+std::shared_ptr<Block> ScriptBuilder::currentBlock()
 {
+    if (!impl->lastBlock)
+        return nullptr;
+
+    if (!impl->lastBlock->compileFunction())
+        build(std::make_shared<Sprite>());
+
     return impl->lastBlock;
 }
 
 /*! Builds and compiles the script. */
 void ScriptBuilder::build()
 {
-    if (impl->target->blocks().empty()) {
-        for (auto block : impl->blocks)
-            impl->target->addBlock(block);
-
-        for (auto block : impl->inputBlocks)
-            impl->target->addBlock(block);
-    }
-
-    std::vector<std::shared_ptr<Target>> targets = impl->engine->targets();
-
-    if (std::find(targets.begin(), targets.end(), impl->target) == targets.end()) {
-        targets.push_back(impl->target);
-        impl->engine->setTargets({ impl->target });
-    }
-
-    impl->engine->compile();
+    build(impl->target);
 }
 
 /*! Runs the built script. */
@@ -202,3 +197,25 @@ void ScriptBuilder::addBlock(std::shared_ptr<Block> block)
 
     impl->blocks.push_back(block);
 }
+
+void ScriptBuilder::build(std::shared_ptr<Target> target)
+{
+    impl->engine->clear();
+
+    if (target->blocks().empty()) {
+        for (auto block : impl->blocks)
+            target->addBlock(block);
+
+        for (auto block : impl->inputBlocks)
+            target->addBlock(block);
+    }
+
+    std::vector<std::shared_ptr<Target>> targets = impl->engine->targets();
+
+    if (std::find(targets.begin(), targets.end(), target) == targets.end()) {
+        targets.push_back(target);
+        impl->engine->setTargets({ target });
+    }
+
+    impl->engine->compile();
+}

test/dev/test_api/scriptbuilder_test.cpp

@@ -40,6 +40,7 @@ TEST_F(ScriptBuilderTest, AddBlock)
     auto block = m_builder->currentBlock();
     ASSERT_TRUE(block);
     ASSERT_EQ(block->opcode(), "test_simple");
+    ASSERT_TRUE(block->compileFunction());
 
     m_builder->build();