cleaned config, fixed requires error (missing reference), fixed implements error (name mismatch between config and main.cpp proxy)

Author: alfiTH

cli/robocompdsl/robocompdsl/templates/templateCPP/files/etc/config

@@ -1,16 +1,10 @@
 ${storm_topic_manager}
-
 ${config_publishes_proxies}
-
 ${config_requires_proxies}
-
 ${config_subscribes_endpoints}
-
 ${config_implements_endpoints}
 
-
 ${dsr_config}
-
 ${dsr_viewer_config}
 
 Period.Compute = 100

cli/robocompdsl/robocompdsl/templates/templateCPP/plugins/base/functions/etc/config.py

@@ -6,6 +6,7 @@
 STORM_TOPIC_MANAGER_STR = """\
 # This property is used by the clients to connect to IceStorm.
 Proxies.TopicManager = "IceStorm/TopicManager:default -p 9999"
+
 """
 
 class etc_config(TemplateDict):
@@ -24,7 +25,7 @@ def config_implements_endpoints(self):
             if communication_is_ice(interface):
                 result += f'Endpoints.{interface.name}{num} = "tcp -p 0"\n'
         if result != "":
-            result = '# Endpoints for implements interfaces\n' + result
+            result = '# Endpoints for implements interfaces\n' + result + '\n'
         return result
 
     def config_subscribes_endpoints(self):
@@ -34,7 +35,7 @@ def config_subscribes_endpoints(self):
                 result += f'Endpoints.{interface.name}Topic{num} = "tcp -p 0"\n'
                 result += f'Endpoints.{interface.name}Prefix{num} = ""\n'
         if result != "":
-            result = '# Endpoints for subscriptions interfaces\n' + result
+            result = '# Endpoints for subscriptions interfaces\n' + result + '\n'
         return result
 
     def config_publishes_proxies(self):
@@ -43,7 +44,7 @@ def config_publishes_proxies(self):
             if communication_is_ice(interface):
                 result += f'Proxies.{interface.name}Prefix{num} = ""\n'
         if result != "":
-            result = '# Proxies for publishes interfaces\n' + result
+            result = '# Proxies for publishes interfaces\n' + result + '\n'
         return result
 
     def config_requires_proxies(self):
@@ -54,7 +55,7 @@ def config_requires_proxies(self):
                 result += f'Proxies.{interface.name}{num} = "{interface.name.lower()}:tcp -h localhost -p {port}"\n'
 
         if result != "":
-            result = '# Proxies for required interfaces\n' + result
+            result = '# Proxies for required interfaces\n' + result + '\n'
         return result
 
     def storm_topic_manager(self):

cli/robocompdsl/robocompdsl/templates/templateCPP/plugins/base/functions/generated/main_cpp.py

@@ -16,7 +16,7 @@
 void require(const Ice::CommunicatorPtr& communicator,
              const std::string& proxyConfig, 
              const std::string& proxyName,
-             ProxyPointer proxy)
+             ProxyPointer& proxy)
 {
     try
     {
@@ -257,7 +257,7 @@ def proxy_ptr(self, interfaces, prefix=''):
         return result
 
     def topic_manager_creation(self):
-        result = "\n//Topic Manager code\n"
+        result = ""
         need_topic = False
         for pub in self.component.publishes:
             if communication_is_ice(pub):
@@ -269,6 +269,8 @@ def topic_manager_creation(self):
             ptr = "Ptr"
             manager_type = "Ice::checkedCast<IceStorm::TopicManagerPrx>"
             result += Template(TOPIC_MANAGER_STR).substitute(ptr=ptr, type=manager_type)
+        if len(result)!=0:
+            result = "\n//Topic Manager code\n" + result
         return result
 
 
@@ -287,7 +289,7 @@ def add_templates(self):
 
 
     def publish(self):
-        result = "\n//Publish code\n"
+        result = ""
         for pba, num in get_name_number(self.component.publishes):
             if type(pba) == str:
                 name = pba
@@ -299,22 +301,25 @@ def publish(self):
                 result += f'''publish<{proxy_type}Prx, {proxy_type}PrxPtr>(topicManager,
                     configLoader.get<std::string>("Proxies.{name}Prefix{num}"),
                     "{name}", {name.lower()}_proxy{num}, PROGRAM_NAME);\n'''
-
+        if len(result)!=0:
+            result = "\n//Publish code\n" + result
         return result
 
     def subscribes_to(self):
-        result = "\n//Subscribe code\n"
+        result = ""
         for interface, num in get_name_number(self.component.subscribesTo):
             name = interface.name
             if communication_is_ice(interface):                
                 result += f'''subscribe<{name}I>(communicator(),
                     topicManager, configLoader.get<std::string>("Endpoints.{name}Topic{num}"),
 				    configLoader.get<std::string>("Endpoints.{name}Prefix{num}"), "{name}", worker,  {num if num!="" else "0"},
 				    {name.lower()}_topic, {name.lower()}, PROGRAM_NAME);\n'''
+        if len(result)!=0:
+            result = "\n//Subscribe code\n" + result
         return result
 
     def implements(self):
-        result = "\n//Implement code\n"
+        result = ""
         for ima, num in get_name_number(self.component.implements):
             if type(ima) == str:
                 name = ima
@@ -323,19 +328,22 @@ def implements(self):
             if communication_is_ice(ima):
                 result += f'''implement<{name}I>(communicator(),
                     configLoader.get<std::string>("Endpoints.{name}{num}"), 
-                    "{name}{num}", worker,  {num if num!="" else "0"});\n'''
-
+                    "{name.lower()}{num}", worker,  {num if num!="" else "0"});\n'''
+        if len(result)!=0:
+            result = "\n//Implement code\n" + result
         return result
 
     def requires(self):
-        result = "\n//Require code\n"
+        result = ""
         for interface, num in get_name_number(self.component.requires):
             name = interface.name
             if communication_is_ice(interface):
                 module = self.component.idsl_pool.module_providing_interface(name)
                 proxy_type = utils.get_type_string(name, module['name'])
                 result += f'''require<{proxy_type}Prx, {proxy_type}PrxPtr>(communicator(),
                     configLoader.get<std::string>("Proxies.{name}{num}"), "{name}Proxy{num}", {name.lower()}_proxy{num});\n'''
+        if len(result)!=0:
+            result = "\n//Require code\n" + result
         return result
 
     def specificworker_creation(self):