Remove obsolete input/field IDs

Author: adazem009

include/scratchcpp/block.h

@@ -23,8 +23,6 @@ class LIBSCRATCHCPP_EXPORT Block
     , public std::enable_shared_from_this<Block>
 {
     public:
-        friend class Engine;
-
         Block(const std::string &id, const std::string &opcode, bool isMonitorBlock = false);
         Block(const Block &) = delete;
 
@@ -46,13 +44,11 @@ class LIBSCRATCHCPP_EXPORT Block
         int addInput(std::shared_ptr<Input> input);
         std::shared_ptr<Input> inputAt(int index) const;
         int findInput(const std::string &inputName) const;
-        Input *findInputById(int id) const;
 
         const 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;
-        Field *findFieldById(int id) const;
 
         bool shadow() const;
         void setShadow(bool newShadow);
@@ -95,9 +91,6 @@ class LIBSCRATCHCPP_EXPORT Block
         bool isMonitorBlock() const;
 
     private:
-        void updateInputMap();
-        void updateFieldMap();
-
         spimpl::unique_impl_ptr<BlockPrivate> impl;
 };
 

include/scratchcpp/field.h

@@ -26,19 +26,13 @@ class LIBSCRATCHCPP_EXPORT Field
 
         const std::string &name() const;
 
-        int fieldId() const;
-        void setFieldId(int newFieldId);
-
         const Value &value() const;
 
         std::shared_ptr<Entity> valuePtr() const;
         void setValuePtr(const std::shared_ptr<Entity> &newValuePtr);
 
         const std::string &valueId() const;
 
-        int specialValueId() const;
-        void setSpecialValueId(int newSpecialValueId);
-
     private:
         spimpl::unique_impl_ptr<FieldPrivate> impl;
 };

include/scratchcpp/iengine.h

@@ -249,24 +249,6 @@ class LIBSCRATCHCPP_EXPORT IEngine
          */
         virtual void addHatBlock(IExtension *extension, const std::string &opcode) = 0;
 
-        /*!
-         * Call this from IExtension#registerBlocks() to add an input to a block section.
-         * \see <a href="extensions.html">Extensions</a>
-         */
-        virtual void addInput(IExtension *extension, const std::string &name, int id) = 0;
-
-        /*!
-         * Call this from IExtension#registerBlocks() to add a field to a block section.
-         * \see <a href="extensions.html">Extensions</a>
-         */
-        virtual void addField(IExtension *extension, const std::string &name, int id) = 0;
-
-        /*!
-         * Call this from IExtension#registerBlocks() to add a field value to a block section.
-         * \see <a href="extensions.html">Extensions</a>
-         */
-        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;
 

include/scratchcpp/input.h

@@ -29,9 +29,6 @@ class LIBSCRATCHCPP_EXPORT Input
 
         const std::string &name() const;
 
-        int inputId() const;
-        void setInputId(int newInputId);
-
         Type type() const;
 
         InputValue *primaryValue();

src/engine/internal/engine.cpp

@@ -118,9 +118,6 @@ void Engine::resolveIds()
             for (const auto &input : inputs) {
                 input->setValueBlock(getBlock(input->valueBlockId(), target.get()).get());
 
-                if (ext)
-                    input->setInputId(resolveInput(ext, input->name()));
-
                 InputValue *value = input->primaryValue();
                 std::string id = value->valueId(); // no reference!
                 value->setValuePtr(getEntity(id, target.get()));
@@ -150,13 +147,6 @@ void Engine::resolveIds()
                 std::string id = field->valueId(); // no reference!
                 field->setValuePtr(getEntity(id, target.get()));
 
-                if (ext) {
-                    field->setFieldId(resolveField(ext, field->name()));
-
-                    if (!field->valuePtr())
-                        field->setSpecialValueId(resolveFieldValue(ext, field->value().toString()));
-                }
-
                 // TODO: Move field information out of Engine
                 if (!field->valuePtr()) {
                     if (field->name() == "VARIABLE") {
@@ -175,9 +165,6 @@ void Engine::resolveIds()
                 }
             }
 
-            block->updateInputMap();
-            block->updateFieldMap();
-
             auto comment = getComment(block->commentId(), target.get());
             block->setComment(comment);
 
@@ -210,13 +197,6 @@ void Engine::resolveIds()
         for (auto field : fields) {
             field->setValuePtr(getEntity(field->valueId(), target));
 
-            if (ext) {
-                field->setFieldId(resolveField(ext, field->name()));
-
-                if (!field->valuePtr())
-                    field->setSpecialValueId(resolveFieldValue(ext, field->value().toString()));
-            }
-
             // TODO: Move field information out of Engine
             if (field->name() == "VARIABLE") {
                 std::string name = field->value().toString();
@@ -248,9 +228,6 @@ void Engine::resolveIds()
                 list->setMonitor(monitor.get());
             }
         }
-
-        block->updateInputMap();
-        block->updateFieldMap();
     }
 }
 
