cosmetic: names changed

facontidavide · facontidavide · commit 3e7e6d3cae09 · 2020-03-18T20:45:46.000+01:00
diff --git a/src/xml_parsing.cpp b/src/xml_parsing.cpp
@@ -471,7 +471,7 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,
         instance_name = element->Attribute("ID");
     }
 
-    PortsRemapping remapping_parameters;
+    PortsRemapping parameters_map;
 
     if (element_name != "SubTree") // in Subtree attributes have different meaning...
     {
@@ -480,7 +480,7 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,
             const std::string attribute_name = att->Name();
             if (attribute_name != "ID" && attribute_name != "name")
             {
-                remapping_parameters[attribute_name] = att->Value();
+                parameters_map[attribute_name] = att->Value();
             }
         }
     }
@@ -495,12 +495,12 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,
         const auto& manifest = factory.manifests().at(ID);
 
         //Check that name in remapping can be found in the manifest
-        for(const auto& remapping_it: remapping_parameters)
+        for(const auto& param_it: parameters_map)
         {
-            if( manifest.ports.count( remapping_it.first ) == 0 )
+            if( manifest.ports.count( param_it.first ) == 0 )
             {
                 throw RuntimeError("Possible typo? In the XML, you tried to remap port \"",
-                                   remapping_it.first, "\" in node [", ID," / ", instance_name,
+                                   param_it.first, "\" in node [", ID," / ", instance_name,
                                    "], but the manifest of this node does not contain a port with this name.");
             }
         }
@@ -511,16 +511,16 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,
             const std::string& port_name = port_it.first;
             const auto& port_info = port_it.second;
 
-            auto remap_it = remapping_parameters.find(port_name);
-            if( remap_it == remapping_parameters.end())
+            auto remap_it = parameters_map.find(port_name);
+            if( remap_it == parameters_map.end())
             {
                 continue;
             }
-            StringView remapping_value = remap_it->second;
-            auto remapped_res = TreeNode::getRemappedKey(port_name, remapping_value);
-            if( remapped_res )
+            StringView param_value = remap_it->second;
+            auto param_res = TreeNode::getRemappedKey(port_name, param_value);
+            if( param_res )
             {
-                const auto& port_key = nonstd::to_string(remapped_res.value());
+                const auto& port_key = nonstd::to_string(param_res.value());
 
                 auto prev_info = blackboard->portInfo( port_key );
                 if( !prev_info  )
@@ -545,20 +545,20 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,
         }
 
         // use manifest to initialize NodeConfiguration
-        for(const auto& remap_it: remapping_parameters)
+        for(const auto& param_it: parameters_map)
         {
-            const auto& port_name = remap_it.first;
+            const auto& port_name = param_it.first;
             auto port_it = manifest.ports.find( port_name );
             if( port_it != manifest.ports.end() )
             {
                 auto direction = port_it->second.direction();
                 if( direction != PortDirection::OUTPUT )
                 {
-                    config.input_ports.insert( remap_it );
+                    config.input_ports.insert( param_it );
                 }
                 if( direction != PortDirection::INPUT )
                 {
-                    config.output_ports.insert( remap_it );
+                    config.output_ports.insert( param_it );
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,`
`471`	`471`	`instance_name = element->Attribute("ID");`
`472`	`472`	`}`
`473`	`473`
`474`		`- PortsRemapping remapping_parameters;`
	`474`	`+ PortsRemapping parameters_map;`
`475`	`475`
`476`	`476`	`if (element_name != "SubTree") // in Subtree attributes have different meaning...`
`477`	`477`	`{`
`@@ -480,7 +480,7 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,`
`480`	`480`	`const std::string attribute_name = att->Name();`
`481`	`481`	`if (attribute_name != "ID" && attribute_name != "name")`
`482`	`482`	`{`
`483`		`- remapping_parameters[attribute_name] = att->Value();`
	`483`	`+ parameters_map[attribute_name] = att->Value();`
`484`	`484`	`}`
`485`	`485`	`}`
`486`	`486`	`}`
`@@ -495,12 +495,12 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,`
`495`	`495`	`const auto& manifest = factory.manifests().at(ID);`
`496`	`496`
`497`	`497`	`//Check that name in remapping can be found in the manifest`
`498`		`- for(const auto& remapping_it: remapping_parameters)`
	`498`	`+ for(const auto& param_it: parameters_map)`
`499`	`499`	`{`
`500`		`- if( manifest.ports.count( remapping_it.first ) == 0 )`
	`500`	`+ if( manifest.ports.count( param_it.first ) == 0 )`
`501`	`501`	`{`
`502`	`502`	`throw RuntimeError("Possible typo? In the XML, you tried to remap port \"",`
`503`		`- remapping_it.first, "\" in node [", ID," / ", instance_name,`
	`503`	`+ param_it.first, "\" in node [", ID," / ", instance_name,`
`504`	`504`	`"], but the manifest of this node does not contain a port with this name.");`
`505`	`505`	`}`
`506`	`506`	`}`
`@@ -511,16 +511,16 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,`
`511`	`511`	`const std::string& port_name = port_it.first;`
`512`	`512`	`const auto& port_info = port_it.second;`
`513`	`513`
`514`		`- auto remap_it = remapping_parameters.find(port_name);`
`515`		`- if( remap_it == remapping_parameters.end())`
	`514`	`+ auto remap_it = parameters_map.find(port_name);`
	`515`	`+ if( remap_it == parameters_map.end())`
`516`	`516`	`{`
`517`	`517`	`continue;`
`518`	`518`	`}`
`519`		`- StringView remapping_value = remap_it->second;`
`520`		`- auto remapped_res = TreeNode::getRemappedKey(port_name, remapping_value);`
`521`		`- if( remapped_res )`
	`519`	`+ StringView param_value = remap_it->second;`
	`520`	`+ auto param_res = TreeNode::getRemappedKey(port_name, param_value);`
	`521`	`+ if( param_res )`
`522`	`522`	`{`
`523`		`- const auto& port_key = nonstd::to_string(remapped_res.value());`
	`523`	`+ const auto& port_key = nonstd::to_string(param_res.value());`
`524`	`524`
`525`	`525`	`auto prev_info = blackboard->portInfo( port_key );`
`526`	`526`	`if( !prev_info )`
`@@ -545,20 +545,20 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,`
`545`	`545`	`}`
`546`	`546`
`547`	`547`	`// use manifest to initialize NodeConfiguration`
`548`		`- for(const auto& remap_it: remapping_parameters)`
	`548`	`+ for(const auto& param_it: parameters_map)`
`549`	`549`	`{`
`550`		`- const auto& port_name = remap_it.first;`
	`550`	`+ const auto& port_name = param_it.first;`
`551`	`551`	`auto port_it = manifest.ports.find( port_name );`
`552`	`552`	`if( port_it != manifest.ports.end() )`
`553`	`553`	`{`
`554`	`554`	`auto direction = port_it->second.direction();`
`555`	`555`	`if( direction != PortDirection::OUTPUT )`
`556`	`556`	`{`
`557`		`- config.input_ports.insert( remap_it );`
	`557`	`+ config.input_ports.insert( param_it );`
`558`	`558`	`}`
`559`	`559`	`if( direction != PortDirection::INPUT )`
`560`	`560`	`{`
`561`		`- config.output_ports.insert( remap_it );`
	`561`	`+ config.output_ports.insert( param_it );`
`562`	`562`	`}`
`563`	`563`	`}`
`564`	`564`	`}`