Merge branch 'main' of github.com:costa-group/grey

src/parser/cfg_block_actions/inline_function.py → src/cfg_methods/cfg_block_actions/inline_function.py

@@ -1,16 +1,15 @@
 from copy import copy
-from typing import Optional, Dict, Tuple
-from global_params.types import block_id_T, function_name_T, var_id_T
-from parser.cfg_block_actions.actions_interface import BlockAction
-from parser.cfg_block_actions.split_block import SplitBlock
+from typing import Optional, Dict
+from global_params.types import function_name_T, var_id_T
+from cfg_methods.cfg_block_actions.actions_interface import BlockAction
+from cfg_methods.cfg_block_actions.split_block import SplitBlock
 from parser.cfg_instruction import CFGInstruction
 from parser.cfg_block_list import CFGBlockList
 from parser.cfg_block import CFGBlock
 from parser.cfg_function import CFGFunction
 from parser.cfg_object import CFGObject
-from parser.cfg_block_actions.utils import modify_comes_from, modify_successors
+from cfg_methods.cfg_block_actions.utils import modify_comes_from, modify_successors
 from cfg_methods.variable_renaming import rename_variables_block_list, rename_cfg_function
-from analysis.cfg_validation import validate_block_list_comes_from
 
 
 class InlineFunction(BlockAction):

src/parser/cfg_block_actions/merge_blocks.py → src/cfg_methods/cfg_block_actions/merge_blocks.py

@@ -1,6 +1,6 @@
-from typing import List, Optional
-from parser.cfg_block_actions.actions_interface import BlockAction
-from parser.cfg_block_actions.utils import modify_comes_from, modify_successors
+from typing import Optional
+from cfg_methods.cfg_block_actions.actions_interface import BlockAction
+from cfg_methods.cfg_block_actions.utils import modify_comes_from, modify_successors
 from parser.cfg_block_list import CFGBlockList
 from parser.cfg_block import CFGBlock
 from global_params.types import block_id_T

src/parser/cfg_block_actions/split_block.py → src/cfg_methods/cfg_block_actions/split_block.py

@@ -1,10 +1,8 @@
 from typing import Optional, Tuple
-from parser.cfg_block_actions.actions_interface import BlockAction
-from parser.cfg_block_actions.utils import modify_comes_from, modify_successors
+from cfg_methods.cfg_block_actions.actions_interface import BlockAction
+from cfg_methods.cfg_block_actions.utils import modify_comes_from, modify_successors
 from parser.cfg_block_list import CFGBlockList
 from parser.cfg_block import CFGBlock
-from global_params.types import block_id_T
-from analysis.cfg_validation import validate_block_list_comes_from
 
 
 def split_blocks_ids(current_node: str) -> Tuple[str, str]:

src/cfg_methods/function_inlining.py

@@ -5,14 +5,11 @@
 from collections import defaultdict
 from global_params.types import block_id_T, component_name_T, function_name_T, block_list_id_T
 from parser.cfg_block import CFGBlock
-from analysis.cfg_validation import validate_block_list_comes_from
 from parser.cfg_block_list import CFGBlockList
 from parser.cfg_object import CFGObject
 from parser.cfg import CFG
-from parser.cfg_block_actions.inline_function import InlineFunction
+from cfg_methods.cfg_block_actions.inline_function import InlineFunction
 from cfg_methods.utils import union_find_search
-import networkx as nx
-import matplotlib.pyplot as plt
 
 # For each time a function is invoked, we store the position of the instruction (int) in the
 # block (blok_id_T) that appears in the block list (block_list_id)

src/cfg_methods/sub_block_generation.py

@@ -6,10 +6,10 @@
 from global_params.types import block_id_T, function_name_T
 from itertools import chain
 from parser.cfg_block_list import CFGBlockList
-from parser.cfg_block_actions.merge_blocks import MergeBlocks
+from cfg_methods.cfg_block_actions.merge_blocks import MergeBlocks
 from parser.cfg import CFG
 import parser.constants as constants
-from parser.cfg_block_actions.split_block import SplitBlock
+from cfg_methods.cfg_block_actions.split_block import SplitBlock
 from cfg_methods.utils import union_find_search