Merge extensions and block sections

Author: adazem009

CMakeLists.txt

@@ -31,7 +31,6 @@ target_sources(scratchcpp
     include/scratchcpp/scratchconfiguration.h
     include/scratchcpp/iengine.h
     include/scratchcpp/iextension.h
-    include/scratchcpp/iblocksection.h
     include/scratchcpp/thread.h
     include/scratchcpp/asset.h
     include/scratchcpp/costume.h

include/scratchcpp/iblocksection.h

@@ -14,7 +14,7 @@
 namespace libscratchcpp
 {
 
-class IBlockSection;
+class IExtension;
 class Broadcast;
 class Block;
 class Target;
@@ -217,66 +217,60 @@ class LIBSCRATCHCPP_EXPORT IEngine
         /*! Returns the timer of the project. */
         virtual ITimer *timer() const = 0;
 
-        /*!
-         * Registers the given block section.
-         * \see <a href="blockSections.html">Block sections</a>
-         */
-        virtual void registerSection(std::shared_ptr<IBlockSection> section) = 0;
-
         /*! Returns the index of the given block function. */
         virtual unsigned int functionIndex(BlockFunc f) = 0;
 
         /*! Returns the list of block functions. */
         virtual const std::vector<BlockFunc> &blockFunctions() const = 0;
 
         /*!
-         * Call this from IBlockSection#registerBlocks() to add a compile function to a block section.
-         * \see <a href="blockSections.html">Block sections</a>
+         * Call this from IExtension#registerBlocks() to add a compile function to a block section.
+         * \see <a href="extensions.html">Extensions</a>
          */
-        virtual void addCompileFunction(IBlockSection *section, const std::string &opcode, BlockComp f) = 0;
+        virtual void addCompileFunction(IExtension *extension, const std::string &opcode, BlockComp f) = 0;
 
         /*!
-         * Call this from IBlockSection#registerBlocks() to add a hat block predicate compile function to a block section.
+         * Call this from IExtension#registerBlocks() to add a hat block predicate compile function to a block section.
          * \note This only works with edge-activated hats.
-         * \see <a href="blockSections.html">Block sections</a>
+         * \see <a href="extensions.html">Extensions</a>
          */
-        virtual void addHatPredicateCompileFunction(IBlockSection *section, const std::string &opcode, HatPredicateCompileFunc f) = 0;
+        virtual void addHatPredicateCompileFunction(IExtension *extension, const std::string &opcode, HatPredicateCompileFunc f) = 0;
 
         /*!
-         * Call this from IBlockSection#registerBlocks() to add a monitor name function to a block section.
-         * \see <a href="blockSections.html">Block sections</a>
+         * Call this from IExtension#registerBlocks() to add a monitor name function to a block section.
+         * \see <a href="extensions.html">Extensions</a>
          */
-        virtual void addMonitorNameFunction(IBlockSection *section, const std::string &opcode, MonitorNameFunc f) = 0;
+        virtual void addMonitorNameFunction(IExtension *extension, const std::string &opcode, MonitorNameFunc f) = 0;
 
         /*!
-         * Call this from IBlockSection#registerBlocks() to add a monitor value change function to a block section.
-         * \see <a href="blockSections.html">Block sections</a>
+         * Call this from IExtension#registerBlocks() to add a monitor value change function to a block section.
+         * \see <a href="extensions.html">Extensions</a>
          */
-        virtual void addMonitorChangeFunction(IBlockSection *section, const std::string &opcode, MonitorChangeFunc f) = 0;
+        virtual void addMonitorChangeFunction(IExtension *extension, const std::string &opcode, MonitorChangeFunc f) = 0;
 
         /*!
-         * Call this from IBlockSection#registerBlocks() to add a hat block to a block section.
-         * \see <a href="blockSections.html">Block sections</a>
+         * Call this from IExtension#registerBlocks() to add a hat block to a block section.
+         * \see <a href="extensions.html">Extensions</a>
          */
-        virtual void addHatBlock(IBlockSection *section, const std::string &opcode) = 0;
+        virtual void addHatBlock(IExtension *extension, const std::string &opcode) = 0;
 
         /*!
-         * Call this from IBlockSection#registerBlocks() to add an input to a block section.
-         * \see <a href="blockSections.html">Block sections</a>
+         * Call this from IExtension#registerBlocks() to add an input to a block section.
+         * \see <a href="extensions.html">Extensions</a>
          */
-        virtual void addInput(IBlockSection *section, const std::string &name, int id) = 0;
+        virtual void addInput(IExtension *extension, const std::string &name, int id) = 0;
 
         /*!
-         * Call this from IBlockSection#registerBlocks() to add a field to a block section.
-         * \see <a href="blockSections.html">Block sections</a>
+         * Call this from IExtension#registerBlocks() to add a field to a block section.
+         * \see <a href="extensions.html">Extensions</a>
          */
-        virtual void addField(IBlockSection *section, const std::string &name, int id) = 0;
+        virtual void addField(IExtension *extension, const std::string &name, int id) = 0;
 
         /*!
-         * Call this from IBlockSection#registerBlocks() to add a field value to a block section.
-         * \see <a href="blockSections.html">Block sections</a>
+         * Call this from IExtension#registerBlocks() to add a field value to a block section.
+         * \see <a href="extensions.html">Extensions</a>
          */
-        virtual void addFieldValue(IBlockSection *section, const std::string &value, int id) = 0;
+        virtual void addFieldValue(IExtension *extension, const std::string &value, int id) = 0;
 
         /*! Returns the list of broadcasts. */
         virtual const std::vector<std::shared_ptr<Broadcast>> &broadcasts() const = 0;
@@ -381,11 +375,13 @@ class LIBSCRATCHCPP_EXPORT IEngine
         /*! Emits when a question is answered. */
         virtual sigslot::signal<const std::string &> &questionAnswered() = 0;
 
+#ifndef USE_LLVM
         /*! Returns the list of extension names. */
         virtual const std::vector<std::string> &extensions() const = 0;
 
         /*! Sets the list of extension names. */
         virtual void setExtensions(const std::vector<std::string> &newExtensions) = 0;
+#endif
 
         /*! Returns the map of scripts (each top level block has a Script object). */
         virtual const std::unordered_map<std::shared_ptr<Block>, std::shared_ptr<Script>> &scripts() const = 0;

include/scratchcpp/iengine.h

@@ -27,14 +27,11 @@ class LIBSCRATCHCPP_EXPORT IExtension
         /*! Returns the description of the extension. */
         virtual std::string description() const = 0;
 
-        /*!
-         * Returns true if the extension is hidden from the block palette
-         * and should be available in a Scratch project by default
-         */
-        virtual bool includeByDefault() const { return false; }
-
-        /*! Registers block sections. \see <a href="blockSections.html">Block sections</a> */
-        virtual void registerSections(IEngine *engine) = 0;
+        /*! Override this method to register blocks. */
+        virtual void registerBlocks(IEngine *engine) = 0;
+
+        /*! This method is called when a project is loaded. */
+        virtual void onInit(IEngine *engine) { }
 };
 
 } // namespace libscratchcpp

