Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit 6622d6d

Browse files
Denys Smirnovdennwc
Denys Smirnov
authored and
dennwc
committed
fix alias versus the name in imports; fixes #197
Signed-off-by: Denys Smirnov <[email protected]>
1 parent e6bf9a6 commit 6622d6d

9 files changed

+32
-32
lines changed

‎driver/normalizer/normalizer.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,10 +411,10 @@ var Normalizers = []Mapping{
411411
},
412412
Obj{
413413
"Name": UASTType(uast.Identifier{}, Obj{
414-
"Name": Var("name"),
414+
"Name": Var("alias"),
415415
}),
416416
"Node": UASTType(uast.Identifier{},
417-
Obj{"Name": Var("alias")},
417+
Obj{"Name": Var("name")},
418418
),
419419
},
420420
)),

‎fixtures/bench_javaobs.py.sem.uast‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@
201201
'@pos': { '@type': "uast:Positions",
202202
},
203203
Name: { '@type': "uast:Identifier",
204-
Name: "StringIO",
204+
Name: "BytesIO",
205205
},
206206
Node: { '@type': "uast:Identifier",
207-
Name: "BytesIO",
207+
Name: "StringIO",
208208
},
209209
},
210210
],

‎fixtures/issue62.py.sem.uast‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
'@pos': { '@type': "uast:Positions",
6161
},
6262
Name: { '@type': "uast:Identifier",
63-
Name: "numpy",
63+
Name: "np",
6464
},
6565
Node: { '@type': "uast:Identifier",
66-
Name: "np",
66+
Name: "numpy",
6767
},
6868
},
6969
Target: ~,

‎fixtures/issue94.py.sem.uast‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
'@pos': { '@type': "uast:Positions",
5252
},
5353
Name: { '@type': "uast:Identifier",
54-
Name: "lib3",
54+
Name: "lib3_alias",
5555
},
5656
Node: { '@type': "uast:Identifier",
57-
Name: "lib3_alias",
57+
Name: "lib3",
5858
},
5959
},
6060
Target: ~,
@@ -125,10 +125,10 @@
125125
'@pos': { '@type': "uast:Positions",
126126
},
127127
Name: { '@type': "uast:Identifier",
128-
Name: "lib61",
128+
Name: "lib611",
129129
},
130130
Node: { '@type': "uast:Identifier",
131-
Name: "lib611",
131+
Name: "lib61",
132132
},
133133
},
134134
],

‎fixtures/issue96.py.sem.uast‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
'@pos': { '@type': "uast:Positions",
5252
},
5353
Name: { '@type': "uast:Identifier",
54-
Name: "lib3",
54+
Name: "lib3_alias",
5555
},
5656
Node: { '@type': "uast:Identifier",
57-
Name: "lib3_alias",
57+
Name: "lib3",
5858
},
5959
},
6060
Target: ~,
@@ -125,10 +125,10 @@
125125
'@pos': { '@type': "uast:Positions",
126126
},
127127
Name: { '@type': "uast:Identifier",
128-
Name: "lib61",
128+
Name: "lib611",
129129
},
130130
Node: { '@type': "uast:Identifier",
131-
Name: "lib611",
131+
Name: "lib61",
132132
},
133133
},
134134
],

‎fixtures/issue_server101.py.sem.uast‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54341,10 +54341,10 @@
5434154341
'@pos': { '@type': "uast:Positions",
5434254342
},
5434354343
Name: { '@type': "uast:Identifier",
54344-
Name: "InterfaceClass",
54344+
Name: "_ZopeInterfaceClass",
5434554345
},
5434654346
Node: { '@type': "uast:Identifier",
54347-
Name: "_ZopeInterfaceClass",
54347+
Name: "InterfaceClass",
5434854348
},
5434954349
},
5435054350
],
@@ -54480,10 +54480,10 @@
5448054480
'@pos': { '@type': "uast:Positions",
5448154481
},
5448254482
Name: { '@type': "uast:Identifier",
54483-
Name: "ExtensionClass",
54483+
Name: "_ExtensionClass",
5448454484
},
5448554485
Node: { '@type': "uast:Identifier",
54486-
Name: "_ExtensionClass",
54486+
Name: "ExtensionClass",
5448754487
},
5448854488
},
5448954489
],
@@ -54834,10 +54834,10 @@
5483454834
'@pos': { '@type': "uast:Positions",
5483554835
},
5483654836
Name: { '@type': "uast:Identifier",
54837-
Name: "PythonMethodType",
54837+
Name: "_ZopeMethodType",
5483854838
},
5483954839
Node: { '@type': "uast:Identifier",
54840-
Name: "_ZopeMethodType",
54840+
Name: "PythonMethodType",
5484154841
},
5484254842
},
5484354843
],
@@ -54865,10 +54865,10 @@
5486554865
'@pos': { '@type': "uast:Positions",
5486654866
},
5486754867
Name: { '@type': "uast:Identifier",
54868-
Name: "ExtensionMethodType",
54868+
Name: "_ZopeCMethodType",
5486954869
},
5487054870
Node: { '@type': "uast:Identifier",
54871-
Name: "_ZopeCMethodType",
54871+
Name: "ExtensionMethodType",
5487254872
},
5487354873
},
5487454874
],

‎fixtures/u2_import_module_alias.py.sem.uast‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
'@pos': { '@type': "uast:Positions",
1818
},
1919
Name: { '@type': "uast:Identifier",
20-
Name: "x",
20+
Name: "y",
2121
},
2222
Node: { '@type': "uast:Identifier",
23-
Name: "y",
23+
Name: "x",
2424
},
2525
},
2626
Target: ~,

‎fixtures/u2_import_rename.py.sem.uast‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
'@pos': { '@type': "uast:Positions",
1818
},
1919
Name: { '@type': "uast:Identifier",
20-
Name: "a",
20+
Name: "b",
2121
},
2222
Node: { '@type': "uast:Identifier",
23-
Name: "b",
23+
Name: "a",
2424
},
2525
},
2626
Target: ~,
@@ -44,10 +44,10 @@
4444
'@pos': { '@type': "uast:Positions",
4545
},
4646
Name: { '@type': "uast:Identifier",
47-
Name: "e",
47+
Name: "f",
4848
},
4949
Node: { '@type': "uast:Identifier",
50-
Name: "f",
50+
Name: "e",
5151
},
5252
},
5353
],

‎fixtures/u2_import_subsymbol_alias.py.sem.uast‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
'@pos': { '@type': "uast:Positions",
1818
},
1919
Name: { '@type': "uast:Identifier",
20-
Name: "x.y",
20+
Name: "z",
2121
},
2222
Node: { '@type': "uast:Identifier",
23-
Name: "z",
23+
Name: "x.y",
2424
},
2525
},
2626
Target: ~,
@@ -44,10 +44,10 @@
4444
'@pos': { '@type': "uast:Positions",
4545
},
4646
Name: { '@type': "uast:Identifier",
47-
Name: "b",
47+
Name: "c",
4848
},
4949
Node: { '@type': "uast:Identifier",
50-
Name: "c",
50+
Name: "b",
5151
},
5252
},
5353
],

0 commit comments

Comments
 (0)