Fixes bugs in ground truth files and in the mismatch tables emitted in the

micro-benchmark-autogen-templates/python_features/args/multiple/main_gt.json

@@ -41,7 +41,7 @@
             "line_number": 4,
             "col_offset": 19,
             "function": "my_sum",
-            "parameter": "integers",
+            "parameter": "arguments",
             "type": [
                 "tuple"
             ]

micro-benchmark-autogen-templates/python_features/assignments/augmented/main_gt.json

@@ -31,14 +31,14 @@
             "line_number": 6,
             "col_offset": 5,
             "function": "func1",
-            "parameter": "a",
+            "variable": "a",
             "type": [
                 "<value1>"
             ]
         },
         {
             "file": "main.py",
-            "line_number": 11,
+            "line_number": 10,
             "col_offset": 1,
             "variable": "b",
             "type": [

micro-benchmark-autogen-templates/python_features/assignments/nested_unpack/main.py

@@ -19,3 +19,4 @@ def func4():
 
 
 (a, b), (c, d) = [(func1, func2), (func3, func4)]
+a(); b(); c(); d();

micro-benchmark-autogen-templates/python_features/assignments/recursive_tuple/main_gt.json

@@ -121,7 +121,7 @@
             "file": "main.py",
             "line_number": 33,
             "col_offset": 1,
-            "function": "a",
+            "variable": "a",
             "type": [
                 "callable"
             ]
@@ -174,7 +174,7 @@
         {
             "file": "main.py",
             "line_number": 37,
-            "col_offset": 5,
+            "col_offset": 4,
             "variable": "b",
             "type": [
                 "callable"

micro-benchmark-autogen-templates/python_features/assignments/starred/main_gt.json

@@ -47,7 +47,7 @@
         },
         {
             "file": "main.py",
-            "line_number": 18,
+            "line_number": 17,
             "col_offset": 1,
             "variable": "a",
             "type": [
@@ -56,7 +56,7 @@
         },
         {
             "file": "main.py",
-            "line_number": 18,
+            "line_number": 17,
             "col_offset": 5,
             "variable": "b",
             "type": [
@@ -83,7 +83,7 @@
         },
         {
             "file": "main.py",
-            "line_number": 18,
+            "line_number": 17,
             "col_offset": 8,
             "variable": "c",
             "type": [
@@ -92,7 +92,7 @@
         },
         {
             "file": "main.py",
-            "line_number": 20,
+            "line_number": 19,
             "col_offset": 1,
             "variable": "d",
             "type": [
@@ -101,7 +101,7 @@
         },
         {
             "file": "main.py",
-            "line_number": 21,
+            "line_number": 20,
             "col_offset": 1,
             "variable": "e",
             "type": [
@@ -110,7 +110,7 @@
         },
         {
             "file": "main.py",
-            "line_number": 22,
+            "line_number": 21,
             "col_offset": 1,
             "variable": "f",
             "type": [
@@ -119,7 +119,7 @@
         },
         {
             "file": "main.py",
-            "line_number": 23,
+            "line_number": 22,
             "col_offset": 1,
             "variable": "g",
             "type": [

micro-benchmark-autogen-templates/python_features/classes/abstract_class/main_gt.json

@@ -11,7 +11,7 @@
             "col_offset": 9,
             "function": "Shape.area",
             "type": [
-                "Nonetype"
+                "<value1>"
             ]
         },
         {
@@ -38,7 +38,7 @@
             "file": "main.py",
             "line_number": 12,
             "col_offset": 9,
-            "variable": "Rectangle.width",
+            "variable": "self.width",
             "function": "Rectangle.__init__",
             "type": [
                 "<value1>"
@@ -48,7 +48,7 @@
             "file": "main.py",
             "line_number": 13,
             "col_offset": 9,
-            "variable": "Rectangle.height",
+            "variable": "self.height",
             "function": "Rectangle.__init__",
             "type": [
                 "<value1>"
@@ -57,7 +57,7 @@
         {
             "file": "main.py",
             "line_number": 15,
-            "col_offset": 5,
+            "col_offset": 9,
             "function": "Rectangle.area",
             "type": [
                 "<value1>"
@@ -82,4 +82,4 @@
             ]
         }
     ]
-}
+}

micro-benchmark-autogen-templates/python_features/classes/assigned_self_call/main_gt.json

@@ -23,7 +23,7 @@
             "file": "main.py",
             "line_number": 6,
             "col_offset": 9,
-            "function": "func2",
+            "function": "MyClass.func2",
             "type": [
                 "<value1>"
             ]
@@ -40,8 +40,8 @@
         },
         {
             "file": "main.py",
-            "line_number": 1,
-            "col_offset": 9,
+            "line_number": 11,
+            "col_offset": 1,
             "variable": "a",
             "type": [
                 "MyClass"

micro-benchmark-autogen-templates/python_features/classes/base_class_attr/main_gt.json

@@ -14,7 +14,8 @@
             "file": "main.py",
             "line_number": 5,
             "col_offset": 13,
-            "variable": "A.B.a",
+            "variable": "self.a",
+            "function": "A.B.__init__",
             "type": [
                 "<value1>"
             ]

micro-benchmark-autogen-templates/python_features/classes/base_class_calls_child/main_gt.json

@@ -16,14 +16,16 @@
             "col_offset": 9,
             "function": "A.func",
             "type": [
-                "<value1>"
+                "<value1>",
+                "<value2>"
             ]
         },
         {
             "file": "main.py",
             "line_number": 9,
             "col_offset": 9,
-            "variable": "B.child",
+            "variable": "self.child",
+            "function": "B.__init__",
             "type": [
                 "callable"
             ]
@@ -41,7 +43,8 @@
             "file": "main.py",
             "line_number": 17,
             "col_offset": 9,
-            "variable": "C.child",
+            "variable": "self.child",
+            "function": "C.__init__",
             "type": [
                 "callable"
             ]
@@ -92,4 +95,4 @@
             ]
         }
     ]
-}
+}

micro-benchmark-autogen-templates/python_features/classes/class_variable/main_gt.json

@@ -24,7 +24,7 @@
             "line_number": 5,
             "col_offset": 24,
             "parameter": "instance_var",
-            "function": "__init__",
+            "function": "MyClass.__init__",
             "type": [
                 "<value2>"
             ]
@@ -33,8 +33,8 @@
             "file": "main.py",
             "line_number": 6,
             "col_offset": 9,
-            "variable": "MyClass.instance_var",
-            "function": "__init__",
+            "variable": "self.instance_var",
+            "function": "MyClass.__init__",
             "type": [
                 "<value2>"
             ]

micro-benchmark-autogen-templates/python_features/classes/inheritance_overriding/main.py

@@ -11,3 +11,4 @@ def func(self):
 
 a = MySubClass()
 b = a.func()
+MyClass().func()

micro-benchmark-autogen-templates/python_features/classes/inheritance_overriding/main_gt.json

@@ -13,7 +13,7 @@
         {
             "file": "main.py",
             "line_number": 3,
-            "col_offset": 5,
+            "col_offset": 9,
             "function": "MyClass.func",
             "type": [
                 "<value1>"
@@ -22,7 +22,7 @@
         {
             "file": "main.py",
             "line_number": 8,
-            "col_offset": 5,
+            "col_offset": 9,
             "function": "MySubClass.func",
             "type": [
                 "<value2>"

micro-benchmark-autogen-templates/python_features/classes/nested_class_calls/main.py

@@ -23,3 +23,4 @@ def func(self):
 
 a = A()
 b = a.func()
+C().func()

micro-benchmark-autogen-templates/python_features/classes/nested_class_calls/main_gt.json

@@ -13,7 +13,7 @@
         {
             "file": "main.py",
             "line_number": 3,
-            "col_offset": 5,
+            "col_offset": 9,
             "function": "C.func",
             "type": [
                 "<value1>"
@@ -34,7 +34,7 @@
             "line_number": 9,
             "col_offset": 9,
             "function": "B.__init__",
-            "variable": "B.c",
+            "variable": "self.c",
             "type": [
                 "C"
             ]
@@ -53,7 +53,7 @@
             "line_number": 17,
             "col_offset": 9,
             "function": "A.__init__",
-            "variable": "A.c",
+            "variable": "self.c",
             "type": [
                 "C"
             ]

micro-benchmark-autogen-templates/python_features/classes/self_assign_func/main_gt.json

@@ -33,7 +33,7 @@
             "file": "main.py",
             "line_number": 11,
             "col_offset": 9,
-            "variable": "B.a",
+            "variable": "self.a",
             "function": "B.__init__",
             "type": [
                 "A"

micro-benchmark-autogen-templates/python_features/classes/self_assignment/main_gt.json

@@ -15,7 +15,7 @@
             "line_number": 6,
             "col_offset": 9,
             "function": "A.__init__",
-            "variable": "A.smth",
+            "variable": "self.smth",
             "type": [
                 "callable"
             ]

micro-benchmark-autogen-templates/python_features/decorators/assigned/main_gt.json

@@ -4,7 +4,6 @@
         "int",
         "float",
         "str",
-        "bool",
         "list",
         "tuple"
     ],
@@ -32,7 +31,7 @@
             "file": "main.py",
             "line_number": 5,
             "col_offset": 9,
-            "function": "wrapper",
+            "function": "dec1.wrapper",
             "type": [
                 "<value1>"
             ]
@@ -42,7 +41,7 @@
             "line_number": 5,
             "col_offset": 17,
             "parameter": "a",
-            "function": "wrapper",
+            "function": "dec1.wrapper",
             "type": [
                 "<value1>"
             ]
@@ -52,7 +51,7 @@
             "line_number": 5,
             "col_offset": 20,
             "parameter": "b",
-            "function": "wrapper",
+            "function": "dec1.wrapper",
             "type": [
                 "<value1>"
             ]
@@ -62,7 +61,7 @@
             "line_number": 6,
             "col_offset": 9,
             "variable": "result",
-            "function": "wrapper",
+            "function": "dec1.wrapper",
             "type": [
                 "<value1>"
             ]
@@ -115,4 +114,4 @@
             ]
         }
     ]
-}
+}

micro-benchmark-autogen-templates/python_features/decorators/call/main_gt.json

@@ -33,16 +33,7 @@
             "file": "main.py",
             "line_number": 5,
             "col_offset": 9,
-            "function": "wrapper",
-            "type": [
-                "<value1>"
-            ]
-        },
-        {
-            "file": "main.py",
-            "line_number": 12,
-            "col_offset": 5,
-            "function": "func",
+            "function": "dec.wrapper",
             "type": [
                 "<value1>"
             ]
@@ -57,4 +48,4 @@
             ]
         }
     ]
-}
+}