Add variable monitor name functions

Author: adazem009

src/blocks/variableblocks.cpp

@@ -3,6 +3,8 @@
 #include <scratchcpp/iengine.h>
 #include <scratchcpp/compiler.h>
 #include <scratchcpp/field.h>
+#include <scratchcpp/block.h>
+#include <scratchcpp/variable.h>
 
 #include "variableblocks.h"
 
@@ -20,6 +22,9 @@ void VariableBlocks::registerBlocks(IEngine *engine)
     engine->addCompileFunction(this, "data_setvariableto", &compileSetVariable);
     engine->addCompileFunction(this, "data_changevariableby", &compileChangeVariableBy);
 
+    // Monitor names
+    engine->addMonitorNameFunction(this, "data_variable", &variableMonitorName);
+
     // Inputs
     engine->addInput(this, "VALUE", VALUE);
 
@@ -44,3 +49,15 @@ void VariableBlocks::compileChangeVariableBy(Compiler *compiler)
     compiler->addInput(VALUE);
     compiler->addInstruction(vm::OP_CHANGE_VAR, { compiler->variableIndex(compiler->field(VARIABLE)->valuePtr()) });
 }
+
+const std::string &VariableBlocks::variableMonitorName(Block *block)
+{
+    Variable *var = dynamic_cast<Variable *>(block->findFieldById(VARIABLE)->valuePtr().get());
+
+    if (var)
+        return var->name();
+    else {
+        static const std::string empty = "";
+        return empty;
+    }
+}

src/blocks/variableblocks.h

@@ -30,6 +30,8 @@ class VariableBlocks : public IBlockSection
         static void compileVariable(Compiler *compiler);
         static void compileSetVariable(Compiler *compiler);
         static void compileChangeVariableBy(Compiler *compiler);
+
+        static const std::string &variableMonitorName(Block *block);
 };
 
 } // namespace libscratchcpp

test/blocks/variable_blocks_test.cpp

@@ -71,6 +71,9 @@ TEST_F(VariableBlocksTest, RegisterBlocks)
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "data_setvariableto", &VariableBlocks::compileSetVariable)).Times(1);
     EXPECT_CALL(m_engineMock, addCompileFunction(m_section.get(), "data_changevariableby", &VariableBlocks::compileChangeVariableBy)).Times(1);
 
+    // Monitor names
+    EXPECT_CALL(m_engineMock, addMonitorNameFunction(m_section.get(), "data_variable", &VariableBlocks::variableMonitorName));
+
     // Inputs
     EXPECT_CALL(m_engineMock, addInput(m_section.get(), "VALUE", VariableBlocks::VALUE));
 
@@ -110,6 +113,20 @@ TEST_F(VariableBlocksTest, Variable)
     ASSERT_TRUE(compiler.lists().empty());
 }
 
+TEST_F(VariableBlocksTest, VariableMonitorName)
+{
+    // [var1]
+    auto var1 = std::make_shared<Variable>("b", "var1");
+    auto block1 = createVariableBlock("a", "data_variable", var1);
+
+    // [var2]
+    auto var2 = std::make_shared<Variable>("d", "var2");
+    auto block2 = createVariableBlock("c", "data_variable", var2);
+
+    ASSERT_EQ(VariableBlocks::variableMonitorName(block1.get()), "var1");
+    ASSERT_EQ(VariableBlocks::variableMonitorName(block2.get()), "var2");
+}
+
 TEST_F(VariableBlocksTest, SetVariableTo)
 {
     Compiler compiler(&m_engine);