Implement control_if_else

Author: adazem009

src/dev/blocks/controlblocks.cpp

@@ -25,6 +25,7 @@ void ControlBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "control_forever", &compileForever);
     engine->addCompileFunction(this, "control_repeat", &compileRepeat);
     engine->addCompileFunction(this, "control_if", &compileIf);
+    engine->addCompileFunction(this, "control_if_else", &compileIfElse);
 }
 
 CompilerValue *ControlBlocks::compileForever(Compiler *compiler)
@@ -48,3 +49,11 @@ CompilerValue *ControlBlocks::compileIf(Compiler *compiler)
     compiler->moveToIf(compiler->addInput("CONDITION"), substack ? substack->valueBlock() : nullptr);
     return nullptr;
 }
+
+CompilerValue *ControlBlocks::compileIfElse(Compiler *compiler)
+{
+    auto substack = compiler->input("SUBSTACK");
+    auto substack2 = compiler->input("SUBSTACK2");
+    compiler->moveToIfElse(compiler->addInput("CONDITION"), substack ? substack->valueBlock() : nullptr, substack2 ? substack2->valueBlock() : nullptr);
+    return nullptr;
+}

src/dev/blocks/controlblocks.h

@@ -19,6 +19,7 @@ class ControlBlocks : public IExtension
         static CompilerValue *compileForever(Compiler *compiler);
         static CompilerValue *compileRepeat(Compiler *compiler);
         static CompilerValue *compileIf(Compiler *compiler);
+        static CompilerValue *compileIfElse(Compiler *compiler);
 };
 
 } // namespace libscratchcpp

test/dev/blocks/control_blocks_test.cpp

@@ -152,3 +152,101 @@ TEST_F(ControlBlocksTest, If)
         builder.run();
     }
 }
+
+TEST_F(ControlBlocksTest, IfElse)
+{
+    auto target = std::make_shared<Sprite>();
+
+    {
+        ScriptBuilder builder(m_extension.get(), m_engine, target);
+
+        builder.addBlock("control_if_else");
+        builder.addValueInput("CONDITION", false);
+        auto substack = std::make_shared<Block>("", "test_print_test");
+        builder.addObscuredInput("SUBSTACK", substack);
+        auto substack2 = std::make_shared<Block>("", "test_print_test2");
+        builder.addObscuredInput("SUBSTACK2", substack2);
+
+        builder.addBlock("control_if_else");
+        builder.addNullObscuredInput("CONDITION");
+        substack = std::make_shared<Block>("", "test_print_test");
+        builder.addObscuredInput("SUBSTACK", substack);
+        substack2 = std::make_shared<Block>("", "test_print_test2");
+        builder.addObscuredInput("SUBSTACK2", substack2);
+
+        builder.addBlock("control_if_else");
+        builder.addValueInput("CONDITION", true);
+        substack = std::make_shared<Block>("", "test_print_test");
+        builder.addObscuredInput("SUBSTACK", substack);
+        substack2 = std::make_shared<Block>("", "test_print_test2");
+        builder.addObscuredInput("SUBSTACK2", substack2);
+
+        builder.build();
+
+        testing::internal::CaptureStdout();
+        builder.run();
+        ASSERT_EQ(testing::internal::GetCapturedStdout(), "test2\ntest2\ntest\n");
+    }
+
+    m_engine->clear();
+    target = std::make_shared<Sprite>();
+
+    {
+        ScriptBuilder builder(m_extension.get(), m_engine, target);
+
+        builder.addBlock("control_if_else");
+        builder.addValueInput("CONDITION", false);
+        auto substack2 = std::make_shared<Block>("", "test_print_test2");
+        builder.addObscuredInput("SUBSTACK2", substack2);
+
+        builder.addBlock("control_if_else");
+        builder.addValueInput("CONDITION", true);
+        substack2 = std::make_shared<Block>("", "test_print_test2");
+        builder.addObscuredInput("SUBSTACK2", substack2);
+
+        builder.build();
+
+        testing::internal::CaptureStdout();
+        builder.run();
+        ASSERT_EQ(testing::internal::GetCapturedStdout(), "test2\n");
+    }
+
+    m_engine->clear();
+    target = std::make_shared<Sprite>();
+
+    {
+        ScriptBuilder builder(m_extension.get(), m_engine, target);
+
+        builder.addBlock("control_if_else");
+        builder.addValueInput("CONDITION", false);
+        auto substack = std::make_shared<Block>("", "test_print_test");
+        builder.addObscuredInput("SUBSTACK", substack);
+
+        builder.addBlock("control_if_else");
+        builder.addValueInput("CONDITION", true);
+        substack = std::make_shared<Block>("", "test_print_test");
+        builder.addObscuredInput("SUBSTACK", substack);
+
+        builder.build();
+
+        testing::internal::CaptureStdout();
+        builder.run();
+        ASSERT_EQ(testing::internal::GetCapturedStdout(), "test\n");
+    }
+
+    m_engine->clear();
+    target = std::make_shared<Sprite>();
+
+    {
+        ScriptBuilder builder(m_extension.get(), m_engine, target);
+
+        builder.addBlock("control_if_else");
+        builder.addValueInput("CONDITION", false);
+
+        builder.addBlock("control_if_else");
+        builder.addValueInput("CONDITION", true);
+
+        builder.build();
+        builder.run();
+    }
+}

test/dev/blocks/util.cpp

@@ -22,6 +22,12 @@ void registerBlocks(IEngine *engine, IExtension *extension)
         compiler->addFunctionCall("test_print", Compiler::StaticType::Void, { Compiler::StaticType::String }, { input });
         return nullptr;
     });
+
+    engine->addCompileFunction(extension, "test_print_test2", [](Compiler *compiler) -> CompilerValue * {
+        auto input = compiler->addConstValue("test2");
+        compiler->addFunctionCall("test_print", Compiler::StaticType::Void, { Compiler::StaticType::String }, { input });
+        return nullptr;
+    });
 }
 
 extern "C" void test_print(const char *str)