Block: Add isMonitorBlock property

Author: adazem009

include/scratchcpp/block.h

@@ -23,7 +23,7 @@ class LIBSCRATCHCPP_EXPORT Block : public Entity
     public:
         friend class Engine;
 
-        Block(const std::string &id, const std::string &opcode);
+        Block(const std::string &id, const std::string &opcode, bool isMonitorBlock = false);
         Block(const Block &) = delete;
 
         CompilerValue *compile(Compiler *compiler);
@@ -90,6 +90,8 @@ class LIBSCRATCHCPP_EXPORT Block : public Entity
 
         InputValue *topLevelReporterInfo();
 
+        bool isMonitorBlock() const;
+
     private:
         void updateInputMap();
         void updateFieldMap();

src/scratch/block.cpp

@@ -13,9 +13,9 @@
 using namespace libscratchcpp;
 
 /*! Constructs Block */
-Block::Block(const std::string &id, const std::string &opcode) :
+Block::Block(const std::string &id, const std::string &opcode, bool isMonitorBlock) :
     Entity(id),
-    impl(spimpl::make_unique_impl<BlockPrivate>(opcode))
+    impl(spimpl::make_unique_impl<BlockPrivate>(opcode, isMonitorBlock))
 {
 }
 
@@ -117,6 +117,12 @@ InputValue *Block::topLevelReporterInfo()
         return nullptr;
 }
 
+/*! Returns true if this block belongs to a monitor. */
+bool Block::isMonitorBlock() const
+{
+    return impl->isMonitorBlock;
+}
+
 /*! Returns the next block. */
 std::shared_ptr<Block> Block::next() const
 {

src/scratch/block_p.cpp

@@ -4,7 +4,8 @@
 
 using namespace libscratchcpp;
 
-BlockPrivate::BlockPrivate(const std::string &opcode) :
-    opcode(opcode)
+BlockPrivate::BlockPrivate(const std::string &opcode, bool isMonitorBlock) :
+    opcode(opcode),
+    isMonitorBlock(isMonitorBlock)
 {
 }

src/scratch/block_p.h

@@ -18,7 +18,7 @@ class Comment;
 
 struct BlockPrivate
 {
-        BlockPrivate(const std::string &opcode);
+        BlockPrivate(const std::string &opcode, bool isMonitorBlock);
         BlockPrivate(const BlockPrivate &) = delete;
 
         std::string opcode;
@@ -43,6 +43,7 @@ struct BlockPrivate
         bool mutationHasNext = true;
         bool isTopLevelReporter = false;
         std::unique_ptr<InputValue> topLevelReporterInfo = nullptr;
+        bool isMonitorBlock = false;
 };
 
 } // namespace libscratchcpp

test/scratch_classes/block_test.cpp

@@ -33,9 +33,26 @@ class BlockTest : public testing::Test
 
 TEST_F(BlockTest, Constructors)
 {
-    Block block("abc", "motion_movesteps");
-    ASSERT_EQ(block.id(), "abc");
-    ASSERT_EQ(block.opcode(), "motion_movesteps");
+    {
+        Block block("abc", "motion_movesteps");
+        ASSERT_EQ(block.id(), "abc");
+        ASSERT_EQ(block.opcode(), "motion_movesteps");
+        ASSERT_FALSE(block.isMonitorBlock());
+    }
+
+    {
+        Block block("def", "data_listcontents", false);
+        ASSERT_EQ(block.id(), "def");
+        ASSERT_EQ(block.opcode(), "data_listcontents");
+        ASSERT_FALSE(block.isMonitorBlock());
+    }
+
+    {
+        Block block("ghi", "sensing_of", true);
+        ASSERT_EQ(block.id(), "ghi");
+        ASSERT_EQ(block.opcode(), "sensing_of");
+        ASSERT_TRUE(block.isMonitorBlock());
+    }
 }
 
 TEST_F(BlockTest, Next)