Introduced fix that allows for conversion and code generation of operations with more than one output pin, i.e. more than one return parameter

Author: deckamil

MCG/MCG_CC/mcg_cc_file_reader.py

@@ -5,7 +5,7 @@
 #       responsible for reading of module content from .exml file.
 #
 #   COPYRIGHT:      Copyright (C) 2021-2023 Kamil Deć github.com/deckamil
-#   DATE:           21 JAN 2023
+#   DATE:           24 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -388,8 +388,18 @@ def read_interaction_targets(self):
                             Logger.save_in_log_file("FileReader", "Have found " + str(connection) + " connection",
                                                     False)
 
-                    # if end of target section if found
-                    if "</COMP>" in self.activity_file[j]:
+                    # if end of action target section is found
+                    if "</COMP>" in self.activity_file[j] and \
+                            source_interaction_type == Connection.ACTION:
+                        # exit "for j in range" loop
+                        break
+
+                    # if end of operation target section is found
+                    if "</COMP>" in self.activity_file[j] and \
+                            "</DEPENDENCIES>" in self.activity_file[j+1] and \
+                            "</OBJECT>" in self.activity_file[j+2] and \
+                            "</COMP>" in self.activity_file[j+3] and \
+                            source_interaction_type == Connection.OPERATION:
                         # exit "for j in range" loop
                         break
 

MCG/MCG_CC/mcg_cc_module_sorter.py

@@ -5,7 +5,7 @@
 #       for finding and sorting of module nodes.
 #
 #   COPYRIGHT:      Copyright (C) 2021-2023 Kamil Deć github.com/deckamil
-#   DATE:           23 JUN 2023
+#   DATE:           24 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -248,10 +248,8 @@ def sort_nodes(self):
                     self.sorted_node_list.append(dependency[0])
                     # remove dependency sublist from dependency list
                     self.dependency_list.remove(dependency)
-                    # get output link
-                    output_link = dependency[0].output_data_list[0]
-                    # get output data name
-                    output_data_name = output_link[Node.DATA_NAME_INDEX]
+                    # get output data list
+                    output_data_list = dependency[0].output_data_list
                     # recalculate number of nodes to sort, i.e. length of dependency list
                     dependency_list_length = len(self.dependency_list)
 
@@ -267,15 +265,18 @@ def sort_nodes(self):
                             for k in range(index, len(dependency)):
                                 # if given node consumes local data elements, which comes from node, which
                                 # was appended above to sorted node list
-                                if output_data_name == dependency[index]:
-                                    # remove local data element from dependency sublist
-                                    dependency.remove(dependency[index])
-                                    # decrement index for next iteration, as one dependence was removed
-                                    # therefore all next dependencies in dependency sublist were pushed by
-                                    # one position towards beginning of the sublist, e.g. [...,A,B,C] -> [...,B,C];
-                                    # A was removed and now B is under previous position of A so at next
-                                    # iteration the same index need to be checked to examine B;
-                                    index = index - 1
+                                for output_link in output_data_list:
+                                    if output_link[Node.DATA_NAME_INDEX] == dependency[index]:
+                                        # remove local data element from dependency sublist
+                                        dependency.remove(dependency[index])
+                                        # decrement index for next iteration, as one dependence was removed
+                                        # therefore all next dependencies in dependency sublist were pushed by
+                                        # one position towards beginning of the sublist, e.g. [...,A,B,C] -> [...,B,C];
+                                        # A was removed and now B is under previous position of A so at next
+                                        # iteration the same index need to be checked to examine B;
+                                        index = index - 1
+                                        # exit "for output_link in" loop
+                                        break
                                 index = index + 1
 
                     # exit "for i in range" loop
@@ -336,7 +337,7 @@ def sort_input_data_list(self):
                                 # record info
                                 Logger.save_in_log_file("ModuleSorter", "Have sorted " + str(sorted_node) + " node",
                                                         False)
-                                # exit "for input_data in" loop
+                                # exit "for input_link in" loop
                                 break
 
     # Description: