Implement operator_and

Author: adazem009

src/dev/blocks/operatorblocks.cpp

@@ -28,6 +28,7 @@ void OperatorBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "operator_lt", &compileLt);
     engine->addCompileFunction(this, "operator_equals", &compileEquals);
     engine->addCompileFunction(this, "operator_gt", &compileGt);
+    engine->addCompileFunction(this, "operator_and", &compileAnd);
 }
 
 CompilerValue *OperatorBlocks::compileAdd(Compiler *compiler)
@@ -71,3 +72,8 @@ CompilerValue *OperatorBlocks::compileGt(Compiler *compiler)
 {
     return compiler->createCmpGT(compiler->addInput("OPERAND1"), compiler->addInput("OPERAND2"));
 }
+
+CompilerValue *OperatorBlocks::compileAnd(Compiler *compiler)
+{
+    return compiler->createAnd(compiler->addInput("OPERAND1"), compiler->addInput("OPERAND2"));
+}

src/dev/blocks/operatorblocks.h

@@ -26,6 +26,7 @@ class OperatorBlocks : public IExtension
         static CompilerValue *compileLt(Compiler *compiler);
         static CompilerValue *compileEquals(Compiler *compiler);
         static CompilerValue *compileGt(Compiler *compiler);
+        static CompilerValue *compileAnd(Compiler *compiler);
 };
 
 } // namespace libscratchcpp

test/dev/blocks/operator_blocks_test.cpp

@@ -256,3 +256,40 @@ TEST_F(OperatorBlocksTest, Gt)
     ASSERT_EQ(Value(values[1]), true);
     ASSERT_EQ(Value(values[2]), false);
 }
+
+TEST_F(OperatorBlocksTest, And)
+{
+    auto target = std::make_shared<Sprite>();
+    ScriptBuilder builder(m_extension.get(), m_engine, target);
+
+    builder.addBlock("operator_and");
+    builder.addValueInput("OPERAND1", false);
+    builder.addValueInput("OPERAND2", false);
+    builder.captureBlockReturnValue();
+
+    builder.addBlock("operator_and");
+    builder.addValueInput("OPERAND1", true);
+    builder.addValueInput("OPERAND2", false);
+    builder.captureBlockReturnValue();
+
+    builder.addBlock("operator_and");
+    builder.addValueInput("OPERAND1", false);
+    builder.addValueInput("OPERAND2", true);
+    builder.captureBlockReturnValue();
+
+    builder.addBlock("operator_and");
+    builder.addValueInput("OPERAND1", true);
+    builder.addValueInput("OPERAND2", true);
+    builder.captureBlockReturnValue();
+
+    builder.build();
+    builder.run();
+
+    List *valueList = builder.capturedValues();
+    ValueData *values = valueList->data();
+    ASSERT_EQ(valueList->size(), 4);
+    ASSERT_EQ(Value(values[0]), false);
+    ASSERT_EQ(Value(values[1]), false);
+    ASSERT_EQ(Value(values[2]), false);
+    ASSERT_EQ(Value(values[3]), true);
+}