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

Commit 785cd50

Browse files
bzzbzz
authored
Merge pull request #117 from bzz/tokens-in-literals
Annotate Bool and Number literals
2 parents db183c7 + c88884f commit 785cd50

File tree

63 files changed

+2236
-846
lines changed

Some content is hidden

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

63 files changed

+2236
-846
lines changed

‎driver/normalizer/annotation.go

+12-2
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,19 @@ var Annotations = []Mapping{
262262
AnnotateType("VariableDeclarationStatement", nil, role.Statement, role.Declaration, role.Variable),
263263

264264
// Literals
265-
AnnotateType("BooleanLiteral", nil, role.Expression, role.Literal, role.Boolean),
266265
AnnotateType("TypeLiteral", nil, role.Expression, role.Literal, role.Type),
267-
AnnotateType("NumberLiteral", nil, role.Expression, role.Literal, role.Number),
266+
AnnotateType("BooleanLiteral",
267+
FieldRoles{
268+
"booleanValue": {Rename: uast.KeyToken},
269+
},
270+
role.Expression, role.Literal, role.Boolean,
271+
),
272+
AnnotateType("NumberLiteral",
273+
FieldRoles{
274+
"token": {Rename: uast.KeyToken},
275+
},
276+
role.Expression, role.Literal, role.Number,
277+
),
268278

269279
AnnotateType("NullLiteral",
270280
FieldRoles{

‎fixtures/annotation_type_member_declaration.java.sem.uast

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
},
4444
},
4545
default: { '@type': "java:NumberLiteral",
46+
'@token': "0",
4647
'@role': [Expression, Literal, Number],
4748
'@pos': { '@type': "uast:Positions",
4849
start: { '@type': "uast:Position",
@@ -56,7 +57,6 @@
5657
col: 20,
5758
},
5859
},
59-
token: "0",
6060
},
6161
javadoc: ~,
6262
modifiers: ~,

‎fixtures/annotation_type_member_declaration.java.uast

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
},
4444
},
4545
default: { '@type': "NumberLiteral",
46+
'@token': "0",
4647
'@role': [Expression, Literal, Number],
4748
'@pos': { '@type': "uast:Positions",
4849
start: { '@type': "uast:Position",
@@ -56,7 +57,6 @@
5657
col: 20,
5758
},
5859
},
59-
token: "0",
6060
},
6161
javadoc: ~,
6262
modifiers: ~,

‎fixtures/array.java.sem.uast

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
},
123123
dimensions: [
124124
{ '@type': "java:NumberLiteral",
125+
'@token': "1",
125126
'@role': [Expression, Literal, Number],
126127
'@pos': { '@type': "uast:Positions",
127128
start: { '@type': "uast:Position",
@@ -135,7 +136,6 @@
135136
col: 24,
136137
},
137138
},
138-
token: "1",
139139
},
140140
],
141141
initializer: ~,
@@ -319,6 +319,7 @@
319319
Name: "a",
320320
},
321321
index: { '@type': "java:NumberLiteral",
322+
'@token': "0",
322323
'@role': [Expression, Literal, Number],
323324
'@pos': { '@type': "uast:Positions",
324325
start: { '@type': "uast:Position",
@@ -332,7 +333,6 @@
332333
col: 16,
333334
},
334335
},
335-
token: "0",
336336
},
337337
},
338338
name: { '@type': "uast:Identifier",

‎fixtures/array.java.uast

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
},
105105
dimensions: [
106106
{ '@type': "NumberLiteral",
107+
'@token': "1",
107108
'@role': [Expression, Literal, Number],
108109
'@pos': { '@type': "uast:Positions",
109110
start: { '@type': "uast:Position",
@@ -117,7 +118,6 @@
117118
col: 24,
118119
},
119120
},
120-
token: "1",
121121
},
122122
],
123123
initializer: ~,
@@ -303,6 +303,7 @@
303303
},
304304
},
305305
index: { '@type': "NumberLiteral",
306+
'@token': "0",
306307
'@role': [Expression, Literal, Number],
307308
'@pos': { '@type': "uast:Positions",
308309
start: { '@type': "uast:Position",
@@ -316,7 +317,6 @@
316317
col: 16,
317318
},
318319
},
319-
token: "0",
320320
},
321321
},
322322
name: { '@type': "SimpleName",

‎fixtures/array_initializer.java.sem.uast

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
},
123123
expressions: [
124124
{ '@type': "java:NumberLiteral",
125+
'@token': "0",
125126
'@role': [Expression, Literal, Number],
126127
'@pos': { '@type': "uast:Positions",
127128
start: { '@type': "uast:Position",
@@ -135,7 +136,6 @@
135136
col: 18,
136137
},
137138
},
138-
token: "0",
139139
},
140140
],
141141
},

