Implement operator_join

Author: adazem009

src/dev/blocks/operatorblocks.cpp

@@ -31,6 +31,7 @@ void OperatorBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "operator_and", &compileAnd);
     engine->addCompileFunction(this, "operator_or", &compileOr);
     engine->addCompileFunction(this, "operator_not", &compileNot);
+    engine->addCompileFunction(this, "operator_join", &compileJoin);
 }
 
 CompilerValue *OperatorBlocks::compileAdd(Compiler *compiler)
@@ -89,3 +90,27 @@ CompilerValue *OperatorBlocks::compileNot(Compiler *compiler)
 {
     return compiler->createNot(compiler->addInput("OPERAND"));
 }
+
+CompilerValue *OperatorBlocks::compileJoin(Compiler *compiler)
+{
+    auto string1 = compiler->addInput("STRING1");
+    auto string2 = compiler->addInput("STRING2");
+    return compiler->addFunctionCall("operator_join", Compiler::StaticType::String, { Compiler::StaticType::String, Compiler::StaticType::String }, { string1, string2 });
+}
+
+extern "C" char *operator_join(const char *string1, const char *string2)
+{
+    const size_t len1 = strlen(string1);
+    const size_t len2 = strlen(string2);
+
+    char *ret = (char *)malloc((len1 + len2 + 1) * sizeof(char));
+    size_t i;
+
+    for (i = 0; i < len1; i++)
+        ret[i] = string1[i];
+
+    for (i = 0; i < len2 + 1; i++) // +1: null-terminate
+        ret[len1 + i] = string2[i];
+
+    return ret;
+}

src/dev/blocks/operatorblocks.h

@@ -29,6 +29,7 @@ class OperatorBlocks : public IExtension
         static CompilerValue *compileAnd(Compiler *compiler);
         static CompilerValue *compileOr(Compiler *compiler);
         static CompilerValue *compileNot(Compiler *compiler);
+        static CompilerValue *compileJoin(Compiler *compiler);
 };
 
 } // namespace libscratchcpp

test/dev/blocks/operator_blocks_test.cpp

@@ -353,3 +353,28 @@ TEST_F(OperatorBlocksTest, Not)
     ASSERT_EQ(Value(values[0]), true);
     ASSERT_EQ(Value(values[1]), false);
 }
+
+TEST_F(OperatorBlocksTest, Join)
+{
+    auto target = std::make_shared<Sprite>();
+    ScriptBuilder builder(m_extension.get(), m_engine, target);
+
+    builder.addBlock("operator_join");
+    builder.addValueInput("STRING1", "abc");
+    builder.addValueInput("STRING2", "def");
+    builder.captureBlockReturnValue();
+
+    builder.addBlock("operator_join");
+    builder.addValueInput("STRING1", "Hello ");
+    builder.addValueInput("STRING2", "world");
+    builder.captureBlockReturnValue();
+
+    builder.build();
+    builder.run();
+
+    List *valueList = builder.capturedValues();
+    ValueData *values = valueList->data();
+    ASSERT_EQ(valueList->size(), 2);
+    ASSERT_EQ(Value(values[0]), "abcdef");
+    ASSERT_EQ(Value(values[1]), "Hello world");
+}