Merge pull request #293 from scratchcpp/remove_updateinputfieldmap

adazem009 · web-flow · commit 4b83845a4860 · 2023-10-30T08:55:17.000+01:00
Make input and field map update methods private
diff --git a/include/scratchcpp/block.h b/include/scratchcpp/block.h
@@ -19,6 +19,8 @@ class BlockPrivate;
 class LIBSCRATCHCPP_EXPORT Block : public Entity
 {
     public:
+        friend class Engine;
+
         Block(const std::string &id, const std::string &opcode);
         Block(const Block &) = delete;
 
@@ -41,14 +43,12 @@ class LIBSCRATCHCPP_EXPORT Block : public Entity
         std::shared_ptr<Input> inputAt(int index) const;
         int findInput(const std::string &inputName) const;
         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;
         Field *findFieldById(int id) const;
-        void updateFieldMap();
 
         bool shadow() const;
         void setShadow(bool newShadow);
@@ -75,6 +75,9 @@ class LIBSCRATCHCPP_EXPORT Block : public Entity
         InputValue *topLevelReporterInfo();
 
     private:
+        void updateInputMap();
+        void updateFieldMap();
+
         spimpl::unique_impl_ptr<BlockPrivate> impl;
 };
 
diff --git a/src/scratch/block.cpp b/src/scratch/block.cpp
@@ -168,6 +168,8 @@ 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;
 }
 
@@ -197,10 +199,15 @@ 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;
 }
 
-/*! Updates the map that assigns input IDs to input indexes. Used internally by Engine. */
 void Block::updateInputMap()
 {
     impl->inputMap.clear();
@@ -223,6 +230,8 @@ 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;
 }
 
@@ -252,10 +261,15 @@ 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;
 }
 
-/*! Updates the map that assigns input IDs to input indexes. Used internally by Engine. */
 void Block::updateFieldMap()
 {
     impl->fieldMap.clear();
diff --git a/test/blocks/control_blocks_test.cpp b/test/blocks/control_blocks_test.cpp
@@ -63,7 +63,6 @@ class ControlBlocksTest : public testing::Test
             input->setValueBlock(valueBlock);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         void addObscuredInput(std::shared_ptr<Block> block, const std::string &name, ControlBlocks::Inputs id, std::shared_ptr<Block> valueBlock) const
@@ -72,7 +71,6 @@ class ControlBlocksTest : public testing::Test
             input->setValueBlock(valueBlock);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         void addValueInput(std::shared_ptr<Block> block, const std::string &name, ControlBlocks::Inputs id, const Value &value) const
@@ -81,15 +79,13 @@ class ControlBlocksTest : public testing::Test
             input->setPrimaryValue(value);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         std::shared_ptr<Input> addNullInput(std::shared_ptr<Block> block, const std::string &name, ControlBlocks::Inputs id) const
         {
             auto input = std::make_shared<Input>(name, Input::Type::Shadow);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
 
             return input;
         }
@@ -100,15 +96,13 @@ class ControlBlocksTest : public testing::Test
             field->setFieldId(id);
             field->setSpecialValueId(valueId);
             block->addField(field);
-            block->updateFieldMap();
         }
 
         void addVariableField(std::shared_ptr<Block> block, std::shared_ptr<Variable> variable)
         {
             auto variableField = std::make_shared<Field>("VARIABLE", Value(), variable);
             variableField->setFieldId(ControlBlocks::VARIABLE);
             block->addField(variableField);
-            block->updateFieldMap();
         }
 
         std::shared_ptr<Block> createSubstack(const std::string &id)
diff --git a/test/blocks/custom_blocks_test.cpp b/test/blocks/custom_blocks_test.cpp
@@ -27,7 +27,6 @@ class CustomBlocksTest : public testing::Test
             input->setValueBlock(prototypeBlock);
             input->setInputId(CustomBlocks::CUSTOM_BLOCK);
             definitionBlock->addInput(input);
-            definitionBlock->updateInputMap();
         }
 
         void addArgumentInput(std::shared_ptr<Block> block, const std::string &argId, const Value &value) const