include/scratchcpp/iextension.h

@@ -12,7 +12,7 @@ namespace libscratchcpp
 class IMonitorHandler;
 class Block;
 class Script;
-class IBlockSection;
+class IExtension;
 class Sprite;
 class Value;
 class Rect;
@@ -48,8 +48,8 @@ class LIBSCRATCHCPP_EXPORT Monitor : public Entity
         std::shared_ptr<Script> script() const;
         void setScript(std::shared_ptr<Script> script);
 
-        std::shared_ptr<IBlockSection> blockSection() const;
-        void setBlockSection(std::shared_ptr<IBlockSection> blockSection);
+        IExtension *extension() const;
+        void setExtension(IExtension *extension);
 
         Sprite *sprite() const;
         void setSprite(Sprite *sprite);

include/scratchcpp/monitor.h

@@ -21,6 +21,7 @@ class LIBSCRATCHCPP_EXPORT ScratchConfiguration
         ScratchConfiguration() = delete;
 
         static void registerExtension(std::shared_ptr<IExtension> extension);
+        static void removeExtension(std::shared_ptr<IExtension> extension);
         static IExtension *getExtension(const std::string &name);
 
         /*! Finds the extension of class T. Returns nullptr if it isn't registered. */

include/scratchcpp/scratchconfiguration.h

@@ -1,26 +1,115 @@
 target_sources(scratchcpp
   PRIVATE
-    standardblocks.cpp
-    standardblocks.h
-    motionblocks.cpp
-    looksblocks.cpp
-    soundblocks.cpp
-    eventblocks.cpp
-    controlblocks.cpp
-    sensingblocks.cpp
-    operatorblocks.cpp
-    variableblocks.cpp
-    listblocks.cpp
-    customblocks.cpp
-  PUBLIC
-    motionblocks.h
-    looksblocks.h
-    soundblocks.h
-    eventblocks.h
-    controlblocks.h
-    sensingblocks.h
-    operatorblocks.h
-    variableblocks.h
-    listblocks.h
-    customblocks.h
+    blocks.cpp
+    blocks.h
 )
