fix alias versus the name in imports; fixes #197

Signed-off-by: Denys Smirnov <[email protected]>
bblfsh · May 23, 2019 · 6622d6d · 6622d6d
1 parent e6bf9a6
commit 6622d6d
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 32 deletions.
diff --git a/driver/normalizer/normalizer.go b/driver/normalizer/normalizer.go
@@ -411,10 +411,10 @@ var Normalizers = []Mapping{
 		},
 		Obj{
 			"Name": UASTType(uast.Identifier{}, Obj{
-				"Name": Var("name"),
+				"Name": Var("alias"),
 			}),
 			"Node": UASTType(uast.Identifier{},
-				Obj{"Name": Var("alias")},
+				Obj{"Name": Var("name")},
 			),
 		},
 	)),

diff --git a/fixtures/bench_javaobs.py.sem.uast b/fixtures/bench_javaobs.py.sem.uast
@@ -201,10 +201,10 @@
                         '@pos': { '@type': "uast:Positions",
                         },
                         Name: { '@type': "uast:Identifier",
-                           Name: "StringIO",
+                           Name: "BytesIO",
                         },
                         Node: { '@type': "uast:Identifier",
-                           Name: "BytesIO",
+                           Name: "StringIO",
                         },
                      },
                   ],

diff --git a/fixtures/issue62.py.sem.uast b/fixtures/issue62.py.sem.uast
@@ -60,10 +60,10 @@
             '@pos': { '@type': "uast:Positions",
             },
             Name: { '@type': "uast:Identifier",
-               Name: "numpy",
+               Name: "np",
             },
             Node: { '@type': "uast:Identifier",
-               Name: "np",
+               Name: "numpy",
             },
          },
          Target: ~,

diff --git a/fixtures/issue94.py.sem.uast b/fixtures/issue94.py.sem.uast
@@ -51,10 +51,10 @@
             '@pos': { '@type': "uast:Positions",
             },
             Name: { '@type': "uast:Identifier",
-               Name: "lib3",
+               Name: "lib3_alias",
             },
             Node: { '@type': "uast:Identifier",
-               Name: "lib3_alias",
+               Name: "lib3",
             },
          },
          Target: ~,
@@ -125,10 +125,10 @@
                '@pos': { '@type': "uast:Positions",
                },
                Name: { '@type': "uast:Identifier",
-                  Name: "lib61",
+                  Name: "lib611",
                },
                Node: { '@type': "uast:Identifier",
-                  Name: "lib611",
+                  Name: "lib61",
                },
             },
          ],

diff --git a/fixtures/issue96.py.sem.uast b/fixtures/issue96.py.sem.uast
@@ -51,10 +51,10 @@
             '@pos': { '@type': "uast:Positions",
             },
             Name: { '@type': "uast:Identifier",
-               Name: "lib3",
+               Name: "lib3_alias",
             },
             Node: { '@type': "uast:Identifier",
-               Name: "lib3_alias",
+               Name: "lib3",
             },
          },
          Target: ~,
@@ -125,10 +125,10 @@
                '@pos': { '@type': "uast:Positions",
                },
                Name: { '@type': "uast:Identifier",
-                  Name: "lib61",
+                  Name: "lib611",
                },
                Node: { '@type': "uast:Identifier",
-                  Name: "lib611",
+                  Name: "lib61",
                },
             },
          ],

diff --git a/fixtures/issue_server101.py.sem.uast b/fixtures/issue_server101.py.sem.uast
@@ -54341,10 +54341,10 @@
                      '@pos': { '@type': "uast:Positions",
                      },
                      Name: { '@type': "uast:Identifier",
-                        Name: "InterfaceClass",
+                        Name: "_ZopeInterfaceClass",
                      },
                      Node: { '@type': "uast:Identifier",
-                        Name: "_ZopeInterfaceClass",
+                        Name: "InterfaceClass",
                      },
                   },
                ],
@@ -54480,10 +54480,10 @@
                      '@pos': { '@type': "uast:Positions",
                      },
                      Name: { '@type': "uast:Identifier",
-                        Name: "ExtensionClass",
+                        Name: "_ExtensionClass",
                      },
                      Node: { '@type': "uast:Identifier",
-                        Name: "_ExtensionClass",
+                        Name: "ExtensionClass",
                      },
                   },
                ],
@@ -54834,10 +54834,10 @@
                      '@pos': { '@type': "uast:Positions",
                      },
                      Name: { '@type': "uast:Identifier",
-                        Name: "PythonMethodType",
+                        Name: "_ZopeMethodType",
                      },
                      Node: { '@type': "uast:Identifier",
-                        Name: "_ZopeMethodType",
+                        Name: "PythonMethodType",
                      },
                   },
                ],
@@ -54865,10 +54865,10 @@
                      '@pos': { '@type': "uast:Positions",
                      },
                      Name: { '@type': "uast:Identifier",
-                        Name: "ExtensionMethodType",
+                        Name: "_ZopeCMethodType",
                      },
                      Node: { '@type': "uast:Identifier",
-                        Name: "_ZopeCMethodType",
+                        Name: "ExtensionMethodType",
                      },
                   },
                ],

diff --git a/fixtures/u2_import_module_alias.py.sem.uast b/fixtures/u2_import_module_alias.py.sem.uast
@@ -17,10 +17,10 @@
             '@pos': { '@type': "uast:Positions",
             },
             Name: { '@type': "uast:Identifier",
-               Name: "x",
+               Name: "y",
             },
             Node: { '@type': "uast:Identifier",
-               Name: "y",
+               Name: "x",
             },
          },
          Target: ~,

diff --git a/fixtures/u2_import_rename.py.sem.uast b/fixtures/u2_import_rename.py.sem.uast
@@ -17,10 +17,10 @@
             '@pos': { '@type': "uast:Positions",
             },
             Name: { '@type': "uast:Identifier",
-               Name: "a",
+               Name: "b",
             },
             Node: { '@type': "uast:Identifier",
-               Name: "b",
+               Name: "a",
             },
          },
          Target: ~,
@@ -44,10 +44,10 @@
                '@pos': { '@type': "uast:Positions",
                },
                Name: { '@type': "uast:Identifier",
-                  Name: "e",
+                  Name: "f",
                },
                Node: { '@type': "uast:Identifier",
-                  Name: "f",
+                  Name: "e",
                },
             },
          ],

diff --git a/fixtures/u2_import_subsymbol_alias.py.sem.uast b/fixtures/u2_import_subsymbol_alias.py.sem.uast
@@ -17,10 +17,10 @@
             '@pos': { '@type': "uast:Positions",
             },
             Name: { '@type': "uast:Identifier",
-               Name: "x.y",
+               Name: "z",
             },
             Node: { '@type': "uast:Identifier",
-               Name: "z",
+               Name: "x.y",
             },
          },
          Target: ~,
@@ -44,10 +44,10 @@
                '@pos': { '@type': "uast:Positions",
                },
                Name: { '@type': "uast:Identifier",
-                  Name: "b",
+                  Name: "c",
                },
                Node: { '@type': "uast:Identifier",
-                  Name: "c",
+                  Name: "b",
                },
             },
          ],