@@ -971,30 +948,6 @@ void Engine::addHatBlock(IExtension *extension, const std::string &opcode)
     m_compileFunctions[extension][opcode] = [](Compiler *compiler) -> CompilerValue * { return nullptr; };
 }
 
-void Engine::addInput(IExtension *extension, const std::string &name, int id)
-{
-    if (m_inputs.find(extension) == m_inputs.cend())
-        m_inputs[extension] = {};
-
-    m_inputs[extension][name] = id;
-}
-
-void Engine::addField(IExtension *extension, const std::string &name, int id)
-{
-    if (m_fields.find(extension) == m_fields.cend())
-        m_fields[extension] = {};
-
-    m_fields[extension][name] = id;
-}
-
-void Engine::addFieldValue(IExtension *extension, const std::string &value, int id)
-{
-    if (m_fieldValues.find(extension) == m_fieldValues.cend())
-        m_fieldValues[extension] = {};
-
-    m_fieldValues[extension][value] = id;
-}
-
 const std::vector<std::shared_ptr<Broadcast>> &Engine::broadcasts() const
 {
     return m_broadcasts;
@@ -1733,9 +1686,6 @@ void Engine::clearExtensionData()
     m_hatPredicateCompileFunctions.clear();
     m_monitorNameFunctions.clear();
     m_monitorChangeFunctions.clear();
-    m_inputs.clear();
-    m_fields.clear();
-    m_fieldValues.clear();
 }
 
 IExtension *Engine::blockExtension(const std::string &opcode) const
@@ -1818,57 +1768,6 @@ MonitorChangeFunc Engine::resolveMonitorChangeFunc(IExtension *extension, const
     return nullptr;
 }
 
-int Engine::resolveInput(IExtension *extension, const std::string &name) const
-{
-    if (!extension)
-        return -1;
-
-    auto it = m_inputs.find(extension);
-
-    if (it != m_inputs.cend()) {
-        auto dataIt = it->second.find(name);
-
-        if (dataIt != it->second.cend())
-            return dataIt->second;
-    }
-
-    return -1;
-}
-
-int Engine::resolveField(IExtension *extension, const std::string &name) const
-{
-    if (!extension)
-        return -1;
-
-    auto it = m_fields.find(extension);
-
-    if (it != m_fields.cend()) {
-        auto dataIt = it->second.find(name);
-
-        if (dataIt != it->second.cend())
-            return dataIt->second;
-    }
-
-    return -1;
-}
-
-int Engine::resolveFieldValue(IExtension *extension, const std::string &value) const
-{
-    if (!extension)
-        return -1;
-
-    auto it = m_fieldValues.find(extension);
-
-    if (it != m_fieldValues.cend()) {
-        auto dataIt = it->second.find(value);
-
-        if (dataIt != it->second.cend())
-            return dataIt->second;
-    }
-
-    return -1;
-}
-
 void Engine::compileMonitor(std::shared_ptr<Monitor> monitor)
 {
     Target *target = monitor->sprite() ? static_cast<Target *>(monitor->sprite()) : stage();

src/engine/internal/engine.h

@@ -108,9 +108,6 @@ class Engine : public IEngine
         void addMonitorNameFunction(IExtension *extension, const std::string &opcode, MonitorNameFunc f) override;
         void addMonitorChangeFunction(IExtension *extension, const std::string &opcode, MonitorChangeFunc f) override;
         void addHatBlock(IExtension *extension, const std::string &opcode) override;
-        void addInput(IExtension *extension, const std::string &name, int id) override;
-        void addField(IExtension *extension, const std::string &name, int id) override;
-        void addFieldValue(IExtension *extension, const std::string &value, int id) override;
 
         const std::vector<std::shared_ptr<Broadcast>> &broadcasts() const override;
         void setBroadcasts(const std::vector<std::shared_ptr<Broadcast>> &broadcasts) override;
@@ -192,9 +189,6 @@ class Engine : public IEngine
         HatPredicateCompileFunc resolveHatPredicateCompileFunc(IExtension *extension, const std::string &opcode) const;
         MonitorNameFunc resolveMonitorNameFunc(IExtension *extension, const std::string &opcode) const;
         MonitorChangeFunc resolveMonitorChangeFunc(IExtension *extension, const std::string &opcode) const;
-        int resolveInput(IExtension *extension, const std::string &name) const;
-        int resolveField(IExtension *extension, const std::string &name) const;
-        int resolveFieldValue(IExtension *extension, const std::string &value) const;
 
         void compileMonitor(std::shared_ptr<Monitor> monitor);
 
@@ -255,9 +249,6 @@ class Engine : public IEngine
         std::unordered_map<IExtension *, std::unordered_map<std::string, HatPredicateCompileFunc>> m_hatPredicateCompileFunctions;
         std::unordered_map<IExtension *, std::unordered_map<std::string, MonitorNameFunc>> m_monitorNameFunctions;
         std::unordered_map<IExtension *, std::unordered_map<std::string, MonitorChangeFunc>> m_monitorChangeFunctions;
-        std::unordered_map<IExtension *, std::unordered_map<std::string, int>> m_inputs;
-        std::unordered_map<IExtension *, std::unordered_map<std::string, int>> m_fields;
-        std::unordered_map<IExtension *, std::unordered_map<std::string, int>> m_fieldValues;
 
         std::unordered_map<Target *, std::vector<Script *>> m_whenTouchingObjectHats;
         std::unordered_map<Target *, std::vector<Script *>> m_greenFlagHats;

src/scratch/block.cpp

@@ -198,8 +198,6 @@ int Block::addInput(std::shared_ptr<Input> input)
         return it - impl->inputs.begin();
 
     impl->inputs.push_back(input);
-    impl->inputMap[input->inputId()] = input.get();
-
     return impl->inputs.size() - 1;
 }
 
