Optimize inputs and fields

* assign IDs to inputs and fields using maps

Author: adazem009

src/engine/blockargs.cpp

@@ -56,9 +56,9 @@ std::shared_ptr<Input> BlockArgs::input(const char *name) const
 }
 
 /*! Returns the input with the given ID. */
-std::shared_ptr<Input> BlockArgs::input(int id) const
+Input *BlockArgs::input(int id) const
 {
-    return m_block->inputAt(m_block->findInputById(id));
+    return m_block->findInputById(id);
 }
 
 /*! Returns the field with the given name. */
@@ -74,9 +74,9 @@ std::shared_ptr<Field> BlockArgs::field(const char *name) const
 }
 
 /*! Returns the field with the given ID. */
-std::shared_ptr<Field> BlockArgs::field(int id) const
+Field *BlockArgs::field(int id) const
 {
-    return m_block->fieldAt(m_block->findFieldById(id));
+    return m_block->findFieldById(id);
 }
 
 } // namespace libscratchcpp

src/engine/blockargs.h

@@ -28,11 +28,11 @@ class LIBSCRATCHCPP_EXPORT BlockArgs
 
         std::shared_ptr<Input> input(const std::string &name) const;
         std::shared_ptr<Input> input(const char *name) const;
-        std::shared_ptr<Input> input(int id) const;
+        Input *input(int id) const;
 
         std::shared_ptr<Field> field(const std::string &name) const;
         std::shared_ptr<Field> field(const char *name) const;
-        std::shared_ptr<Field> field(int id) const;
+        Field *field(int id) const;
 
     private:
         Target *m_target = nullptr;

src/engine/engine.cpp

@@ -58,6 +58,9 @@ void Engine::compile()
                         field->setSpecialValueId(section->resolveFieldValue(field->value().toString()));
                 }
             }
+
+            block->updateInputMap();
+            block->updateFieldMap();
         }
     }
 }

src/scratch/block.cpp

@@ -133,16 +133,20 @@ int Block::findInput(const std::string &inputName) const
     return -1;
 }
 
-/*! Returns the index of the input with the given ID. */
-int Block::findInputById(int id)
+/*! Returns the input with the given ID. */
+Input *Block::findInputById(int id) const
 {
-    int i = 0;
-    for (auto input : m_inputs) {
-        if (input->inputId() == id)
-            return i;
-        i++;
-    }
-    return -1;
+    if (m_inputMap.count(id) == 1)
+        return m_inputMap.at(id);
+    return nullptr;
+}
+
+/*! Updates the map that assigns input IDs to input indexes. Used internally by Engine. */
+void Block::updateInputMap()
+{
+    m_inputMap.clear();
+    for (auto input : m_inputs)
+        m_inputMap[input->inputId()] = input.get();
 }
 
 /*! Returns the list of fields. */
@@ -177,15 +181,19 @@ int Block::findField(const std::string &fieldName) const
 }
 
 /*! Returns the index of the field with the given ID. */
-int Block::findFieldById(int id) const
+Field *Block::findFieldById(int id) const
 {
-    int i = 0;
-    for (auto field : m_fields) {
-        if (field->fieldId() == id)
-            return i;
-        i++;
-    }
-    return -1;
+    if (m_fieldMap.count(id) == 1)
+        return m_fieldMap.at(id);
+    return nullptr;
+}
+
+/*! Updates the map that assigns input IDs to input indexes. Used internally by Engine. */
+void Block::updateFieldMap()
+{
+    m_fieldMap.clear();
+    for (auto field : m_fields)
+        m_fieldMap[field->fieldId()] = field.get();
 }
 
 /*! Returns true if this is a shadow block. */

src/scratch/block.h

@@ -7,6 +7,7 @@
 #include "ientity.h"
 #include "input.h"
 #include <memory>
+#include <map>
 #include <string>
 
 namespace libscratchcpp
@@ -40,13 +41,15 @@ class LIBSCRATCHCPP_EXPORT Block : public IEntity
         int addInput(std::shared_ptr<Input> input);
         std::shared_ptr<Input> inputAt(int index) const;
         int findInput(const std::string &inputName) const;
-        int findInputById(int id);
+        Input *findInputById(int id) const;
+        void updateInputMap();
 
         std::vector<std::shared_ptr<Field>> fields() const;
         int addField(std::shared_ptr<Field> field);
         std::shared_ptr<Field> fieldAt(int index) const;
         int findField(const std::string &fieldName) const;
-        int findFieldById(int id) const;
+        Field *findFieldById(int id) const;
+        void updateFieldMap();
 
         bool shadow() const;
         void setShadow(bool newShadow);
@@ -66,7 +69,9 @@ class LIBSCRATCHCPP_EXPORT Block : public IEntity
         std::shared_ptr<Block> m_parent = nullptr;
         std::string m_parentId;
         std::vector<std::shared_ptr<Input>> m_inputs;
+        std::unordered_map<int, Input *> m_inputMap;
         std::vector<std::shared_ptr<Field>> m_fields;
+        std::unordered_map<int, Field *> m_fieldMap;
         bool m_shadow = false;
         bool m_topLevel = false;
         Engine *m_engine = nullptr;

src/scratch/runningscript.cpp

@@ -104,9 +104,9 @@ void RunningScript::moveToSubstack(const BlockArgs &args, int inputId)
 std::shared_ptr<Block> RunningScript::getSubstack(const BlockArgs &args, int inputId) const
 {
     auto block = args.block();
-    int index = block->findInputById(inputId);
-    if (index != -1) {
-        auto ret = block->inputAt(index)->valueBlock();
+    auto input = block->findInputById(inputId);
+    if (input) {
+        auto ret = input->valueBlock();
         if (ret)
             return ret;
     }