Implement operator_contains

Author: adazem009

src/dev/blocks/operatorblocks.cpp

@@ -35,6 +35,7 @@ void OperatorBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "operator_join", &compileJoin);
     engine->addCompileFunction(this, "operator_letter_of", &compileLetterOf);
     engine->addCompileFunction(this, "operator_length", &compileLength);
+    engine->addCompileFunction(this, "operator_contains", &compileContains);
 }
 
 CompilerValue *OperatorBlocks::compileAdd(Compiler *compiler)
@@ -114,6 +115,13 @@ CompilerValue *OperatorBlocks::compileLength(Compiler *compiler)
     return compiler->addFunctionCall("operator_length", Compiler::StaticType::Number, { Compiler::StaticType::String }, { string });
 }
 
+CompilerValue *OperatorBlocks::compileContains(Compiler *compiler)
+{
+    auto string1 = compiler->addInput("STRING1");
+    auto string2 = compiler->addInput("STRING2");
+    return compiler->addFunctionCall("operator_contains", Compiler::StaticType::Bool, { 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);
@@ -155,3 +163,13 @@ extern "C" double operator_length(const char *string)
     // TODO: Rewrite this
     return utf8::utf8to16(std::string(string)).size();
 }
+
+extern "C" bool operator_contains(const char *string1, const char *string2)
+{
+    // TODO: Rewrite this
+    std::u16string u16string1 = utf8::utf8to16(std::string(string1));
+    std::u16string u16string2 = utf8::utf8to16(std::string(string2));
+    std::transform(u16string1.begin(), u16string1.end(), u16string1.begin(), ::tolower);
+    std::transform(u16string2.begin(), u16string2.end(), u16string2.begin(), ::tolower);
+    return (u16string1.find(u16string2) != std::u16string::npos);
+}

src/dev/blocks/operatorblocks.h

@@ -32,6 +32,7 @@ class OperatorBlocks : public IExtension
         static CompilerValue *compileJoin(Compiler *compiler);
         static CompilerValue *compileLetterOf(Compiler *compiler);
         static CompilerValue *compileLength(Compiler *compiler);
+        static CompilerValue *compileContains(Compiler *compiler);
 };
 
 } // namespace libscratchcpp

test/dev/blocks/operator_blocks_test.cpp

@@ -449,3 +449,64 @@ TEST_F(OperatorBlocksTest, Length)
     ASSERT_EQ(Value(values[1]), 11);
     ASSERT_EQ(Value(values[2]), 9);
 }
+
+TEST_F(OperatorBlocksTest, Contains)
+{
+    auto target = std::make_shared<Sprite>();
+    ScriptBuilder builder(m_extension.get(), m_engine, target);
+
+    builder.addBlock("operator_contains");
+    builder.addValueInput("STRING1", "abc");
+    builder.addValueInput("STRING2", "a");
+    builder.captureBlockReturnValue();
+
+    builder.addBlock("operator_contains");
+    builder.addValueInput("STRING1", "abc");
+    builder.addValueInput("STRING2", "e");
+    builder.captureBlockReturnValue();
+
+    builder.addBlock("operator_contains");
+    builder.addValueInput("STRING1", "abc");
+    builder.addValueInput("STRING2", "C");
+    builder.captureBlockReturnValue();
+
+    builder.addBlock("operator_contains");
+    builder.addValueInput("STRING1", "Hello world");
+    builder.addValueInput("STRING2", "ello");
+    builder.captureBlockReturnValue();
+
+    builder.addBlock("operator_contains");
+    builder.addValueInput("STRING1", "Hello world");
+    builder.addValueInput("STRING2", "olld");
+    builder.captureBlockReturnValue();
+
+    builder.addBlock("operator_contains");
+    builder.addValueInput("STRING1", "ábČ");
+    builder.addValueInput("STRING2", "á");
+    builder.captureBlockReturnValue();
+
+    builder.addBlock("operator_contains");
+    builder.addValueInput("STRING1", "ábČ");
+    builder.addValueInput("STRING2", "bČ");
+    builder.captureBlockReturnValue();
+
+    builder.addBlock("operator_contains");
+    builder.addValueInput("STRING1", "ábČ");
+    builder.addValueInput("STRING2", "ďá");
+    builder.captureBlockReturnValue();
+
+    builder.build();
+    builder.run();
+
+    List *valueList = builder.capturedValues();
+    ValueData *values = valueList->data();
+    ASSERT_EQ(valueList->size(), 8);
+    ASSERT_EQ(Value(values[0]), true);
+    ASSERT_EQ(Value(values[1]), false);
+    ASSERT_EQ(Value(values[2]), true);
+    ASSERT_EQ(Value(values[3]), true);
+    ASSERT_EQ(Value(values[4]), false);
+    ASSERT_EQ(Value(values[5]), true);
+    ASSERT_EQ(Value(values[6]), true);
+    ASSERT_EQ(Value(values[7]), false);
+}