‎fixtures/array_initializer.java.uast

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
},
105105
expressions: [
106106
{ '@type': "NumberLiteral",
107+
'@token': "0",
107108
'@role': [Expression, Literal, Number],
108109
'@pos': { '@type': "uast:Positions",
109110
start: { '@type': "uast:Position",
@@ -117,7 +118,6 @@
117118
col: 18,
118119
},
119120
},
120-
token: "0",
121121
},
122122
],
123123
},

‎fixtures/assert.java.sem.uast

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
},
9292
},
9393
expression: { '@type': "java:BooleanLiteral",
94+
'@token': "true",
9495
'@role': [Boolean, Expression, Literal],
9596
'@pos': { '@type': "uast:Positions",
9697
start: { '@type': "uast:Position",
@@ -104,7 +105,6 @@
104105
col: 16,
105106
},
106107
},
107-
booleanValue: "true",
108108
},
109109
message: ~,
110110
},
@@ -123,6 +123,7 @@
123123
},
124124
},
125125
expression: { '@type': "java:BooleanLiteral",
126+
'@token': "true",
126127
'@role': [Boolean, Expression, Literal],
127128
'@pos': { '@type': "uast:Positions",
128129
start: { '@type': "uast:Position",
@@ -136,9 +137,9 @@
136137
col: 16,
137138
},
138139
},
139-
booleanValue: "true",
140140
},
141141
message: { '@type': "java:BooleanLiteral",
142+
'@token': "false",
142143
'@role': [Boolean, Expression, Literal],
143144
'@pos': { '@type': "uast:Positions",
144145
start: { '@type': "uast:Position",
@@ -152,7 +153,6 @@
152153
col: 24,
153154
},
154155
},
155-
booleanValue: "false",
156156
},
157157
},
158158
],

‎fixtures/assert.java.uast

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
},
7474
},
7575
expression: { '@type': "BooleanLiteral",
76+
'@token': "true",
7677
'@role': [Boolean, Expression, Literal],
7778
'@pos': { '@type': "uast:Positions",
7879
start: { '@type': "uast:Position",
@@ -86,7 +87,6 @@
8687
col: 16,
8788
},
8889
},
89-
booleanValue: "true",
9090
},
9191
message: ~,
9292
},
@@ -105,6 +105,7 @@
105105
},
106106
},
107107
expression: { '@type': "BooleanLiteral",
108+
'@token': "true",
108109
'@role': [Boolean, Expression, Literal],
109110
'@pos': { '@type': "uast:Positions",
110111
start: { '@type': "uast:Position",
@@ -118,9 +119,9 @@
118119
col: 16,
119120
},
120121
},
121-
booleanValue: "true",
122122
},
123123
message: { '@type': "BooleanLiteral",
124+
'@token': "false",
124125
'@role': [Boolean, Expression, Literal],
125126
'@pos': { '@type': "uast:Positions",
126127
start: { '@type': "uast:Position",
@@ -134,7 +135,6 @@
134135
col: 24,
135136
},
136137
},
137-
booleanValue: "false",
138138
},
139139
},
140140
],

0 commit comments

Comments
 (0)