ScriptBuilder: Add support for substack sequences

Author: adazem009

src/dev/test/scriptbuilder.cpp

@@ -103,8 +103,23 @@ void ScriptBuilder::addObscuredInput(const std::string &name, std::shared_ptr<Bl
     if (!impl->lastBlock)
         return;
 
-    valueBlock->setId(std::to_string(impl->blockId++));
-    impl->inputBlocks.push_back(valueBlock);
+    auto block = valueBlock;
+
+    while (block) {
+        block->setId(std::to_string(impl->blockId++));
+        impl->inputBlocks.push_back(block);
+
+        auto parent = block->parent();
+        auto next = block->next();
+
+        if (parent)
+            parent->setNext(block);
+
+        if (next)
+            next->setParent(block);
+
+        block = next;
+    }
 
     auto input = std::make_shared<Input>(name, Input::Type::ObscuredShadow);
     input->setValueBlock(valueBlock);

test/dev/test_api/scriptbuilder_test.cpp

@@ -110,6 +110,25 @@ TEST_F(ScriptBuilderTest, AddObscuredInput)
     ASSERT_EQ(testing::internal::GetCapturedStdout(), "test\n");
 }
 
+TEST_F(ScriptBuilderTest, AddObscuredInputMultipleBlocks)
+{
+    m_builder->addBlock("test_substack");
+    auto substack = std::make_shared<Block>("", "test_simple");
+    auto block1 = std::make_shared<Block>("", "test_simple");
+    substack->setNext(block1);
+    block1->setParent(substack);
+    auto block2 = std::make_shared<Block>("", "test_simple");
+    block1->setNext(block2);
+    block2->setParent(block1);
+    m_builder->addObscuredInput("SUBSTACK", substack);
+
+    m_builder->build();
+
+    testing::internal::CaptureStdout();
+    m_builder->run();
+    ASSERT_EQ(testing::internal::GetCapturedStdout(), "test\ntest\ntest\n");
+}
+
 TEST_F(ScriptBuilderTest, AddNullObscuredInput)
 {
     m_builder->addBlock("test_print");

test/dev/test_api/testextension.cpp

@@ -29,6 +29,7 @@ void TestExtension::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "test_print_field", &compilePrintField);
     engine->addCompileFunction(this, "test_teststr", &compileTestStr);
     engine->addCompileFunction(this, "test_input", &compileInput);
+    engine->addCompileFunction(this, "test_substack", &compileSubstack);
 }
 
 CompilerValue *TestExtension::compileSimple(Compiler *compiler)
@@ -69,6 +70,13 @@ CompilerValue *TestExtension::compileInput(Compiler *compiler)
     return compiler->addInput("INPUT");
 }
 
+CompilerValue *TestExtension::compileSubstack(Compiler *compiler)
+{
+    auto substack = compiler->input("SUBSTACK");
+    compiler->moveToIf(compiler->addConstValue(true), substack->valueBlock());
+    return nullptr;
+}
+
 extern "C" void test_simple()
 {
     std::cout << "test" << std::endl;

test/dev/test_api/testextension.h

@@ -20,6 +20,7 @@ class TestExtension : public IExtension
         static CompilerValue *compilePrintField(Compiler *compiler);
         static CompilerValue *compileTestStr(Compiler *compiler);
         static CompilerValue *compileInput(Compiler *compiler);
+        static CompilerValue *compileSubstack(Compiler *compiler);
 };
 
 } // namespace libscratchcpp