Included conversion and code generation for relation operators

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:           13 JUN 2023
+#   DATE:           23 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -40,8 +40,7 @@ class FileChecker(object):
 
     # list of actions types
     action_3letter_type_list = ["ADD", "SUB", "MUL", "DIV", "AND", "NOT"]
-
-    action_2letter_type_list = ["OR"]
+    action_2letter_type_list = ["OR", "EQ", "NE", "GT", "LT", "GE", "LE"]
 
     # list of interface element types
     interface_element_type_list = ["INT8", "INT16", "INT32", "INT64",
@@ -96,10 +95,9 @@ def check_action_type(action_type_ref):
         # result flag
         action_type_valid = False
 
-        # check 3-letter action types
-        if len(action_type_ref) > 2:
-
-            # for all possible action types
+        # is valid type is not found
+        if not action_type_valid:
+            # check all possible 3-letter 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]:
@@ -108,10 +106,9 @@ def check_action_type(action_type_ref):
                     # exit loop
                     break
 
-        # check 2-letter action types
-        elif len(action_type_ref) < 3:
-
-            # for all possible action types
+        # is valid types is not found
+        if not action_type_valid:
+            # check 2-letter 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]:

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:           13 JUN 2023
+#   DATE:           23 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -287,40 +287,45 @@ def convert_specific_action_node_arity_1(self, sorted_node, operator):
     # This method converts module action node into configuration file.
     def convert_action_node(self, sorted_node):
 
-        # if sorted node contains ADD action
+        # depending on the type of action, covert module node into configuration file.
         if sorted_node.name[0:3] == "ADD":
-            # convert ADD action
             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_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_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_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:3] == "NOT":
+            self.convert_specific_action_node_arity_1(sorted_node, "!")
+
         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, "!")
+        elif sorted_node.name[0:2] == "EQ":
+            self.convert_specific_action_node_arity_n(sorted_node, "==")
+
+        elif sorted_node.name[0:2] == "NE":
+            self.convert_specific_action_node_arity_n(sorted_node, "!=")
+
+        elif sorted_node.name[0:2] == "GT":
+            self.convert_specific_action_node_arity_n(sorted_node, ">")
+
+        elif sorted_node.name[0:2] == "LT":
+            self.convert_specific_action_node_arity_n(sorted_node, "LT")
+
+        elif sorted_node.name[0:2] == "GE":
+            self.convert_specific_action_node_arity_n(sorted_node, ">=")
+
+        elif sorted_node.name[0:2] == "LE":
+            self.convert_specific_action_node_arity_n(sorted_node, "<=")
 
     # Description:
     # This method converts module data node into configuration file.

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:           25 MAR 2023
+#   DATE:           23 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -42,7 +42,7 @@ class ModuleSorter(object):
     SORTED_NODE_LIST_INDEX = 0
 
     # list of action interaction that require to distinguish main data input
-    input_sensitivity_action_list = ["SUB", "DIV"]
+    input_sensitive_action_list = ["SUB", "DIV", "GT", "LT", "GE", "LE"]
 
     # Description:
     # This is class constructor.
@@ -311,8 +311,9 @@ def sort_input_data_list(self):
             if sorted_node.type == Node.ACTION:
 
                 # and if action is input sensitive, i.e. requires to distinguish main input data
-                for input_sensitivity_action in ModuleSorter.input_sensitivity_action_list:
-                    if sorted_node.name[0:3] == input_sensitivity_action:
+                for input_sensitive_action in ModuleSorter.input_sensitive_action_list:
+                    if (sorted_node.name[0:3] == input_sensitive_action) or \
+                            (sorted_node.name[0:2] == input_sensitive_action):
 
                         # get marker position
                         marker_position = sorted_node.name.find("+")