update

pythonJaRvis · pythonJaRvis · commit c322c13a28b4 · 2024-03-24T16:59:21.000+08:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,8 @@
 **/__pycache__
 **/backup
 **/olddata
+**/.DS_Store
+
 /.history
 _site
 .sass-cache
diff --git a/Jarvis/.DS_Store b/Jarvis/.DS_Store
diff --git a/Jarvis/dataset/macro_benchmark/pj/.DS_Store b/Jarvis/dataset/macro_benchmark/pj/.DS_Store
diff --git a/Jarvis/dataset/macro_benchmark/pj/TextRank4ZH/example/debug.txt b/Jarvis/dataset/macro_benchmark/pj/TextRank4ZH/example/debug.txt
diff --git a/Jarvis/dataset/micro_benchmark/context_managers/base_class/main.py b/Jarvis/dataset/micro_benchmark/context_managers/base_class/main.py
@@ -0,0 +1,17 @@
+class base:
+    def __init__(self):
+        pass
+    def __enter__(self):
+        return self
+    def __exit__(self,exc_type, exc_val, exc_tb):
+        pass
+class child(base):
+    def __init__(self):
+        pass
+    def __enter__(self):
+        return self
+    def operate(self):
+        pass
+
+with child() as f:
+    f.operate()
diff --git a/Jarvis/dataset/micro_benchmark/context_managers/class/main.py b/Jarvis/dataset/micro_benchmark/context_managers/class/main.py
diff --git a/Jarvis/dataset/micro_benchmark/context_managers/function/main.py b/Jarvis/dataset/micro_benchmark/context_managers/function/main.py
@@ -0,0 +1,16 @@
+class base:
+    def __init__(self):
+        pass
+    def __enter__(self):
+        return self
+    def __exit__(self,exc_type, exc_val, exc_tb):
+        pass
+class child(base):
+    def __init__(self):
+        pass
+    def __enter__(self):
+        return self.operate
+    def operate(self):
+        pass
+with child() as f:
+    f()
diff --git a/Jarvis/dataset/micro_benchmark/context_managers/resource/main.py b/Jarvis/dataset/micro_benchmark/context_managers/resource/main.py
@@ -0,0 +1,9 @@
+class Resource():
+    def __enter__(self):
+        return self
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        pass
+    def operate(self):
+        pass
+with Resource() as res:
+    res.operate()
diff --git a/Jarvis/ground_truth/micro_benchmark/context_managers/base_class/callgraph.json b/Jarvis/ground_truth/micro_benchmark/context_managers/base_class/callgraph.json
@@ -0,0 +1,12 @@
+{
+    "main": [
+        "main.base.__exit__",
+        "main.child.__init__",
+        "main.child.__enter__",
+        "main.child.operate"
+    ],
+    "main.child.__init__": [],
+    "main.child.__enter__": [],
+    "main.base.__exit__": [],
+    "main.child.operate": []
+}
diff --git a/Jarvis/ground_truth/micro_benchmark/context_managers/class/callgraph.json b/Jarvis/ground_truth/micro_benchmark/context_managers/class/callgraph.json
@@ -0,0 +1,12 @@
+{
+    "main": [
+        "main.cls.__exit__",
+        "main.cls.__init__",
+        "main.cls.foo",
+        "main.cls.__enter__"
+    ],
+    "main.cls.__init__": [],
+    "main.cls.__enter__": [],
+    "main.cls.__exit__": [],
+    "main.cls.foo": []
+}
diff --git a/Jarvis/ground_truth/micro_benchmark/context_managers/function/callgraph.json b/Jarvis/ground_truth/micro_benchmark/context_managers/function/callgraph.json
@@ -0,0 +1,11 @@
+{
+    "main": [
+        "main.base.__exit__",
+        "main.child.operate",
+        "main.child.__enter__",
+        "main.child.__init__"
+    ],
+    "main.child.__enter__": [],
+    "main.base.__exit__": [],
+    "main.child.operate": []
+}
diff --git a/Jarvis/ground_truth/micro_benchmark/context_managers/resource/callgraph.json b/Jarvis/ground_truth/micro_benchmark/context_managers/resource/callgraph.json
@@ -0,0 +1 @@
+{"main": ["main.Resource.__enter__", "main.Resource.__exit__", "main.Resource.operate"], "main.Resource.__enter__": [], "main.Resource.__exit__": [], "main.Resource.operate": []}
diff --git a/Jarvis/ground_truth/micro_benchmark/new_control_flow/with/callgraph.json b/Jarvis/ground_truth/micro_benchmark/new_control_flow/with/callgraph.json
diff --git a/Jarvis/reproducing_RQ1/gen_table.py b/Jarvis/reproducing_RQ1/gen_table.py
@@ -4,7 +4,6 @@
 import json
 
 curcwd = os.getcwd()