@@ -94,7 +93,6 @@ TEST_F(CustomBlocksTest, CustomBlocks)
     auto valueField = std::make_shared<Field>("VALUE", "boolean");
     valueField->setFieldId(CustomBlocks::VALUE);
     argBlock->addField(valueField);
-    argBlock->updateFieldMap();
     input->setValueBlock(argBlock);
     input->setInputId(-100);
     testBlock->addInput(input);
@@ -105,12 +103,10 @@ TEST_F(CustomBlocksTest, CustomBlocks)
     valueField = std::make_shared<Field>("VALUE", "invalid");
     valueField->setFieldId(CustomBlocks::VALUE);
     argBlock->addField(valueField);
-    argBlock->updateFieldMap();
     input->setValueBlock(argBlock);
     input->setInputId(-101);
     testBlock->addInput(input);
 
-    testBlock->updateInputMap();
     testBlock->setCompileFunction([](Compiler *compiler) {
         compiler->addInput(-100);
         compiler->addInstruction(vm::OP_PRINT);
diff --git a/test/blocks/event_blocks_test.cpp b/test/blocks/event_blocks_test.cpp
@@ -40,7 +40,6 @@ class EventBlocksTest : public testing::Test
             input->primaryValue()->setType(InputValue::Type::Broadcast);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         void addObscuredInput(std::shared_ptr<Block> block, const std::string &name, EventBlocks::Inputs id, std::shared_ptr<Block> valueBlock) const
@@ -49,23 +48,20 @@ class EventBlocksTest : public testing::Test
             input->setValueBlock(valueBlock);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         void addValueField(std::shared_ptr<Block> block, const std::string &name, EventBlocks::Fields id, const std::string &value) const
         {
             auto field = std::make_shared<Field>(name, value);
             field->setFieldId(id);
             block->addField(field);
-            block->updateFieldMap();
         }
 
         void addBroadcastField(std::shared_ptr<Block> block, const std::string &name, EventBlocks::Fields id, std::shared_ptr<Broadcast> broadcast) const
         {
             auto field = std::make_shared<Field>(name, Value(), broadcast);
             field->setFieldId(id);
             block->addField(field);
-            block->updateFieldMap();
         }
 
         std::unique_ptr<IBlockSection> m_section;
diff --git a/test/blocks/list_blocks_test.cpp b/test/blocks/list_blocks_test.cpp
@@ -28,7 +28,6 @@ class ListBlocksTest : public testing::Test
             auto listField = std::make_shared<Field>("LIST", Value(), list);
             listField->setFieldId(ListBlocks::LIST);
             block->addField(listField);
-            block->updateFieldMap();
 
             return block;
         }
@@ -39,7 +38,6 @@ class ListBlocksTest : public testing::Test
             input->setPrimaryValue(item);
             input->setInputId(ListBlocks::ITEM);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         void addIndexInput(std::shared_ptr<Block> block, const Value &index) const
@@ -48,7 +46,6 @@ class ListBlocksTest : public testing::Test
             input->setPrimaryValue(index);
             input->setInputId(ListBlocks::INDEX);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         // For add item, item index and list contains item
diff --git a/test/blocks/looks_blocks_test.cpp b/test/blocks/looks_blocks_test.cpp
@@ -45,7 +45,6 @@ class LooksBlocksTest : public testing::Test
             input->setPrimaryValue(value);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         void addObscuredInput(std::shared_ptr<Block> block, const std::string &name, LooksBlocks::Inputs id, std::shared_ptr<Block> valueBlock) const
@@ -54,15 +53,13 @@ class LooksBlocksTest : public testing::Test
             input->setValueBlock(valueBlock);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         std::shared_ptr<Input> addNullInput(std::shared_ptr<Block> block, const std::string &name, LooksBlocks::Inputs id) const
         {
             auto input = std::make_shared<Input>(name, Input::Type::Shadow);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
 
             return input;
         }
@@ -85,7 +82,6 @@ class LooksBlocksTest : public testing::Test
             field->setFieldId(id);
             field->setSpecialValueId(valueId);
             block->addField(field);
-            block->updateFieldMap();
         }
 
         std::unique_ptr<IBlockSection> m_section;
