Merge pull request #422 from OEG-Clark/dev_clark

Data Flow Fix

Author: dgarijo

README.md

@@ -70,6 +70,12 @@ Make sure you have tree-sitter installed, C complier is needed, more [info](http
 ```
 pip install tree-sitter
 ```
+Note that if the ".so" file is not working properly, it is recommended that run the following commeds to generate a so file for your OS:
+```
+git clone https://github.com/tree-sitter/tree-sitter-python
+
+python inspect4py/build.py
+```
 
 Make sure you have graphviz installed:
 

inspect4py/build.py

@@ -0,0 +1,11 @@
+from tree_sitter import Language
+
+Language.build_library(
+  # Store the library in the `build` directory
+  'my-languages.so',
+
+  # Include one or more languages
+  [
+    'tree-sitter-python'
+  ]
+)

inspect4py/cli.py

@@ -595,7 +595,8 @@ def _f_definitions(self, functions_definitions):
             if self.source_code:
                 funcs_info[f.name]["source_code"] = ast_to_source_code(f)
             if self.data_flow:
-                code_tokens, dfg = extract_dataflow(funcs_info[f.name]["source_code"], self.parser, "python")
+                temp_source_code = ast_to_source_code(f)
+                code_tokens, dfg = extract_dataflow(temp_source_code, self.parser, "python")
                 funcs_info[f.name]["data_flow"] = dfg
                 funcs_info[f.name]["code_tokens"] = code_tokens
         return funcs_info
@@ -1263,6 +1264,8 @@ def main(input_path, output_dir, ignore_dir_pattern, ignore_file_pattern, requir
             path_to_languages = str(Path(__file__).parent / "resources")
             if sys.platform.startswith("win") or sys.platform.startswith("cygwin"):
                 language = Language(path_to_languages + os.path.sep + "python_win.so", "python")
+            elif sys.platform.startswith("darwin"):
+                language = Language(path_to_languages + os.path.sep + "python_mac.so", "python")
             else:
                 language = Language(path_to_languages + os.path.sep + "python_unix.so", "python")
         else:
@@ -1311,22 +1314,37 @@ def main(input_path, output_dir, ignore_dir_pattern, ignore_file_pattern, requir
             except:
                 print("Readme not found at root level")
         for subdir, dirs, files in os.walk(input_path):
-
+            # print(subdir, dirs, files)
             for ignore_d in ignore_dir_pattern:
                 dirs[:] = [d for d in dirs if not d.startswith(ignore_d)]
             for ignore_f in ignore_file_pattern:
                 files[:] = [f for f in files if not f.startswith(ignore_f)]
             for f in files:
                 if ".py" in f and not f.endswith(".pyc"):
+                    # path = os.path.join(subdir, f)
+                    # # print(path)
+                    # relative_path = Path(subdir).relative_to(Path(input_path).parent)
+                    # out_dir = str(Path(output_dir) / relative_path)
+                    # cf_dir, json_dir = create_output_dirs(out_dir, control_flow)
+                    # code_info = CodeInspection(path, cf_dir, json_dir, control_flow, abstract_syntax_tree, source_code,
+                    #                            data_flow, parser)
+                    #
+                    # if code_info.fileJson:
+                    #     print(code_info.fileJson[0])
+                    #     if out_dir not in dir_info:
+                    #         dir_info[out_dir] = [code_info.fileJson[0]]
+                    #     else:
+                    #         dir_info[out_dir].append(code_info.fileJson[0])
                     try:
-
                         path = os.path.join(subdir, f)
+                        # print(path)
                         relative_path = Path(subdir).relative_to(Path(input_path).parent)
                         out_dir = str(Path(output_dir) / relative_path)
                         cf_dir, json_dir = create_output_dirs(out_dir, control_flow)
                         code_info = CodeInspection(path, cf_dir, json_dir, control_flow, abstract_syntax_tree, source_code, data_flow, parser)
-                        # print(parsers)
+
                         if code_info.fileJson:
+                            # print(code_info.fileJson[0])
                             if out_dir not in dir_info:
                                 dir_info[out_dir] = [code_info.fileJson[0]]
                             else:

inspect4py/resources/python_mac.so

@@ -481,7 +481,7 @@ def test_data_flow(self):
         output_dir = test_out_path + os.path.sep + "output_dir"
         control_flow = False
         abstract_syntax_tree = False
-        source_code = True
+        source_code = False
         data_flow = True
         path_to_languages = str(Path(__file__).parent.parent / "inspect4py" / "resources")
         if sys.platform.startswith("win") or sys.platform.startswith("cygwin"):