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

Commit 6826132

Browse files
juanjuxjuanjux
authored
Merge pull request #110 from juanjux/fix/primitive_types
Added Primitive role to built-in types
2 parents ecef436 + c2b64bd commit 6826132

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+409
-409
lines changed

‎driver/normalizer/annotation.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,24 +106,24 @@ var AnnotationRules = On(Any).Self(
106106
On(pyast.USub).Roles(uast.Operator, uast.Unary, uast.Negative),
107107

108108
// Literals
109-
On(pyast.Str).Roles(uast.Literal, uast.String, uast.Expression),
110-
On(pyast.StringLiteral).Roles(uast.Literal, uast.String, uast.Expression),
111-
On(pyast.Bytes).Roles(uast.Literal, uast.ByteString, uast.Expression),
112-
On(pyast.Num).Roles(uast.Literal, uast.Number, uast.Expression).Children(
109+
On(pyast.Str).Roles(uast.Literal, uast.String, uast.Expression, uast.Primitive),
110+
On(pyast.StringLiteral).Roles(uast.Literal, uast.String, uast.Expression, uast.Primitive),
111+
On(pyast.Bytes).Roles(uast.Literal, uast.ByteString, uast.Expression, uast.Primitive),
112+
On(pyast.Num).Roles(uast.Literal, uast.Number, uast.Expression, uast.Primitive).Children(
113113
On(HasInternalRole("n")).Roles(uast.Literal, uast.Number, uast.Expression),
114114
),
115-
On(pyast.BoolLiteral).Roles(uast.Literal, uast.Boolean, uast.Expression),
116-
On(pyast.JoinedStr).Roles(uast.Literal, uast.String, uast.Expression).Children(
115+
On(pyast.BoolLiteral).Roles(uast.Literal, uast.Boolean, uast.Expression, uast.Primitive),
116+
On(pyast.JoinedStr).Roles(uast.Literal, uast.String, uast.Expression, uast.Primitive).Children(
117117
On(pyast.FormattedValue).Roles(uast.Expression, uast.Incomplete),
118118
),
119-
On(pyast.NoneLiteral).Roles(uast.Literal, uast.Null, uast.Expression),
120-
On(pyast.Set).Roles(uast.Literal, uast.Set, uast.Expression),
121-
On(pyast.List).Roles(uast.Literal, uast.List, uast.Expression),
122-
On(pyast.Dict).Roles(uast.Literal, uast.Map, uast.Expression).Children(
119+
On(pyast.NoneLiteral).Roles(uast.Literal, uast.Null, uast.Expression, uast.Primitive),
120+
On(pyast.Set).Roles(uast.Literal, uast.Set, uast.Expression, uast.Primitive),
121+
On(pyast.List).Roles(uast.Literal, uast.List, uast.Expression, uast.Primitive),
122+
On(pyast.Dict).Roles(uast.Literal, uast.Map, uast.Expression, uast.Primitive).Children(
123123
On(HasInternalRole("keys")).Roles(uast.Map, uast.Key),
124124
On(HasInternalRole("values")).Roles(uast.Map, uast.Value),
125125
),
126-
On(pyast.Tuple).Roles(uast.Literal, uast.Tuple, uast.Expression),
126+
On(pyast.Tuple).Roles(uast.Literal, uast.Tuple, uast.Expression, uast.Primitive),
127127

128128
// FIXME: the FunctionDeclarationReceiver is not set for methods; it should be taken from the parent
129129
// Type node Token (2 levels up) but the SDK doesn't allow this

‎fixtures/annotations.py.uast‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Module {
5353
. . . . . }
5454
. . . . }
5555
. . . . 2: Num {
56-
. . . . . Roles: Literal,Number,Expression
56+
. . . . . Roles: Literal,Number,Expression,Primitive
5757
. . . . . TOKEN "1"
5858
. . . . . StartPosition: {
5959
. . . . . . Offset: 9
@@ -244,7 +244,7 @@ Module {
244244
. . . . . . . }
245245
. . . . . . . Children: {
246246
. . . . . . . . 0: Num {
247-
. . . . . . . . . Roles: Literal,Number,Expression
247+
. . . . . . . . . Roles: Literal,Number,Expression,Primitive
248248
. . . . . . . . . TOKEN "0"
249249
. . . . . . . . . StartPosition: {
250250
. . . . . . . . . . Offset: 70

‎fixtures/aritmeticops.py.uast‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Module {
2727
. . . . . }
2828
. . . . . Children: {
2929
. . . . . . 0: Num {
30-
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
30+
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
3131
. . . . . . . TOKEN "1"
3232
. . . . . . . StartPosition: {
3333
. . . . . . . . Offset: 0
@@ -44,7 +44,7 @@ Module {
4444
. . . . . . . }
4545
. . . . . . }
4646
. . . . . . 1: Num {
47-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
47+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
4848
. . . . . . . TOKEN "2"
4949
. . . . . . . StartPosition: {
5050
. . . . . . . . Offset: 2
@@ -94,7 +94,7 @@ Module {
9494
. . . . . }
9595
. . . . . Children: {
9696
. . . . . . 0: Num {
97-
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
97+
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
9898
. . . . . . . TOKEN "1"
9999
. . . . . . . StartPosition: {
100100
. . . . . . . . Offset: 4
@@ -111,7 +111,7 @@ Module {
111111
. . . . . . . }
112112
. . . . . . }
113113
. . . . . . 1: Num {
114-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
114+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
115115
. . . . . . . TOKEN "2"
116116
. . . . . . . StartPosition: {
117117
. . . . . . . . Offset: 6
@@ -161,7 +161,7 @@ Module {
161161
. . . . . }
162162
. . . . . Children: {
163163
. . . . . . 0: Num {
164-
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
164+
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
165165
. . . . . . . TOKEN "1"
166166
. . . . . . . StartPosition: {
167167
. . . . . . . . Offset: 8
@@ -178,7 +178,7 @@ Module {
178178
. . . . . . . }
179179
. . . . . . }
180180
. . . . . . 1: Num {
181-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
181+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
182182
. . . . . . . TOKEN "2"
183183
. . . . . . . StartPosition: {
184184
. . . . . . . . Offset: 10
@@ -228,7 +228,7 @@ Module {
228228
. . . . . }
229229
. . . . . Children: {
230230
. . . . . . 0: Num {
231-
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
231+
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
232232
. . . . . . . TOKEN "1"
233233
. . . . . . . StartPosition: {
234234
. . . . . . . . Offset: 12
@@ -245,7 +245,7 @@ Module {
245245
. . . . . . . }
246246
. . . . . . }
247247
. . . . . . 1: Num {
248-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
248+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
249249
. . . . . . . TOKEN "2"
250250
. . . . . . . StartPosition: {
251251
. . . . . . . . Offset: 14
@@ -295,7 +295,7 @@ Module {
295295
. . . . . }
296296
. . . . . Children: {
297297
. . . . . . 0: Num {
298-
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
298+
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
299299
. . . . . . . TOKEN "1"
300300
. . . . . . . StartPosition: {
301301
. . . . . . . . Offset: 16
@@ -312,7 +312,7 @@ Module {
312312
. . . . . . . }
313313
. . . . . . }
314314
. . . . . . 1: Num {
315-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
315+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
316316
. . . . . . . TOKEN "2"
317317
. . . . . . . StartPosition: {
318318
. . . . . . . . Offset: 19
@@ -362,7 +362,7 @@ Module {
362362
. . . . . }
363363
. . . . . Children: {
364364
. . . . . . 0: Num {
365-
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
365+
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
366366
. . . . . . . TOKEN "1"
367367
. . . . . . . StartPosition: {
368368
. . . . . . . . Offset: 21
@@ -379,7 +379,7 @@ Module {
379379
. . . . . . . }
380380
. . . . . . }
381381
. . . . . . 1: Num {
382-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
382+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
383383
. . . . . . . TOKEN "2"
384384
. . . . . . . StartPosition: {
385385
. . . . . . . . Offset: 23
@@ -429,7 +429,7 @@ Module {
429429
. . . . . }
430430
. . . . . Children: {
431431
. . . . . . 0: Num {
432-
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
432+
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
433433
. . . . . . . TOKEN "1"
434434
. . . . . . . StartPosition: {
435435
. . . . . . . . Offset: 25
@@ -446,7 +446,7 @@ Module {
446446
. . . . . . . }
447447
. . . . . . }
448448
. . . . . . 1: Num {
449-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
449+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
450450
. . . . . . . TOKEN "2"
451451
. . . . . . . StartPosition: {
452452
. . . . . . . . Offset: 28

‎fixtures/assert_constant.py.uast‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Module {
2323
. . . }
2424
. . . Children: {
2525
. . . . 0: BoolLiteral {
26-
. . . . . Roles: Literal,Boolean,Expression
26+
. . . . . Roles: Literal,Boolean,Expression,Primitive
2727
. . . . . TOKEN "true"
2828
. . . . . StartPosition: {
2929
. . . . . . Offset: 7
@@ -61,7 +61,7 @@ Module {
6161
. . . }
6262
. . . Children: {
6363
. . . . 0: BoolLiteral {
64-
. . . . . Roles: Literal,Boolean,Expression
64+
. . . . . Roles: Literal,Boolean,Expression,Primitive
6565
. . . . . TOKEN "true"
6666
. . . . . StartPosition: {
6767
. . . . . . Offset: 20
@@ -98,7 +98,7 @@ Module {
9898
. . . }
9999
. . . Children: {
100100
. . . . 0: Str {
101-
. . . . . Roles: Literal,String,Expression
101+
. . . . . Roles: Literal,String,Expression,Primitive
102102
. . . . . TOKEN "assert message"
103103
. . . . . StartPosition: {
104104
. . . . . . Offset: 38
@@ -115,7 +115,7 @@ Module {
115115
. . . . . }
116116
. . . . }
117117
. . . . 1: BoolLiteral {
118-
. . . . . Roles: Literal,Boolean,Expression
118+
. . . . . Roles: Literal,Boolean,Expression,Primitive
119119
. . . . . TOKEN "true"
120120
. . . . . StartPosition: {
121121
. . . . . . Offset: 32

‎fixtures/augassign.py.uast‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Module {
4040
. . . . . }
4141
. . . . }
4242
. . . . 1: Num {
43-
. . . . . Roles: Literal,Number,Expression,Right
43+
. . . . . Roles: Literal,Number,Expression,Primitive,Right
4444
. . . . . TOKEN "1"
4545
. . . . . StartPosition: {
4646
. . . . . . Offset: 5
@@ -96,7 +96,7 @@ Module {
9696
. . . . . }
9797
. . . . }
9898
. . . . 1: Num {
99-
. . . . . Roles: Literal,Number,Expression,Right
99+
. . . . . Roles: Literal,Number,Expression,Primitive,Right
100100
. . . . . TOKEN "1"
101101
. . . . . StartPosition: {
102102
. . . . . . Offset: 12
@@ -152,7 +152,7 @@ Module {
152152
. . . . . }
153153
. . . . }
154154
. . . . 1: Num {
155-
. . . . . Roles: Literal,Number,Expression,Right
155+
. . . . . Roles: Literal,Number,Expression,Primitive,Right
156156
. . . . . TOKEN "1"
157157
. . . . . StartPosition: {
158158
. . . . . . Offset: 19
@@ -208,7 +208,7 @@ Module {
208208
. . . . . }
209209
. . . . }
210210
. . . . 1: Num {
211-
. . . . . Roles: Literal,Number,Expression,Right
211+
. . . . . Roles: Literal,Number,Expression,Primitive,Right
212212
. . . . . TOKEN "1"
213213
. . . . . StartPosition: {
214214
. . . . . . Offset: 26

‎fixtures/bitwise.py.uast‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Module {
2727
. . . . . }
2828
. . . . . Children: {
2929
. . . . . . 0: Num {
30-
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
30+
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
3131
. . . . . . . TOKEN "1"
3232
. . . . . . . StartPosition: {
3333
. . . . . . . . Offset: 0
@@ -44,7 +44,7 @@ Module {
4444
. . . . . . . }
4545
. . . . . . }
4646
. . . . . . 1: Num {
47-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
47+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
4848
. . . . . . . TOKEN "2"
4949
. . . . . . . StartPosition: {
5050
. . . . . . . . Offset: 4
@@ -94,7 +94,7 @@ Module {
9494
. . . . . }
9595
. . . . . Children: {
9696
. . . . . . 0: Num {
97-
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
97+
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
9898
. . . . . . . TOKEN "1"
9999
. . . . . . . StartPosition: {
100100
. . . . . . . . Offset: 6
@@ -111,7 +111,7 @@ Module {
111111
. . . . . . . }
112112
. . . . . . }
113113
. . . . . . 1: Num {
114-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
114+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
115115
. . . . . . . TOKEN "2"
116116
. . . . . . . StartPosition: {
117117
. . . . . . . . Offset: 10
@@ -161,7 +161,7 @@ Module {
161161
. . . . . }
162162
. . . . . Children: {
163163
. . . . . . 0: Num {
164-
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
164+
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
165165
. . . . . . . TOKEN "1"
166166
. . . . . . . StartPosition: {
167167
. . . . . . . . Offset: 12
@@ -178,7 +178,7 @@ Module {
178178
. . . . . . . }
179179
. . . . . . }
180180
. . . . . . 1: Num {
181-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
181+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
182182
. . . . . . . TOKEN "2"
183183
. . . . . . . StartPosition: {
184184
. . . . . . . . Offset: 16
@@ -228,7 +228,7 @@ Module {
228228
. . . . . }
229229
. . . . . Children: {
230230
. . . . . . 0: Num {
231-
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
231+
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
232232
. . . . . . . TOKEN "1"
233233
. . . . . . . StartPosition: {
234234
. . . . . . . . Offset: 18
@@ -245,7 +245,7 @@ Module {
245245
. . . . . . . }
246246
. . . . . . }
247247
. . . . . . 1: Num {
248-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
248+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
249249
. . . . . . . TOKEN "2"
250250
. . . . . . . StartPosition: {
251251
. . . . . . . . Offset: 23
@@ -295,7 +295,7 @@ Module {
295295
. . . . . }
296296
. . . . . Children: {
297297
. . . . . . 0: Num {
298-
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
298+
. . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
299299
. . . . . . . TOKEN "1"
300300
. . . . . . . StartPosition: {
301301
. . . . . . . . Offset: 25
@@ -312,7 +312,7 @@ Module {
312312
. . . . . . . }
313313
. . . . . . }
314314
. . . . . . 1: Num {
315-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
315+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
316316
. . . . . . . TOKEN "2"
317317
. . . . . . . StartPosition: {
318318
. . . . . . . . Offset: 30
@@ -384,7 +384,7 @@ Module {
384384
. . . . . . . . . }
385385
. . . . . . . . . Children: {
386386
. . . . . . . . . . 0: Num {
387-
. . . . . . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression
387+
. . . . . . . . . . . Roles: Expression,Binary,Left,Literal,Number,Expression,Primitive
388388
. . . . . . . . . . . TOKEN "1"
389389
. . . . . . . . . . . StartPosition: {
390390
. . . . . . . . . . . . Offset: 32
@@ -401,7 +401,7 @@ Module {
401401
. . . . . . . . . . . }
402402
. . . . . . . . . . }
403403
. . . . . . . . . . 1: Num {
404-
. . . . . . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
404+
. . . . . . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
405405
. . . . . . . . . . . TOKEN "2"
406406
. . . . . . . . . . . StartPosition: {
407407
. . . . . . . . . . . . Offset: 36
@@ -427,7 +427,7 @@ Module {
427427
. . . . . . . . . }
428428
. . . . . . . . }
429429
. . . . . . . . 1: Num {
430-
. . . . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
430+
. . . . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
431431
. . . . . . . . . TOKEN "3"
432432
. . . . . . . . . StartPosition: {
433433
. . . . . . . . . . Offset: 40
@@ -453,7 +453,7 @@ Module {
453453
. . . . . . . }
454454
. . . . . . }
455455
. . . . . . 1: Num {
456-
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
456+
. . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
457457
. . . . . . . TOKEN "4"
458458
. . . . . . . StartPosition: {
459459
. . . . . . . . Offset: 44
@@ -532,7 +532,7 @@ Module {
532532
. . . . . . . . . }
533533
. . . . . . . . }
534534
. . . . . . . . 1: Num {
535-
. . . . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
535+
. . . . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
536536
. . . . . . . . . TOKEN "1"
537537
. . . . . . . . . StartPosition: {
538538
. . . . . . . . . . Offset: 51
@@ -587,7 +587,7 @@ Module {
587587
. . . . . . . . . }
588588
. . . . . . . . }
589589
. . . . . . . . 1: Num {
590-
. . . . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression
590+
. . . . . . . . . Roles: Expression,Binary,Right,Literal,Number,Expression,Primitive
591591
. . . . . . . . . TOKEN "2"
592592
. . . . . . . . . StartPosition: {
593593
. . . . . . . . . . Offset: 61

0 commit comments

Comments
 (0)