Implement data_itemnumoflist

Author: adazem009

src/dev/blocks/listblocks.cpp

@@ -28,6 +28,7 @@ void ListBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "data_insertatlist", &compileInsertAtList);
     engine->addCompileFunction(this, "data_replaceitemoflist", &compileReplaceItemOfList);
     engine->addCompileFunction(this, "data_itemoflist", &compileItemOfList);
+    engine->addCompileFunction(this, "data_itemnumoflist", &compileItemNumOfList);
 }
 
 CompilerValue *ListBlocks::compileAddToList(Compiler *compiler)
@@ -170,3 +171,16 @@ CompilerValue *ListBlocks::compileItemOfList(Compiler *compiler)
 
     return nullptr;
 }
+
+CompilerValue *ListBlocks::compileItemNumOfList(Compiler *compiler)
+{
+    List *list = static_cast<List *>(compiler->field("LIST")->valuePtr().get());
+    assert(list);
+
+    if (list) {
+        CompilerValue *item = compiler->addInput("ITEM");
+        return compiler->createAdd(compiler->addListItemIndex(list, item), compiler->addConstValue(1));
+    }
+
+    return nullptr;
+}

src/dev/blocks/listblocks.h

@@ -25,6 +25,7 @@ class ListBlocks : public IExtension
         static CompilerValue *compileInsertAtList(Compiler *compiler);
         static CompilerValue *compileReplaceItemOfList(Compiler *compiler);
         static CompilerValue *compileItemOfList(Compiler *compiler);
+        static CompilerValue *compileItemNumOfList(Compiler *compiler);
 };
 
 } // namespace libscratchcpp

test/dev/blocks/list_blocks_test.cpp

@@ -336,3 +336,46 @@ TEST_F(ListBlocksTest, ItemOfList)
     ASSERT_EQ(testing::internal::GetCapturedStdout(), expected);
     ASSERT_EQ(list->toString(), "Lorem ipsum dolor 123 true");
 }
+
+TEST_F(ListBlocksTest, ItemNumOfList)
+{
+    auto target = std::make_shared<Sprite>();
+
+    auto list = std::make_shared<List>("list", "");
+    list->append("Lorem");
+    list->append("ipsum");
+    list->append("dolor");
+    list->append(123);
+    list->append(true);
+    list->append("dolor");
+    target->addList(list);
+
+    ScriptBuilder builder(m_extension.get(), m_engine, target);
+
+    auto addTest = [&builder](const Value &item, std::shared_ptr<List> list) {
+        builder.addBlock("data_itemnumoflist");
+        builder.addValueInput("ITEM", item);
+        builder.addEntityField("LIST", list);
+        auto block = builder.takeBlock();
+
+        builder.addBlock("test_print");
+        builder.addObscuredInput("STRING", block);
+        return builder.currentBlock();
+    };
+
+    auto block = addTest("dolor", list);
+    addTest(true, list);
+    addTest("nonexistent", list);
+
+    builder.build();
+
+    static const std::string expected =
+        "3\n"
+        "5\n"
+        "0\n";
+
+    testing::internal::CaptureStdout();
+    builder.run();
+    ASSERT_EQ(testing::internal::GetCapturedStdout(), expected);
+    ASSERT_EQ(list->toString(), "Lorem ipsum dolor 123 true dolor");
+}