Add list monitor name functions

Author: adazem009

src/blocks/listblocks.cpp

@@ -3,6 +3,8 @@
 #include <scratchcpp/iengine.h>
 #include <scratchcpp/compiler.h>
 #include <scratchcpp/field.h>
+#include <scratchcpp/block.h>
+#include <scratchcpp/list.h>
 
 #include "listblocks.h"
 
@@ -32,6 +34,9 @@ void ListBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "data_lengthoflist", &compileLengthOfList);
     engine->addCompileFunction(this, "data_listcontainsitem", &compileListContainsItem);
 
+    // Monitor names
+    engine->addMonitorNameFunction(this, "data_listcontents", &listContentsMonitorName);
+
     // Inputs
     engine->addInput(this, "ITEM", ITEM);
     engine->addInput(this, "INDEX", INDEX);
@@ -101,3 +106,15 @@ void ListBlocks::compileListContainsItem(Compiler *compiler)
     compiler->addInput(ITEM);
     compiler->addInstruction(vm::OP_LIST_CONTAINS, { compiler->listIndex(compiler->field(LIST)->valuePtr()) });
 }
+
+const std::string &ListBlocks::listContentsMonitorName(Block *block)
+{
+    List *list = dynamic_cast<List *>(block->findFieldById(LIST)->valuePtr().get());
+
+    if (list)
+        return list->name();
+    else {
+        static const std::string empty = "";
+        return empty;
+    }
+}

src/blocks/listblocks.h

@@ -40,6 +40,8 @@ class ListBlocks : public IBlockSection
         static void compileLengthOfList(Compiler *compiler);
         static void compileListContainsItem(Compiler *compiler);
 
+        static const std::string &listContentsMonitorName(Block *block);
+
     private:
         static int validateIndex(size_t index, size_t listLength);
 };

test/blocks/list_blocks_test.cpp

@@ -105,6 +105,9 @@ TEST_F(ListBlocksTest, RegisterBlocks)
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "data_lengthoflist", &ListBlocks::compileLengthOfList)).Times(1);
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "data_listcontainsitem", &ListBlocks::compileListContainsItem)).Times(1);
 
+    // Monitor names
+    EXPECT_CALL(m_engineMock, addMonitorNameFunction(m_section.get(), "data_listcontents", &ListBlocks::listContentsMonitorName));
+
     // Inputs
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "ITEM", ListBlocks::ITEM));
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "INDEX", ListBlocks::INDEX));
@@ -145,6 +148,20 @@ TEST_F(ListBlocksTest, ListContents)
         }));
 }
 
+TEST_F(ListBlocksTest, ListContentsMonitorName)
+{
+    // [list1]
+    auto list1 = std::make_shared<List>("b", "list1");
+    auto block1 = createListBlock("a", "data_listcontents", list1);
+
+    // [list2]
+    auto list2 = std::make_shared<List>("d", "list2");
+    auto block2 = createListBlock("c", "data_listcontents", list2);
+
+    ASSERT_EQ(ListBlocks::listContentsMonitorName(block1.get()), "list1");
+    ASSERT_EQ(ListBlocks::listContentsMonitorName(block2.get()), "list2");
+}
+
 TEST_F(ListBlocksTest, AddToList)
 {
     Compiler compiler(&m_engine);