@@ -223,27 +221,6 @@ int Block::findInput(const std::string &inputName) const
         return it - impl->inputs.begin();
 }
 
-/*! Returns the input with the given ID. */
-Input *Block::findInputById(int id) const
-{
-    if (impl->inputMap.count(id) == 1)
-        return impl->inputMap.at(id);
-    else {
-        auto it = std::find_if(impl->inputs.begin(), impl->inputs.end(), [id](std::shared_ptr<Input> input) { return input->inputId() == id; });
-
-        if (it != impl->inputs.end())
-            return it->get();
-    }
-    return nullptr;
-}
-
-void Block::updateInputMap()
-{
-    impl->inputMap.clear();
-    for (auto input : impl->inputs)
-        impl->inputMap[input->inputId()] = input.get();
-}
-
 /*! Returns the list of fields. */
 const std::vector<std::shared_ptr<Field>> &Block::fields() const
 {
@@ -259,8 +236,6 @@ int Block::addField(std::shared_ptr<Field> field)
         return it - impl->fields.begin();
 
     impl->fields.push_back(field);
-    impl->fieldMap[field->fieldId()] = field.get();
-
     return impl->fields.size() - 1;
 }
 
@@ -284,27 +259,6 @@ int Block::findField(const std::string &fieldName) const
         return it - impl->fields.begin();
 }
 
-/*! Returns the index of the field with the given ID. */
-Field *Block::findFieldById(int id) const
-{
-    if (impl->fieldMap.count(id) == 1)
-        return impl->fieldMap.at(id);
-    else {
-        auto it = std::find_if(impl->fields.begin(), impl->fields.end(), [id](std::shared_ptr<Field> field) { return field->fieldId() == id; });
-
-        if (it != impl->fields.end())
-            return it->get();
-    }
-    return nullptr;
-}
-
-void Block::updateFieldMap()
-{
-    impl->fieldMap.clear();
-    for (auto field : impl->fields)
-        impl->fieldMap[field->fieldId()] = field.get();
-}
-
 /*! Returns true if this is a shadow block. */
 bool Block::shadow() const
 {

src/scratch/block_p.h

@@ -29,9 +29,7 @@ struct BlockPrivate
         Block *parent = nullptr;
         std::string parentId;
         std::vector<std::shared_ptr<Input>> inputs;
-        std::unordered_map<int, Input *> inputMap;
         std::vector<std::shared_ptr<Field>> fields;
-        std::unordered_map<int, Field *> fieldMap;
         bool shadow = false;
         int x = 0;
         int y = 0;

src/scratch/field.cpp

@@ -31,18 +31,6 @@ const std::string &Field::name() const
     return impl->name;
 }
 
-/*! Returns the ID of the field. */
-int Field::fieldId() const
-{
-    return impl->fieldId;
-}
-
-/*! Sets the ID of the field. */
-void Field::setFieldId(int newFieldId)
-{
-    impl->fieldId = newFieldId;
-}
-
 /*! Returns the value of the field. */
 const Value &Field::value() const
 {
@@ -71,21 +59,3 @@ const std::string &Field::valueId() const
 {
     return impl->valueId;
 }
-
-/*!
- * Returns the ID that was assigned to the value.
- *  \see IEngine::addFieldValue()
- */
-int Field::specialValueId() const
-{
-    return impl->specialValueId;
-}
-
-/*!
- * Assigns an ID to the value.
- *  \see IEngine::addFieldValue()
- */
-void Field::setSpecialValueId(int newSpecialValueId)
-{
-    impl->specialValueId = newSpecialValueId;
-}