-curcwd = "/Users/yixuanyan/yyx/github/supplychain/YanYixuan/local"
 base = os.path.join(curcwd,'reproducing_RQ1','macro_benchmark')
 pjList = ['bpytop', 'sqlparse', 'textrank4zh', 'furl', 'rich-cli', 'sshtunnel']
 
diff --git a/Jarvis/reproducing_RQ2/gen_table.py b/Jarvis/reproducing_RQ2/gen_table.py
@@ -67,8 +67,8 @@ def run(truth, pycg, pythoncg):
             if f == "pycg.json":
                 fullname = os.path.join(root, f)
                 returnList[1] = fullname
-                print(root,Output_Path,Gt_Path)
-                print(root.replace(Output_Path, Gt_Path))
+                # print(root,Output_Path,Gt_Path)
+                # print(root.replace(Output_Path, Gt_Path))
                 fullname = os.path.join(root.replace(Output_Path, Gt_Path), 'callgraph.json')
                 returnList[0] = fullname
             if f == "jarvis.json":
@@ -122,13 +122,14 @@ def micro_table(index, item):
     f"lists",
     f"mro",
     f"returns",
+    f"context_managers",
     f"new_arguments",
     f"new_assignments",
     f"new_control_flow",
     f"new_direct_calls",
     f"new_imports"
 ]
-nums = [6, 4, 3, 22, 7, 12, 4, 3, 4, 6, 14, 3, 5, 8, 7, 4, 4, 4, 5, 5, 5]
+nums = [6, 4, 3, 22, 7, 12, 4, 3, 4, 6, 14, 3, 5, 8, 7, 4,4, 4, 4, 4, 5, 5]
 
 s = '''
 |-------------------------------------------------------------------------------------------------------------
@@ -156,6 +157,7 @@ def micro_table(index, item):
 |{} {} {} {} {} {} {} {} {} {} {} 
 |{} {} {} {} {} {} {} {} {} {} {} 
 |{} {} {} {} {} {} {} {} {} {} {} 
+|{} {} {} {} {} {} {} {} {} {} {} 
 
 
 '''
@@ -168,6 +170,8 @@ def micro_table(index, item):
 ]
 
 for index, (entry, num) in enumerate(zip(entries, nums)):
