update compilation db logic

Author: diivm

bindings/python/scripts/parse.py

@@ -33,7 +33,7 @@ def __init__(self, file, compiler_arguments):
         }
 
     @staticmethod
-    def is_valid_child(parent_node, child_node):
+    def _is_valid_child(parent_node, child_node):
         child = child_node.get("cursor")
         parent_filename = parent_node.get("filename")
 
@@ -117,7 +117,7 @@ def parse_node_recursive(cls, node):
         # Get cursor's children and recursively add their info to a dictionary, as members of the parent
         for child in cursor.get_children():
             child_node = {"cursor": child, "filename": filename, "depth": depth + 1}
-            if cls.is_valid_child(node, child_node):
+            if cls._is_valid_child(node, child_node):
                 child_parsed_info = cls.parse_node_recursive(child_node)
                 parsed_info["members"].append(child_parsed_info)
 
@@ -133,30 +133,3 @@ def get_parsed_info(self):
                 - The key 'members' contains the node's children's `parsed_info`
         """
         return self.parse_node_recursive(self.root_node)
-
-    # @TODO: Move the function out of this file in a separate PR
-    @staticmethod
-    def get_compilation_arguments(compilation_database_path, filename):
-        """
-        Yields the compilation commands extracted from the compilation database
-
-        Parameters:
-            - compilation_database_path: The path to `compile_commands.json`
-            - filename: The file's name to get its compilation commands
-
-        Yields:
-            - compilation commands (list): The arguments passed to the compiler
-        """
-
-        # Build a compilation database found in the given directory
-        compilation_database = clang.CompilationDatabase.fromDirectory(
-            buildDir=compilation_database_path
-        )
-        # Get compilation commands from the compilation database for the given file
-        compilation_commands = compilation_database.getCompileCommands(
-            filename=filename
-        )
-
-        for compilation_command in compilation_commands:
-            # Extract compiler arguments, excluding compiler and filename
-            yield list(compilation_command.arguments)[1:-1]

bindings/python/tests/test_parse.py

@@ -1,9 +1,10 @@
 from context import scripts
 import clang.cindex as clang
 from scripts.parse import Parse
+from scripts.compilation_database import CompilationDatabase
 
 
-def create_compilation_database(tmp_path, filepath):
+def get_compilation_database_path(tmp_path, filepath):
     input = tmp_path / "compile_commands.json"
     x = [
         {
@@ -25,15 +26,20 @@ def get_parsed_info(tmp_path, file_contents):
     with open(source_path, "w") as f:
         f.write(str(file_contents))
 
-        compiler_arguments = next(
-            Parse.get_compilation_arguments(
-                compilation_database_path=create_compilation_database(
-                    tmp_path=tmp_path, filepath=source_path
-                ),
-                filename=source_path,
-            )
+        compilation_database_path = get_compilation_database_path(
+            tmp_path=tmp_path, filepath=source_path
         )
 
+        compilation_database = CompilationDatabase(
+            compilation_database_path=compilation_database_path
+        )
+
+        compilation_arguments = compilation_database.get_compilation_arguments(
+            filename=source_path
+        )
+
+        compiler_arguments = compilation_arguments.get(source_path)
+
     parsed_info = Parse(source_path, compiler_arguments).get_parsed_info()
 
     return parsed_info