+
+# Motion blocks
+option(LIBSCRATCHCPP_ENABLE_MOTION_BLOCKS "Motion blocks support" ON)
+if (LIBSCRATCHCPP_ENABLE_MOTION_BLOCKS)
+    target_compile_definitions(scratchcpp PRIVATE ENABLE_MOTION_BLOCKS)
+    target_sources(scratchcpp
+      PRIVATE
+        motionblocks.cpp
+        motionblocks.h
+    )
+endif()
+
+# Looks blocks
+option(LIBSCRATCHCPP_ENABLE_LOOKS_BLOCKS "Looks blocks support" ON)
+if (LIBSCRATCHCPP_ENABLE_LOOKS_BLOCKS)
+    target_compile_definitions(scratchcpp PRIVATE ENABLE_LOOKS_BLOCKS)
+    target_sources(scratchcpp
+      PRIVATE
+        looksblocks.cpp
+        looksblocks.h
+    )
+endif()
+
+# Sound blocks
+option(LIBSCRATCHCPP_ENABLE_SOUND_BLOCKS "Sound blocks support" ON)
+if (LIBSCRATCHCPP_ENABLE_SOUND_BLOCKS)
+    target_compile_definitions(scratchcpp PRIVATE ENABLE_SOUND_BLOCKS)
+    target_sources(scratchcpp
+      PRIVATE
+        soundblocks.cpp
+        soundblocks.h
+    )
+endif()
+
+# Event blocks
+option(LIBSCRATCHCPP_ENABLE_EVENT_BLOCKS "Event blocks support" ON)
+if (LIBSCRATCHCPP_ENABLE_EVENT_BLOCKS)
+    target_compile_definitions(scratchcpp PRIVATE ENABLE_EVENT_BLOCKS)
+    target_sources(scratchcpp
+      PRIVATE
+        eventblocks.cpp
+        eventblocks.h
+    )
+endif()
+
+# Control blocks
+option(LIBSCRATCHCPP_ENABLE_CONTROL_BLOCKS "Control blocks support" ON)
+if (LIBSCRATCHCPP_ENABLE_CONTROL_BLOCKS)
+    target_compile_definitions(scratchcpp PRIVATE ENABLE_CONTROL_BLOCKS)
+    target_sources(scratchcpp
+      PRIVATE
+        controlblocks.cpp
+        controlblocks.h
+    )
+endif()
+
+# Sensing blocks
+option(LIBSCRATCHCPP_ENABLE_SENSING_BLOCKS "Sensing blocks support" ON)
+if (LIBSCRATCHCPP_ENABLE_SENSING_BLOCKS)
+    target_compile_definitions(scratchcpp PRIVATE ENABLE_SENSING_BLOCKS)
+    target_sources(scratchcpp
+      PRIVATE
+        sensingblocks.cpp
+        sensingblocks.h
+    )
+endif()
+
+# Operator blocks
+option(LIBSCRATCHCPP_ENABLE_OPERATOR_BLOCKS "Operator blocks support" ON)
+if (LIBSCRATCHCPP_ENABLE_OPERATOR_BLOCKS)
+    target_compile_definitions(scratchcpp PRIVATE ENABLE_OPERATOR_BLOCKS)
+    target_sources(scratchcpp
+      PRIVATE
+        operatorblocks.cpp
+        operatorblocks.h
+    )
+endif()
+
+# Variable blocks
+option(LIBSCRATCHCPP_ENABLE_VARIABLE_BLOCKS "Variable blocks support" ON)
+if (LIBSCRATCHCPP_ENABLE_VARIABLE_BLOCKS)
+    target_compile_definitions(scratchcpp PRIVATE ENABLE_VARIABLE_BLOCKS)
+    target_sources(scratchcpp
+      PRIVATE
+        variableblocks.cpp
+        variableblocks.h
+    )
+endif()
+
+# List blocks
+option(LIBSCRATCHCPP_ENABLE_LIST_BLOCKS "List blocks support" ON)
+if (LIBSCRATCHCPP_ENABLE_LIST_BLOCKS)
+    target_compile_definitions(scratchcpp PRIVATE ENABLE_LIST_BLOCKS)
+    target_sources(scratchcpp
+      PRIVATE
+        listblocks.cpp
+        listblocks.h
+    )
+endif()
+
+# Custom blocks
+option(LIBSCRATCHCPP_ENABLE_CUSTOM_BLOCKS "Custom blocks support" ON)
+if (LIBSCRATCHCPP_ENABLE_CUSTOM_BLOCKS)
+    target_compile_definitions(scratchcpp PRIVATE ENABLE_CUSTOM_BLOCKS)
+    target_sources(scratchcpp
+      PRIVATE
+        customblocks.cpp
+        customblocks.h
+    )
+endif()