+    if entry == 'context_managers':
+        print
     pycgres, jarvisres = micro_table(index, entry)
     cur.append(entry.center(interval // 2))
     cur.append("{}/{}".format(pycgres[4], num).center(int1))
@@ -205,19 +209,7 @@ def micro_table(index, item):
 
 pjList = ['bpytop', 'sqlparse', 'textrank4zh', 'furl', 'rich-cli', 'sshtunnel']
 gt_bpytop = '/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/macro_benchmark/groundTruth/bpytop'
-# gt_bpytop = "/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/script/macro/result/bpytop/bpytop.json"
-gt_rich = '/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/macro_benchmark/groundTruth/rich-cli'
-gt_sqlparse = '/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/macro_benchmark/groundTruth/sqlparse'
-gt_ssh = '/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/macro_benchmark/groundTruth/sshtunnel'
-gt_text = '/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/macro_benchmark/groundTruth/TextRank4ZH'
-gt_furl = '/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/macro_benchmark/groundTruth/furl'
-
-output_bpytop = '/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/macro_benchmark/output/bpytop'
-output_rich = '/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/macro_benchmark/output/rich-cli'
-output_sqlparse = '/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/macro_benchmark/output/sqlparse'
-output_ssh = '/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/macro_benchmark/output/sshtunnel'
-output_text = '/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/macro_benchmark/output/textrank4zh'
-output_furl = '/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/macro_benchmark/output/furl'
+
 
 
 def run(truth, pycg, pythoncg):
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/base_class/jarvis.json b/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/base_class/jarvis.json
@@ -0,0 +1 @@
+{"main": ["main.base.__exit__", "main.child.__init__", "main.child.__enter__", "main.child.operate"], "main.child.__init__": [], "main.child.__enter__": [], "main.base.__exit__": [], "main.child.operate": []}
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/base_class/pycg.json b/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/base_class/pycg.json
@@ -0,0 +1,11 @@
+{
+    "main": [
+        "main.child.__init__"
+    ],
+    "main.base.__init__": [],
+    "main.base.__enter__": [],
+    "main.base.__exit__": [],
+    "main.child.__init__": [],
+    "main.child.__enter__": [],
+    "main.child.operate": []
+}
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/class/jarvis.json b/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/class/jarvis.json
@@ -0,0 +1 @@
+{"main": ["main.cls.__exit__", "main.cls.__init__", "main.cls.foo", "main.cls.__enter__"], "main.cls.__init__": [], "main.cls.__enter__": [], "main.cls.__exit__": [], "main.cls.foo": []}
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/class/pycg.json b/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/class/pycg.json
@@ -0,0 +1,9 @@
+{
+    "main": [
+        "main.cls.__init__"
+    ],
+    "main.cls.__init__": [],
+    "main.cls.__enter__": [],
+    "main.cls.foo": [],
+    "main.cls.__exit__": []
+}
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/function/jarvis.json b/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/function/jarvis.json
@@ -0,0 +1,12 @@
+{
+    "main": [
+        "main.child.__enter__",
+        "main.base.__exit__",
+        "main.child.operate",
+        "main.child.__init__"
+    ],
+    "main.child.__init__": [],
+    "main.child.__enter__": [],
+    "main.base.__exit__": [],
+    "main.child.operate": []
+}
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/function/pycg.json b/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/function/pycg.json
@@ -0,0 +1,10 @@
+{
+    "main": [
+        "main.child.__init__"
+    ],
+    "main.base.__init__": [],
+    "main.base.__enter__": [],
+    "main.base.__exit__": [],
+    "main.child.__enter__": [],
+    "main.child.operate": []
+}
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/resource/jarvis.json b/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/resource/jarvis.json
@@ -0,0 +1 @@
+{"main": ["main.Resource.__enter__", "main.Resource.__exit__", "main.Resource.operate"], "main.Resource.__enter__": [], "main.Resource.__exit__": [], "main.Resource.operate": []}
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/resource/pycg.json b/Jarvis/reproducing_RQ2/micro_benchmark/context_managers/resource/pycg.json
@@ -0,0 +1 @@
+{"main": [], "main.Resource.__enter__": [], "main.Resource.__exit__": [], "main.Resource.operate": []}
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/mro/self_assignment/pycg.json b/Jarvis/reproducing_RQ2/micro_benchmark/mro/self_assignment/pycg.json
@@ -1 +1,13 @@
-{"main": ["main.A.funca", "main.B.funcb", "main.A.func", "main.A.__init__"], "main.B.funcb": [], "main.B.func": [], "main.A.__init__": [], "main.A.funca": [], "main.A.func": []}
+{
+    "main": [
+        "main.A.funca",
+        "main.B.funcb",
+        "main.A.func",
+        "main.A.__init__"
+    ],
+    "main.B.funcb": [],
+    "main.B.func": [],
+    "main.A.__init__": [],
+    "main.A.funca": [],
+    "main.A.func": []
+}
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/mro/super_call/jarvis.json b/Jarvis/reproducing_RQ2/micro_benchmark/mro/super_call/jarvis.json
@@ -1 +1,16 @@
-{"main": ["main.C.__init__"], "main.C.__init__": ["<builtin>.super"], "<builtin>.super": [], "main.A.__init__": ["main.A.__init__.f"], "main.A.__init__.f": [], "main.B.__init__": ["<builtin>.super"]}
+{
+    "main": [
+        "main.C.__init__"
+    ],
+    "main.C.__init__": [
+        "<builtin>.super"
+    ],
+    "<builtin>.super": [],
+    "main.A.__init__": [
+        "main.A.__init__.f"
+    ],
+    "main.A.__init__.f": [],
+    "main.B.__init__": [
+        "<builtin>.super"
+    ]
+}
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/mro/super_call/pycg.json b/Jarvis/reproducing_RQ2/micro_benchmark/mro/super_call/pycg.json
@@ -1 +1,16 @@
-{"main": ["main.C.__init__"], "main.A.__init__": ["main.A.__init__.f"], "main.A.__init__.f": [], "main.B.__init__": ["<builtin>.super"], "<builtin>.super": [], "main.C.__init__": ["<builtin>.super"]}
+{
+    "main": [
+        "main.C.__init__"
+    ],
+    "main.A.__init__": [
+        "main.A.__init__.f"
+    ],
+    "main.A.__init__.f": [],
+    "main.B.__init__": [
+        "<builtin>.super"
+    ],
+    "<builtin>.super": [],
+    "main.C.__init__": [
+        "<builtin>.super"
+    ]
+}
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/new_control_flow/with/jarvis.json b/Jarvis/reproducing_RQ2/micro_benchmark/new_control_flow/with/jarvis.json
diff --git a/Jarvis/reproducing_RQ2/micro_benchmark/new_control_flow/with/pycg.json b/Jarvis/reproducing_RQ2/micro_benchmark/new_control_flow/with/pycg.json
diff --git a/Jarvis/tool/Jarvis/machinery/nodes.py b/Jarvis/tool/Jarvis/machinery/nodes.py
@@ -1,5 +1,4 @@
-# @Time : 2022/11/21 14:18
-# @Author : yixuanYan
+
 
 class NodeManager:
     def __init__(self):
diff --git a/Jarvis/tool/Jarvis/machinery/returns.py b/Jarvis/tool/Jarvis/machinery/returns.py
@@ -1,5 +1,3 @@
-# @Time : 2022/7/7 14:07
-# @Author : yixuanYan
 import utils
 
 
diff --git a/Jarvis/tool/Jarvis/processing/extProcessor.py b/Jarvis/tool/Jarvis/processing/extProcessor.py
@@ -111,7 +111,6 @@ def pushStack(self, callDefi: Definition, isVisited=True, isEntry=False):
                 self.cg.add_edge(self.current_ns, callNs)
             return
         gol.add_value('cnt')
-        # base = "/Users/yixuanyan/yyx/github/supplychain/YanYixuan/pythonCG/result/jarvis/"
         # # if gol.get_value('cnt') % 10 == 0:
         # with open(base + "text.txt",'a') as f:
         #     f.write("{}:{}\n".format(len(self.scope_manager.scopes),len(self.def_manager.defs)))
@@ -294,8 +293,22 @@ def visit_With(self, node):
                     continue
                 function1Ns = utils.join_ns(leftDefi[0].get_ns(), "__enter__")
                 function2Ns = utils.join_ns(leftDefi[0].get_ns(), "__exit__")
-                function1Defi = self.def_manager.get(function1Ns)
-                function2Defi = self.def_manager.get(function2Ns)
+                
+                # function1Defi = self.def_manager.get(function1Ns)
+                # function2Defi = self.def_manager.get(function2Ns)
+                # function1Defi = self.getYPOint(node.lineno,[function1Ns])
+                # function2Defi = self.getYPOint(node.lineno,[function2Ns])
+                # tmp1 = self.find_field(leftDefi[0].get_ns(),"__enter__")
+                # tmp2 = self.find_field(leftDefi[0].get_ns(),"__exit__")
+                function1Defi = self.find_field(leftDefi[0].get_ns(),"__enter__")
+                function2Defi = self.find_field(leftDefi[0].get_ns(),"__exit__")
+                # print(tmp1.get_ns(),tmp2.get_ns())
+
+                # print(function1Defi,function2Defi)
+                # for d in function1Defi:
+                #     self.pushStack(d, isEntry=True)
+                # for d in function2Defi:
+                #     self.pushStack(d, isEntry=True)
                 self.pushStack(function1Defi, isEntry=True)
                 self.pushStack(function2Defi, isEntry=True)
                 leftPoint = self.getYPOint(
diff --git a/README.md b/README.md
diff --git a/_config.yml b/_config.yml
diff --git a/index.md b/index.md
