Add looks monitor name functions

Author: adazem009

src/blocks/looksblocks.cpp

@@ -7,6 +7,7 @@
 #include <scratchcpp/input.h>
 #include <scratchcpp/field.h>
 #include <scratchcpp/costume.h>
+#include <scratchcpp/block.h>
 #include <scratchcpp/scratchconfiguration.h>
 
 #include "looksblocks.h"
@@ -42,6 +43,11 @@ void LooksBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "looks_costumenumbername", &compileCostumeNumberName);
     engine->addCompileFunction(this, "looks_backdropnumbername", &compileBackdropNumberName);
 
+    // Monitor names
+    engine->addMonitorNameFunction(this, "looks_costumenumbername", &costumeNumberNameMonitorName);
+    engine->addMonitorNameFunction(this, "looks_backdropnumbername", &backdropNumberNameMonitorName);
+    engine->addMonitorNameFunction(this, "looks_size", &sizeMonitorName);
+
     // Inputs
     engine->addInput(this, "CHANGE", CHANGE);
     engine->addInput(this, "SIZE", SIZE);
@@ -459,6 +465,56 @@ void LooksBlocks::compileBackdropNumberName(Compiler *compiler)
     }
 }
 
+const std::string &LooksBlocks::costumeNumberNameMonitorName(Block *block)
+{
+    int option = block->findFieldById(NUMBER_NAME)->specialValueId();
+
+    switch (option) {
+        case Number: {
+            static const std::string name = "costume number";
+            return name;
+        }
+
+        case Name: {
+            static const std::string name = "costume name";
+            return name;
+        }
+
+        default: {
+            static const std::string name = "";
+            return name;
+        }
+    }
+}
+
+const std::string &LooksBlocks::backdropNumberNameMonitorName(Block *block)
+{
+    int option = block->findFieldById(NUMBER_NAME)->specialValueId();
+
+    switch (option) {
+        case Number: {
+            static const std::string name = "backdrop number";
+            return name;
+        }
+
+        case Name: {
+            static const std::string name = "backdrop name";
+            return name;
+        }
+
+        default: {
+            static const std::string name = "";
+            return name;
+        }
+    }
+}
+
+const std::string &LooksBlocks::sizeMonitorName(Block *block)
+{
+    static const std::string name = "size";
+    return name;
+}
+
 unsigned int LooksBlocks::show(VirtualMachine *vm)
 {
     Sprite *sprite = dynamic_cast<Sprite *>(vm->target());

src/blocks/looksblocks.h

@@ -75,6 +75,10 @@ class LooksBlocks : public IBlockSection
         static void compileCostumeNumberName(Compiler *compiler);
         static void compileBackdropNumberName(Compiler *compiler);
 
+        static const std::string &costumeNumberNameMonitorName(Block *block);
+        static const std::string &backdropNumberNameMonitorName(Block *block);
+        static const std::string &sizeMonitorName(Block *block);
+
         static unsigned int show(VirtualMachine *vm);
         static unsigned int hide(VirtualMachine *vm);
 

test/blocks/looks_blocks_test.cpp

@@ -122,6 +122,11 @@ TEST_F(LooksBlocksTest, RegisterBlocks)
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "looks_costumenumbername", &LooksBlocks::compileCostumeNumberName));
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "looks_backdropnumbername", &LooksBlocks::compileBackdropNumberName));
 
+    // Monitor names
+    EXPECT_CALL(m_engineMock, addMonitorNameFunction(m_section.get(), "looks_costumenumbername", &LooksBlocks::costumeNumberNameMonitorName));
+    EXPECT_CALL(m_engineMock, addMonitorNameFunction(m_section.get(), "looks_backdropnumbername", &LooksBlocks::backdropNumberNameMonitorName));
+    EXPECT_CALL(m_engineMock, addMonitorNameFunction(m_section.get(), "looks_size", &LooksBlocks::sizeMonitorName));
+
     // Inputs
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "CHANGE", LooksBlocks::CHANGE));
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "SIZE", LooksBlocks::SIZE));
@@ -926,6 +931,11 @@ TEST_F(LooksBlocksTest, Size)
     ASSERT_TRUE(compiler.constValues().empty());
 }
 
+TEST_F(LooksBlocksTest, SizeMonitorName)
+{
+    ASSERT_EQ(LooksBlocks::sizeMonitorName(nullptr), "size");
+}
+
 TEST_F(LooksBlocksTest, SizeImpl)
 {
     static unsigned int bytecode[] = { vm::OP_START, vm::OP_EXEC, 0, vm::OP_HALT };
@@ -2767,6 +2777,20 @@ TEST_F(LooksBlocksTest, CostumeNumberName)
     ASSERT_TRUE(compiler.constValues().empty());
 }
 
+TEST_F(LooksBlocksTest, CostumeNumberNameMonitorName)
+{
+    // costume [number]
+    auto block1 = std::make_shared<Block>("a", "looks_costumenumbername");
+    addDropdownField(block1, "NUMBER_NAME", LooksBlocks::NUMBER_NAME, "number", LooksBlocks::Number);
+
+    // costume [name]
+    auto block2 = std::make_shared<Block>("b", "looks_costumenumbername");
+    addDropdownField(block2, "NUMBER_NAME", LooksBlocks::NUMBER_NAME, "name", LooksBlocks::Name);
+
+    ASSERT_EQ(LooksBlocks::costumeNumberNameMonitorName(block1.get()), "costume number");
+    ASSERT_EQ(LooksBlocks::costumeNumberNameMonitorName(block2.get()), "costume name");
+}
+
 TEST_F(LooksBlocksTest, CostumeNumberNameImpl)
 {
     static unsigned int bytecode1[] = { vm::OP_START, vm::OP_EXEC, 0, vm::OP_HALT };
@@ -2845,6 +2869,20 @@ TEST_F(LooksBlocksTest, BackdropNumberName)
     ASSERT_TRUE(compiler.constValues().empty());
 }
 
+TEST_F(LooksBlocksTest, BackdropNumberNameMonitorName)
+{
+    // backdrop [number]
+    auto block1 = std::make_shared<Block>("a", "looks_backdropnumbername");
+    addDropdownField(block1, "NUMBER_NAME", LooksBlocks::NUMBER_NAME, "number", LooksBlocks::Number);
+
+    // backdrop [name]
+    auto block2 = std::make_shared<Block>("b", "looks_backdropnumbername");
+    addDropdownField(block2, "NUMBER_NAME", LooksBlocks::NUMBER_NAME, "name", LooksBlocks::Name);
+
+    ASSERT_EQ(LooksBlocks::backdropNumberNameMonitorName(block1.get()), "backdrop number");
+    ASSERT_EQ(LooksBlocks::backdropNumberNameMonitorName(block2.get()), "backdrop name");
+}
+
 TEST_F(LooksBlocksTest, BackdropNumberNameImpl)
 {
     static unsigned int bytecode1[] = { vm::OP_START, vm::OP_EXEC, 0, vm::OP_HALT };