Add hatPredicateCompileFunction property to Block

Author: adazem009

include/scratchcpp/block.h

@@ -70,6 +70,9 @@ class LIBSCRATCHCPP_EXPORT Block : public Entity
         BlockComp compileFunction() const;
         void setCompileFunction(BlockComp newCompileFunction);
 
+        BlockComp hatPredicateCompileFunction() const;
+        void setHatPredicateCompileFunction(HatPredicateCompileFunc newHatPredicateCompileFunction);
+
         bool mutationHasNext() const;
         void setMutationHasNext(bool newMutationHasNext);
 

include/scratchcpp/global.h

@@ -62,6 +62,13 @@ using MonitorNameFunc = const std::string &(*)(Block *);
  */
 using MonitorChangeFunc = void (*)(Block *, const Value &newValue);
 
+/*!
+ * \typedef HatPredicateCompileFunc
+ *
+ * HatPredicateCompileFunc is a function pointer for functions which are used to compile edge-activated hat predicates to bytecode.
+ */
+using HatPredicateCompileFunc = void (*)(Compiler *vm);
+
 } // namespace libscratchcpp
 
 #endif // LIBSCRATCHCPP_GLOBAL_H

src/scratch/block.cpp

@@ -4,6 +4,7 @@
 #include <scratchcpp/input.h>
 #include <scratchcpp/field.h>
 #include <scratchcpp/comment.h>
+#include <iostream>
 
 #include "block_p.h"
 
@@ -41,6 +42,24 @@ void Block::setCompileFunction(BlockComp newCompileFunction)
     impl->compileFunction = newCompileFunction;
 }
 
+/*! Returns the edge-activated hat predicate compile function. \see <a href="blockSections.html">Block sections</a> */
+BlockComp Block::hatPredicateCompileFunction() const
+{
+    return impl->hatPredicateCompileFunction;
+}
+
+/*! Sets the edge-activated hat predicate compile function. \see <a href="blockSections.html">Block sections</a> */
+void Block::setHatPredicateCompileFunction(HatPredicateCompileFunc newHatPredicateCompileFunction)
+{
+    if (newHatPredicateCompileFunction && !topLevel()) {
+        std::cerr << "error: predicate compile functions can be only used on top-level blocks" << std::endl;
+        assert(false);
+        return;
+    }
+
+    impl->hatPredicateCompileFunction = newHatPredicateCompileFunction;
+}
+
 /*! Returns true if the block can have a block following it. */
 bool Block::mutationHasNext() const
 {

src/scratch/block_p.h

@@ -23,6 +23,7 @@ struct BlockPrivate
 
         std::string opcode;
         BlockComp compileFunction = nullptr;
+        HatPredicateCompileFunc hatPredicateCompileFunction = nullptr;
         std::shared_ptr<Block> next = nullptr;
         std::string nextId;
         std::shared_ptr<Block> parent = nullptr;

test/scratch_classes/block_test.cpp

@@ -247,6 +247,15 @@ TEST_F(BlockTest, CompileFunction)
     ASSERT_EQ(block.compileFunction(), &compileTest);
 }
 
+TEST_F(BlockTest, HatPredicateCompileFunction)
+{
+    Block block("", "");
+    ASSERT_EQ(block.hatPredicateCompileFunction(), nullptr);
+
+    block.setHatPredicateCompileFunction(&compileTest);
+    ASSERT_EQ(block.hatPredicateCompileFunction(), &compileTest);
+}
+
 TEST_F(BlockTest, Compile)
 {
     Block block("", "");