ScriptBuilder: Refactor reporter blocks

Author: adazem009

include/scratchcpp/dev/test/scriptbuilder.h

@@ -31,7 +31,6 @@ class LIBSCRATCHCPP_EXPORT ScriptBuilder
         ~ScriptBuilder();
 
         void addBlock(const std::string &opcode);
-        void addReporterBlock(const std::string &opcode);
         void captureBlockReturnValue();
 
         void addValueInput(const std::string &name, const Value &value);
@@ -47,6 +46,7 @@ class LIBSCRATCHCPP_EXPORT ScriptBuilder
         void addEntityField(const std::string &name, std::shared_ptr<Entity> entity);
 
         std::shared_ptr<Block> currentBlock();
+        std::shared_ptr<Block> takeBlock();
 
         void build();
         void run();

src/dev/test/scriptbuilder.cpp

@@ -59,19 +59,13 @@ void ScriptBuilder::addBlock(const std::string &opcode)
     addBlock(impl->lastBlock);
 }
 
-/*! Creates a reporter block with the given opcode to be used with captureBlockReturnValue() later. */
-void ScriptBuilder::addReporterBlock(const std::string &opcode)
-{
-    impl->lastBlock = std::make_shared<Block>(std::to_string(impl->blockId++), opcode);
-}
-
 /*! Captures the return value of the created reporter block. It can be retrieved using capturedValues() later. */
 void ScriptBuilder::captureBlockReturnValue()
 {
     if (!impl->lastBlock)
         return;
 
-    auto valueBlock = impl->lastBlock;
+    auto valueBlock = takeBlock();
     addBlock("script_builder_capture");
     addObscuredInput("VALUE", valueBlock);
 }
@@ -104,6 +98,7 @@ void ScriptBuilder::addObscuredInput(const std::string &name, std::shared_ptr<Bl
         return;
 
     auto block = valueBlock;
+    block->setParent(impl->lastBlock);
 
     while (block) {
         block->setId(std::to_string(impl->blockId++));
@@ -112,7 +107,7 @@ void ScriptBuilder::addObscuredInput(const std::string &name, std::shared_ptr<Bl
         auto parent = block->parent();
         auto next = block->next();
 
-        if (parent)
+        if (parent && block != valueBlock)
             parent->setNext(block);
 
         if (next)
@@ -228,6 +223,24 @@ std::shared_ptr<Block> ScriptBuilder::currentBlock()
     return impl->lastBlock;
 }
 
+/*! Removes the current block from the script and returns it. Can be used in inputs later. */
+std::shared_ptr<Block> ScriptBuilder::takeBlock()
+{
+    if (!impl->lastBlock)
+        return nullptr;
+
+    auto block = impl->lastBlock;
+    impl->blocks.pop_back();
+
+    if (!impl->blocks.empty())
+        impl->blocks.back()->setNext(nullptr);
+
+    block->setParent(nullptr);
+    block->setNext(nullptr);
+
+    return block;
+}
+
 /*! Builds and compiles the script. */
 void ScriptBuilder::build()
 {

test/dev/test_api/scriptbuilder_test.cpp

@@ -129,6 +129,28 @@ TEST_F(ScriptBuilderTest, AddObscuredInputMultipleBlocks)
     ASSERT_EQ(testing::internal::GetCapturedStdout(), "test\ntest\ntest\n");
 }
 
+TEST_F(ScriptBuilderTest, AdvancedObscuredInput)
+{
+    for (int i = 1; i <= 3; i++) {
+        m_builder->addBlock("test_input");
+        m_builder->addValueInput("INPUT", i);
+        auto valueBlock = m_builder->takeBlock();
+
+        m_builder->addBlock("test_input");
+        m_builder->addObscuredInput("INPUT", valueBlock);
+        valueBlock = m_builder->takeBlock();
+
+        m_builder->addBlock("test_print");
+        m_builder->addObscuredInput("STRING", valueBlock);
+    }
+
+    m_builder->build();
+
+    testing::internal::CaptureStdout();
+    m_builder->run();
+    ASSERT_EQ(testing::internal::GetCapturedStdout(), "1\n2\n3\n");
+}
+
 TEST_F(ScriptBuilderTest, AddNullObscuredInput)
 {
     m_builder->addBlock("test_print");
@@ -221,15 +243,15 @@ TEST_F(ScriptBuilderTest, AddEntityField)
     m_builder->build();
 }
 
-TEST_F(ScriptBuilderTest, ReporterBlocks)
+TEST_F(ScriptBuilderTest, CaptureBlockReturnValue)
 {
-    m_builder->addReporterBlock("test_teststr");
+    m_builder->addBlock("test_teststr");
     auto block = m_builder->currentBlock();
     ASSERT_TRUE(block);
     ASSERT_EQ(block->opcode(), "test_teststr");
     m_builder->captureBlockReturnValue();
 
-    m_builder->addReporterBlock("test_input");
+    m_builder->addBlock("test_input");
     m_builder->addValueInput("INPUT", -93.4);
     block = m_builder->currentBlock();
     ASSERT_TRUE(block);