Fixed passing arguments to analyses

sola-st · Mar 5, 2024 · 8b3d771 · 8b3d771
1 parent 38cb1e5
commit 8b3d771
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/dynapyt/analyses/BaseAnalysis.py b/src/dynapyt/analyses/BaseAnalysis.py
@@ -5,7 +5,7 @@
 
 class BaseAnalysis:
 
-    def __init__(self, conf: str = None) -> None:
+    def __init__(self, conf: str = None, output_dir: str = None) -> None:
         self.asts = {}
         self.conf = conf
 

diff --git a/src/dynapyt/run_analysis.py b/src/dynapyt/run_analysis.py
@@ -68,7 +68,7 @@ def run_analysis(
     else:
         rmtree(output_dir)
         output_dir.mkdir()
-    analyses = [f"{a};{str(output_dir)}" for a in analyses]
+    analyses = [f"{a};output_dir={str(output_dir)}" for a in analyses]
     with open(str(analyses_file), "w") as f:
         f.write("\n".join(analyses))
 

diff --git a/src/dynapyt/utils/runtimeUtils.py b/src/dynapyt/utils/runtimeUtils.py
@@ -11,12 +11,12 @@ def load_analyses(analyses: List[Any]) -> List[BaseAnalysis]:
             if ";" in ana:
                 parts = ana.split(";")
                 ana = parts[0]
-                conf = tuple(parts[1:])
+                conf = {p.split("=")[0]: p.split("=")[1] for p in parts[1:]}
             module_parts = ana.split(".")
             module = importlib.import_module(".".join(module_parts[:-1]))
             class_ = getattr(module, module_parts[-1])
             if conf is not None:
-                res_analyses.append(class_(*conf))
+                res_analyses.append(class_(**conf))
             else:
                 res_analyses.append(class_())
         elif isinstance(ana, BaseAnalysis):

diff --git a/tests/test_analysis/call_graph/analysis.py b/tests/test_analysis/call_graph/analysis.py
@@ -8,8 +8,8 @@
 
 
 class TestAnalysis(BaseAnalysis):
-    def __init__(self, conf: str = None):
-        super().__init__(conf)
+    def __init__(self, conf: str = None, **kwargs):
+        super().__init__(conf, **kwargs)
         self.graph = {}
 
     """