Inserted conversion and code generation of logic operators AND, OR, NOT

Author: deckamil

MCG/MCG_CC/mcg_cc_file_checker.py

@@ -5,7 +5,7 @@
 #       responsible for checking of model module content from .exml file.
 #
 #   COPYRIGHT:      Copyright (C) 2021-2023 Kamil Deć github.com/deckamil
-#   DATE:           7 JUN 2023
+#   DATE:           13 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -39,12 +39,15 @@
 class FileChecker(object):
 
     # list of actions types
-    action_type_list = ["ADD", "SUB", "MUL", "DIV"]
+    action_3letter_type_list = ["ADD", "SUB", "MUL", "DIV", "AND", "NOT"]
+
+    action_2letter_type_list = ["OR"]
 
     # list of interface element types
     interface_element_type_list = ["INT8", "INT16", "INT32", "INT64",
                                    "UINT8", "UINT16", "UINT32", "UINT64",
-                                   "FLOAT32", "FLOAT64"]
+                                   "FLOAT32", "FLOAT64",
+                                   "BOOL"]
 
     # Description:
     # This is class constructor.
@@ -93,14 +96,29 @@ def check_action_type(action_type_ref):
         # result flag
         action_type_valid = False
 
-        # for all possible action types
-        for action_type in FileChecker.action_type_list:
-            # if action type is the same as in reference
-            if action_type == action_type_ref[0:3]:
-                # set flag
-                action_type_valid = True
-                # exit loop
-                break
+        # check 3-letter action types
+        if len(action_type_ref) > 2:
+
+            # for all possible action types
+            for action_type in FileChecker.action_3letter_type_list:
+                # if action type is the same as in reference
+                if action_type == action_type_ref[0:3]:
+                    # set flag
+                    action_type_valid = True
+                    # exit loop
+                    break
+
+        # check 2-letter action types
+        elif len(action_type_ref) < 3:
+
+            # for all possible action types
+            for action_type in FileChecker.action_2letter_type_list:
+                # if action type is the same as in reference
+                if action_type == action_type_ref[0:2]:
+                    # set flag
+                    action_type_valid = True
+                    # exit loop
+                    break
 
         # return flag
         return action_type_valid

MCG/MCG_CC/mcg_cc_main.py

@@ -7,7 +7,7 @@
 #       file.
 #
 #   COPYRIGHT:      Copyright (C) 2021-2023 Kamil Deć github.com/deckamil
-#   DATE:           10 JUN 2023
+#   DATE:           13 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -142,15 +142,15 @@ def convert_model():
                 # check errors
                 ErrorHandler.check_errors()
 
-                # initialize sorter
+                # initialize module sorter
                 module_sorter = ModuleSorter(file_reader_list)
                 # sort module content
                 module_sorter_list = module_sorter.sort_module()
 
                 # check errors
                 ErrorHandler.check_errors()
 
-                # initialize converter
+                # initialize module converter
                 module_converter = ModuleConverter(file_finder_list, file_reader_list, module_sorter_list)
                 # convert module content
                 module_converter.convert_module()

MCG/MCG_CC/mcg_cc_module_converter.py

@@ -5,7 +5,7 @@
 #       for conversion of module content into configuration file format.
 #
 #   COPYRIGHT:      Copyright (C) 2021-2023 Kamil Deć github.com/deckamil
-#   DATE:           28 MAY 2023
+#   DATE:           13 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -240,8 +240,8 @@ def convert_operation_node(self, sorted_node):
             Logger.save_in_log_file("ModuleConverter", "Have converted to " + str(conversion_line) + " line", False)
 
     # Description:
-    # This method converts module specific action node into configuration file.
-    def convert_specific_action_node(self, sorted_node, math_symbol):
+    # This method converts module specific action node with n-argument operator into configuration file.
+    def convert_specific_action_node_arity_n(self, sorted_node, operator):
 
         # get output link
         output_link = sorted_node.output_data_list[0]
@@ -254,40 +254,73 @@ def convert_specific_action_node(self, sorted_node, math_symbol):
             input_data_name = input_link[Node.DATA_NAME_INDEX]
             # append input data element to conversion line
             conversion_line = conversion_line + str(input_data_name)
-            # append math symbol to conversion line
-            conversion_line = conversion_line + str(" ") + str(math_symbol) + str(" ")
+            # append operator to conversion line
+            conversion_line = conversion_line + str(" ") + str(operator) + str(" ")
 
-        # remove spare math symbol and whitespace
+        # remove spare operator and whitespace
         conversion_line = conversion_line[0:len(conversion_line) - 3]
         # append conversion line to configuration file
         self.configuration_file.append(conversion_line)
 
         # record info
         Logger.save_in_log_file("ModuleConverter", "Have converted to " + str(conversion_line) + " line", False)
 
+    # Description:
+    # This method converts module specific action node with 1-argument operator into configuration file.
+    def convert_specific_action_node_arity_1(self, sorted_node, operator):
+
+        # get input link
+        input_link = sorted_node.input_data_list[0]
+        # get output link
+        output_link = sorted_node.output_data_list[0]
+        # set beginning of action interaction to conversion line
+        conversion_line = str("$INS ") + str(output_link[Node.DATA_NAME_INDEX]) + str(" = ") + \
+                          str(operator) + str(input_link[Node.DATA_NAME_INDEX])
+
+        # append conversion line to configuration file
+        self.configuration_file.append(conversion_line)
+
+        # record info
+        Logger.save_in_log_file("ModuleConverter", "Have converted to " + str(conversion_line) + " line", False)
+
     # Description:
     # This method converts module action node into configuration file.
     def convert_action_node(self, sorted_node):
 
         # if sorted node contains ADD action
         if sorted_node.name[0:3] == "ADD":
             # convert ADD action
-            self.convert_specific_action_node(sorted_node, "+")
+            self.convert_specific_action_node_arity_n(sorted_node, "+")
 
         # if sorted node contains SUB action
         elif sorted_node.name[0:3] == "SUB":
             # convert SUB action
-            self.convert_specific_action_node(sorted_node, "-")
+            self.convert_specific_action_node_arity_n(sorted_node, "-")
 
         # if sorted node contains MUL action
         elif sorted_node.name[0:3] == "MUL":
             # convert MUL action
-            self.convert_specific_action_node(sorted_node, "*")
+            self.convert_specific_action_node_arity_n(sorted_node, "*")
 
         # if sorted node contains DIV action
         elif sorted_node.name[0:3] == "DIV":
             # convert DIV action
-            self.convert_specific_action_node(sorted_node, "/")
+            self.convert_specific_action_node_arity_n(sorted_node, "/")
+
+        # if sorted node contains AND action
+        elif sorted_node.name[0:3] == "AND":
+            # convert DIV action
+            self.convert_specific_action_node_arity_n(sorted_node, "&&")
+
+        # if sorted node contains OR action
+        elif sorted_node.name[0:2] == "OR":
+            # convert DIV action
+            self.convert_specific_action_node_arity_n(sorted_node, "||")
+
+        # if sorted node contains NOT action
+        elif sorted_node.name[0:3] == "NOT":
+            # convert DIV action
+            self.convert_specific_action_node_arity_1(sorted_node, "!")
 
     # Description:
     # This method converts module data node into configuration file.