diff --git a/test/blocks/motion_blocks_test.cpp b/test/blocks/motion_blocks_test.cpp
@@ -45,7 +45,6 @@ class MotionBlocksTest : public testing::Test
             input->setPrimaryValue(value);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         void addObscuredInput(std::shared_ptr<Block> block, const std::string &name, MotionBlocks::Inputs id, std::shared_ptr<Block> valueBlock) const
@@ -54,15 +53,13 @@ class MotionBlocksTest : public testing::Test
             input->setValueBlock(valueBlock);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         std::shared_ptr<Input> addNullInput(std::shared_ptr<Block> block, const std::string &name, MotionBlocks::Inputs id) const
         {
             auto input = std::make_shared<Input>(name, Input::Type::Shadow);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
 
             return input;
         }
@@ -85,7 +82,6 @@ class MotionBlocksTest : public testing::Test
             field->setFieldId(id);
             field->setSpecialValueId(valueId);
             block->addField(field);
-            block->updateFieldMap();
         }
 
         std::unique_ptr<IBlockSection> m_section;
diff --git a/test/blocks/operator_blocks_test.cpp b/test/blocks/operator_blocks_test.cpp
@@ -30,7 +30,6 @@ class OperatorBlocksTest : public testing::Test
             input->setPrimaryValue(value);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         void addObscuredInput(std::shared_ptr<Block> block, const std::string &name, OperatorBlocks::Inputs id, std::shared_ptr<Block> valueBlock) const
@@ -39,15 +38,13 @@ class OperatorBlocksTest : public testing::Test
             input->setValueBlock(valueBlock);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         void addNullInput(std::shared_ptr<Block> block, const std::string &name, OperatorBlocks::Inputs id) const
         {
             auto input = std::make_shared<Input>(name, Input::Type::Shadow);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         // For the mathop block
@@ -57,7 +54,6 @@ class OperatorBlocksTest : public testing::Test
             field->setFieldId(OperatorBlocks::OPERATOR);
             field->setSpecialValueId(operatorId);
             block->addField(field);
-            block->updateFieldMap();
         }
 
         std::unique_ptr<IBlockSection> m_section;
diff --git a/test/blocks/sensing_blocks_test.cpp b/test/blocks/sensing_blocks_test.cpp
@@ -34,7 +34,6 @@ class SensingBlocksTest : public testing::Test
             optionField->setFieldId(SensingBlocks::CURRENTMENU);
             optionField->setSpecialValueId(option);
             block->addField(optionField);
-            block->updateFieldMap();
 
             return block;
         }
@@ -54,15 +53,13 @@ class SensingBlocksTest : public testing::Test
             input->setValueBlock(valueBlock);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
         }
 
         std::shared_ptr<Input> addNullInput(std::shared_ptr<Block> block, const std::string &name, SensingBlocks::Inputs id) const
         {
             auto input = std::make_shared<Input>(name, Input::Type::Shadow);
             input->setInputId(id);
             block->addInput(input);
-            block->updateInputMap();
 
             return input;
         }
@@ -85,7 +82,6 @@ class SensingBlocksTest : public testing::Test
             field->setFieldId(id);
             field->setSpecialValueId(valueId);
             block->addField(field);
-            block->updateFieldMap();
         }
 
         std::unique_ptr<IBlockSection> m_section;
diff --git a/test/blocks/variable_blocks_test.cpp b/test/blocks/variable_blocks_test.cpp
@@ -28,13 +28,11 @@ class VariableBlocksTest : public testing::Test
             auto variableField = std::make_shared<Field>("VARIABLE", Value(), variable);
             variableField->setFieldId(VariableBlocks::VARIABLE);
             block->addField(variableField);
-            block->updateFieldMap();
 
             auto valueInput = std::make_shared<Input>("VALUE", Input::Type::Shadow);
             valueInput->setPrimaryValue(value);
             valueInput->setInputId(VariableBlocks::VALUE);
             block->addInput(valueInput);
-            block->updateInputMap();
 
             return block;
         }
diff --git a/test/compiler/compiler_test.cpp b/test/compiler/compiler_test.cpp
@@ -338,7 +338,6 @@ TEST_F(CompilerTest, ResolveInput)
     input->setPrimaryValue("test");
     input->setInputId(TestBlockSection::INPUT1);
     block->addInput(input);
-    block->updateInputMap();
     block->setCompileFunction(&TestBlockSection::compileTestBlock1);
 
     compiler.compile(block);
@@ -361,7 +360,6 @@ TEST_F(CompilerTest, ResolveDropdownMenuInput)
     input->setValueBlock(menu);
     menu->addField(optionField);
     block->addInput(input);
-    block->updateInputMap();
     block->setCompileFunction(&TestBlockSection::compileTestBlock1);
 
     compiler.compile(block);
@@ -402,7 +400,6 @@ TEST_F(CompilerTest, ResolveField)
     field->setFieldId(TestBlockSection::FIELD1);
     field->setSpecialValueId(TestBlockSection::TestValue);
     block->addField(field);
-    block->updateFieldMap();
     block->setCompileFunction(&TestBlockSection::compileTestBlock2);
 
     compiler.compile(block);
diff --git a/test/scratch_classes/block_test.cpp b/test/scratch_classes/block_test.cpp

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,8 @@ int Block::addInput(std::shared_ptr<Input> input)`
`168`	`168`	`return it - impl->inputs.begin();`
`169`	`169`
`170`	`170`	`impl->inputs.push_back(input);`
	`171`	`+ impl->inputMap[input->inputId()] = input.get();`
	`172`	`+`
`171`	`173`	`return impl->inputs.size() - 1;`
`172`	`174`	`}`
`173`	`175`
`@@ -197,10 +199,15 @@ Input *Block::findInputById(int id) const`
`197`	`199`	`{`
`198`	`200`	`if (impl->inputMap.count(id) == 1)`
`199`	`201`	`return impl->inputMap.at(id);`
	`202`	`+ else {`
	`203`	`+ auto it = std::find_if(impl->inputs.begin(), impl->inputs.end(), [id](std::shared_ptr<Input> input) { return input->inputId() == id; });`
	`204`	`+`
	`205`	`+ if (it != impl->inputs.end())`
	`206`	`+ return it->get();`
	`207`	`+ }`
`200`	`208`	`return nullptr;`
`201`	`209`	`}`
`202`	`210`
`203`		`-/! Updates the map that assigns input IDs to input indexes. Used internally by Engine. /`
`204`	`211`	`void Block::updateInputMap()`
`205`	`212`	`{`
`206`	`213`	`impl->inputMap.clear();`
`@@ -223,6 +230,8 @@ int Block::addField(std::shared_ptr<Field> field)`
`223`	`230`	`return it - impl->fields.begin();`
`224`	`231`
`225`	`232`	`impl->fields.push_back(field);`
	`233`	`+ impl->fieldMap[field->fieldId()] = field.get();`
	`234`	`+`
`226`	`235`	`return impl->fields.size() - 1;`
`227`	`236`	`}`
`228`	`237`
`@@ -252,10 +261,15 @@ Field *Block::findFieldById(int id) const`
`252`	`261`	`{`
`253`	`262`	`if (impl->fieldMap.count(id) == 1)`
`254`	`263`	`return impl->fieldMap.at(id);`
	`264`	`+ else {`
	`265`	`+ auto it = std::find_if(impl->fields.begin(), impl->fields.end(), [id](std::shared_ptr<Field> field) { return field->fieldId() == id; });`
	`266`	`+`
	`267`	`+ if (it != impl->fields.end())`
	`268`	`+ return it->get();`
	`269`	`+ }`
`255`	`270`	`return nullptr;`
`256`	`271`	`}`
`257`	`272`
`258`		`-/! Updates the map that assigns input IDs to input indexes. Used internally by Engine. /`
`259`	`273`	`void Block::updateFieldMap()`
`260`	`274`	`{`
`261`	`275`	`impl->fieldMap.clear();`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ class ControlBlocksTest : public testing::Test`
`63`	`63`	`input->setValueBlock(valueBlock);`
`64`	`64`	`input->setInputId(id);`
`65`	`65`	`block->addInput(input);`
`66`		`- block->updateInputMap();`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`void addObscuredInput(std::shared_ptr<Block> block, const std::string &name, ControlBlocks::Inputs id, std::shared_ptr<Block> valueBlock) const`
`@@ -72,7 +71,6 @@ class ControlBlocksTest : public testing::Test`
`72`	`71`	`input->setValueBlock(valueBlock);`
`73`	`72`	`input->setInputId(id);`
`74`	`73`	`block->addInput(input);`
`75`		`- block->updateInputMap();`
`76`	`74`	`}`
`77`	`75`
`78`	`76`	`void addValueInput(std::shared_ptr<Block> block, const std::string &name, ControlBlocks::Inputs id, const Value &value) const`
`@@ -81,15 +79,13 @@ class ControlBlocksTest : public testing::Test`
`81`	`79`	`input->setPrimaryValue(value);`
`82`	`80`	`input->setInputId(id);`
`83`	`81`	`block->addInput(input);`
`84`		`- block->updateInputMap();`
`85`	`82`	`}`
`86`	`83`
`87`	`84`	`std::shared_ptr<Input> addNullInput(std::shared_ptr<Block> block, const std::string &name, ControlBlocks::Inputs id) const`
`88`	`85`	`{`
`89`	`86`	`auto input = std::make_shared<Input>(name, Input::Type::Shadow);`
`90`	`87`	`input->setInputId(id);`
`91`	`88`	`block->addInput(input);`
`92`		`- block->updateInputMap();`
`93`	`89`
`94`	`90`	`return input;`
`95`	`91`	`}`
`@@ -100,15 +96,13 @@ class ControlBlocksTest : public testing::Test`
`100`	`96`	`field->setFieldId(id);`
`101`	`97`	`field->setSpecialValueId(valueId);`
`102`	`98`	`block->addField(field);`
`103`		`- block->updateFieldMap();`
`104`	`99`	`}`
`105`	`100`
`106`	`101`	`void addVariableField(std::shared_ptr<Block> block, std::shared_ptr<Variable> variable)`
`107`	`102`	`{`
`108`	`103`	`auto variableField = std::make_shared<Field>("VARIABLE", Value(), variable);`
`109`	`104`	`variableField->setFieldId(ControlBlocks::VARIABLE);`
`110`	`105`	`block->addField(variableField);`
`111`		`- block->updateFieldMap();`
`112`	`106`	`}`
`113`	`107`
`114`	`108`	`std::shared_ptr<Block> createSubstack(const std::string &id)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ class EventBlocksTest : public testing::Test`
`40`	`40`	`input->primaryValue()->setType(InputValue::Type::Broadcast);`
`41`	`41`	`input->setInputId(id);`
`42`	`42`	`block->addInput(input);`
`43`		`- block->updateInputMap();`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`void addObscuredInput(std::shared_ptr<Block> block, const std::string &name, EventBlocks::Inputs id, std::shared_ptr<Block> valueBlock) const`
`@@ -49,23 +48,20 @@ class EventBlocksTest : public testing::Test`
`49`	`48`	`input->setValueBlock(valueBlock);`
`50`	`49`	`input->setInputId(id);`
`51`	`50`	`block->addInput(input);`
`52`		`- block->updateInputMap();`
`53`	`51`	`}`
`54`	`52`
`55`	`53`	`void addValueField(std::shared_ptr<Block> block, const std::string &name, EventBlocks::Fields id, const std::string &value) const`
`56`	`54`	`{`
`57`	`55`	`auto field = std::make_shared<Field>(name, value);`
`58`	`56`	`field->setFieldId(id);`
`59`	`57`	`block->addField(field);`
`60`		`- block->updateFieldMap();`
`61`	`58`	`}`
`62`	`59`
`63`	`60`	`void addBroadcastField(std::shared_ptr<Block> block, const std::string &name, EventBlocks::Fields id, std::shared_ptr<Broadcast> broadcast) const`
`64`	`61`	`{`
`65`	`62`	`auto field = std::make_shared<Field>(name, Value(), broadcast);`
`66`	`63`	`field->setFieldId(id);`
`67`	`64`	`block->addField(field);`
`68`		`- block->updateFieldMap();`
`69`	`65`	`}`
`70`	`66`
`71`	`67`	`std::unique_ptr<IBlockSection> m_section;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ class ListBlocksTest : public testing::Test`
`28`	`28`	`auto listField = std::make_shared<Field>("LIST", Value(), list);`
`29`	`29`	`listField->setFieldId(ListBlocks::LIST);`
`30`	`30`	`block->addField(listField);`
`31`		`- block->updateFieldMap();`
`32`	`31`
`33`	`32`	`return block;`
`34`	`33`	`}`
`@@ -39,7 +38,6 @@ class ListBlocksTest : public testing::Test`
`39`	`38`	`input->setPrimaryValue(item);`
`40`	`39`	`input->setInputId(ListBlocks::ITEM);`
`41`	`40`	`block->addInput(input);`
`42`		`- block->updateInputMap();`
`43`	`41`	`}`
`44`	`42`
`45`	`43`	`void addIndexInput(std::shared_ptr<Block> block, const Value &index) const`
`@@ -48,7 +46,6 @@ class ListBlocksTest : public testing::Test`
`48`	`46`	`input->setPrimaryValue(index);`
`49`	`47`	`input->setInputId(ListBlocks::INDEX);`
`50`	`48`	`block->addInput(input);`
`51`		`- block->updateInputMap();`
`52`	`49`	`}`
`53`	`50`
`54`	`51`	`// For add item, item index and list contains item`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ class LooksBlocksTest : public testing::Test`
`45`	`45`	`input->setPrimaryValue(value);`
`46`	`46`	`input->setInputId(id);`
`47`	`47`	`block->addInput(input);`
`48`		`- block->updateInputMap();`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`void addObscuredInput(std::shared_ptr<Block> block, const std::string &name, LooksBlocks::Inputs id, std::shared_ptr<Block> valueBlock) const`
`@@ -54,15 +53,13 @@ class LooksBlocksTest : public testing::Test`
`54`	`53`	`input->setValueBlock(valueBlock);`
`55`	`54`	`input->setInputId(id);`
`56`	`55`	`block->addInput(input);`
`57`		`- block->updateInputMap();`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`std::shared_ptr<Input> addNullInput(std::shared_ptr<Block> block, const std::string &name, LooksBlocks::Inputs id) const`
`61`	`59`	`{`
`62`	`60`	`auto input = std::make_shared<Input>(name, Input::Type::Shadow);`
`63`	`61`	`input->setInputId(id);`
`64`	`62`	`block->addInput(input);`
`65`		`- block->updateInputMap();`
`66`	`63`
`67`	`64`	`return input;`
`68`	`65`	`}`
`@@ -85,7 +82,6 @@ class LooksBlocksTest : public testing::Test`
`85`	`82`	`field->setFieldId(id);`
`86`	`83`	`field->setSpecialValueId(valueId);`
`87`	`84`	`block->addField(field);`
`88`		`- block->updateFieldMap();`
`89`	`85`	`}`
`90`	`86`
`91`	`87`	`std::unique_ptr<IBlockSection> m_section;`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ class MotionBlocksTest : public testing::Test`
`45`	`45`	`input->setPrimaryValue(value);`
`46`	`46`	`input->setInputId(id);`
`47`	`47`	`block->addInput(input);`
`48`		`- block->updateInputMap();`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`void addObscuredInput(std::shared_ptr<Block> block, const std::string &name, MotionBlocks::Inputs id, std::shared_ptr<Block> valueBlock) const`
`@@ -54,15 +53,13 @@ class MotionBlocksTest : public testing::Test`
`54`	`53`	`input->setValueBlock(valueBlock);`
`55`	`54`	`input->setInputId(id);`
`56`	`55`	`block->addInput(input);`
`57`		`- block->updateInputMap();`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`std::shared_ptr<Input> addNullInput(std::shared_ptr<Block> block, const std::string &name, MotionBlocks::Inputs id) const`
`61`	`59`	`{`
`62`	`60`	`auto input = std::make_shared<Input>(name, Input::Type::Shadow);`
`63`	`61`	`input->setInputId(id);`
`64`	`62`	`block->addInput(input);`
`65`		`- block->updateInputMap();`
`66`	`63`
`67`	`64`	`return input;`
`68`	`65`	`}`
`@@ -85,7 +82,6 @@ class MotionBlocksTest : public testing::Test`
`85`	`82`	`field->setFieldId(id);`
`86`	`83`	`field->setSpecialValueId(valueId);`
`87`	`84`	`block->addField(field);`
`88`		`- block->updateFieldMap();`
`89`	`85`	`}`
`90`	`86`
`91`	`87`	`std::unique_ptr<IBlockSection> m_section;`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ class OperatorBlocksTest : public testing::Test`
`30`	`30`	`input->setPrimaryValue(value);`
`31`	`31`	`input->setInputId(id);`
`32`	`32`	`block->addInput(input);`
`33`		`- block->updateInputMap();`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`void addObscuredInput(std::shared_ptr<Block> block, const std::string &name, OperatorBlocks::Inputs id, std::shared_ptr<Block> valueBlock) const`
`@@ -39,15 +38,13 @@ class OperatorBlocksTest : public testing::Test`
`39`	`38`	`input->setValueBlock(valueBlock);`
`40`	`39`	`input->setInputId(id);`
`41`	`40`	`block->addInput(input);`
`42`		`- block->updateInputMap();`
`43`	`41`	`}`
`44`	`42`
`45`	`43`	`void addNullInput(std::shared_ptr<Block> block, const std::string &name, OperatorBlocks::Inputs id) const`
`46`	`44`	`{`
`47`	`45`	`auto input = std::make_shared<Input>(name, Input::Type::Shadow);`
`48`	`46`	`input->setInputId(id);`
`49`	`47`	`block->addInput(input);`
`50`		`- block->updateInputMap();`
`51`	`48`	`}`
`52`	`49`
`53`	`50`	`// For the mathop block`
`@@ -57,7 +54,6 @@ class OperatorBlocksTest : public testing::Test`
`57`	`54`	`field->setFieldId(OperatorBlocks::OPERATOR);`
`58`	`55`	`field->setSpecialValueId(operatorId);`
`59`	`56`	`block->addField(field);`
`60`		`- block->updateFieldMap();`
`61`	`57`	`}`
`62`	`58`
`63`	`59`	`std::unique_ptr<IBlockSection> m_section;`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ class SensingBlocksTest : public testing::Test`
`34`	`34`	`optionField->setFieldId(SensingBlocks::CURRENTMENU);`
`35`	`35`	`optionField->setSpecialValueId(option);`
`36`	`36`	`block->addField(optionField);`
`37`		`- block->updateFieldMap();`
`38`	`37`
`39`	`38`	`return block;`
`40`	`39`	`}`
`@@ -54,15 +53,13 @@ class SensingBlocksTest : public testing::Test`
`54`	`53`	`input->setValueBlock(valueBlock);`
`55`	`54`	`input->setInputId(id);`
`56`	`55`	`block->addInput(input);`
`57`		`- block->updateInputMap();`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`std::shared_ptr<Input> addNullInput(std::shared_ptr<Block> block, const std::string &name, SensingBlocks::Inputs id) const`
`61`	`59`	`{`
`62`	`60`	`auto input = std::make_shared<Input>(name, Input::Type::Shadow);`
`63`	`61`	`input->setInputId(id);`
`64`	`62`	`block->addInput(input);`
`65`		`- block->updateInputMap();`
`66`	`63`
`67`	`64`	`return input;`
`68`	`65`	`}`
`@@ -85,7 +82,6 @@ class SensingBlocksTest : public testing::Test`
`85`	`82`	`field->setFieldId(id);`
`86`	`83`	`field->setSpecialValueId(valueId);`
`87`	`84`	`block->addField(field);`
`88`		`- block->updateFieldMap();`
`89`	`85`	`}`
`90`	`86`
`91`	`87`	`std::unique_ptr<IBlockSection> m_section;`