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

Commit 5f13ca3

Browse files
juanjuxjuanjux
authored
Merge pull request #84 from juanjux/feature/simplified_positions
Bumped pydetector dependency. Regenerated (and manually checked) integration tests.
2 parents 807cb1f + 5141f5d commit 5f13ca3

111 files changed

Lines changed: 1074 additions & 5001 deletions

File tree

Some content is hidden

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

‎Dockerfile.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MAINTAINER source{d}
33

44
ARG DEVDEPS=native/dev_deps
55
ARG CONTAINER_DEVDEPS=/tmp/dev_deps
6-
ARG PYDETECTOR_VER=0.12.0
6+
ARG PYDETECTOR_VER=0.13.0
77

88
RUN apk add --no-cache --update python python3 py-pip py2-pip git
99

‎native/python_package/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
pydetector-bblfsh==0.12.0
1+
pydetector-bblfsh==0.13.0
22
-e git+git://github.com/python/mypy.git@0bb2d1680e8b9522108b38d203cb73021a617e64#egg=mypy-lang
33
typed-ast==1.0.1

‎native/python_package/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
]
3232
},
3333
install_requires=[
34-
"pydetector-bblfsh==0.12.0"
34+
"pydetector-bblfsh==0.13.0"
3535
],
3636
classifiers=[
3737
"Development Status :: 4 - Beta",

‎tests/annotations.py.native‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
},
1818
"ast_type": "AnnAssign",
1919
"col_offset": 1,
20-
"end_col_offset": 10,
21-
"end_lineno": 1,
2220
"lineno": 1,
2321
"simple": 1,
2422
"target": {
@@ -52,8 +50,6 @@
5250
},
5351
"ast_type": "AnnAssign",
5452
"col_offset": 1,
55-
"end_col_offset": 8,
56-
"end_lineno": 2,
5753
"lineno": 2,
5854
"simple": 1,
5955
"target": {
@@ -83,7 +79,7 @@
8379
"arg": "a",
8480
"ast_type": "arg",
8581
"col_offset": 14,
86-
"end_col_offset": 19,
82+
"end_col_offset": 14,
8783
"end_lineno": 3,
8884
"lineno": 3
8985
},
@@ -100,28 +96,24 @@
10096
"arg": "b",
10197
"ast_type": "arg",
10298
"col_offset": 22,
103-
"end_col_offset": 27,
99+
"end_col_offset": 22,
104100
"end_lineno": 3,
105101
"lineno": 3
106102
}
107103
],
108104
"ast_type": "arguments",
109-
"col_offset": 15,
110105
"defaults": [],
111-
"end_col_offset": 27,
112-
"end_lineno": 3,
113106
"kw_defaults": [],
114107
"kwarg": null,
115108
"kwonlyargs": [],
116-
"lineno": 3,
117109
"vararg": null
118110
},
119111
"ast_type": "FunctionDef",
120112
"body": [
121113
{
122114
"ast_type": "Return",
123115
"col_offset": 5,
124-
"end_col_offset": 14,
116+
"end_col_offset": 10,
125117
"end_lineno": 4,
126118
"lineno": 4,
127119
"value": {
@@ -137,8 +129,8 @@
137129
],
138130
"col_offset": 5,
139131
"decorator_list": [],
140-
"end_col_offset": 14,
141-
"end_lineno": 4,
132+
"end_col_offset": 12,
133+
"end_lineno": 3,
142134
"lineno": 3,
143135
"name": "somefunc",
144136
"returns": {
@@ -151,11 +143,7 @@
151143
"lineno": 3
152144
}
153145
}
154-
],
155-
"col_offset": 1,
156-
"end_col_offset": 14,
157-
"end_lineno": 4,
158-
"lineno": 1
146+
]
159147
}
160148
}
161149
}

‎tests/annotations.py.uast‎

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@ Errors:
33
UAST:
44
Module {
55
. Roles: File
6-
. StartPosition: {
7-
. . Offset: 0
8-
. . Line: 1
9-
. . Col: 1
10-
. }
11-
. EndPosition: {
12-
. . Offset: 72
13-
. . Line: 4
14-
. . Col: 14
15-
. }
166
. Children: {
177
. . 0: AnnAssign {
188
. . . Roles: Assignment,Comment,Incomplete
@@ -21,11 +11,6 @@ Module {
2111
. . . . Line: 1
2212
. . . . Col: 1
2313
. . . }
24-
. . . EndPosition: {
25-
. . . . Offset: 9
26-
. . . . Line: 1
27-
. . . . Col: 10
28-
. . . }
2914
. . . Properties: {
3015
. . . . internalRole: body
3116
. . . . simple: 1
@@ -94,11 +79,6 @@ Module {
9479
. . . . Line: 2
9580
. . . . Col: 1
9681
. . . }
97-
. . . EndPosition: {
98-
. . . . Offset: 18
99-
. . . . Line: 2
100-
. . . . Col: 8
101-
. . . }
10282
. . . Properties: {
10383
. . . . internalRole: body
10484
. . . . simple: 1
@@ -152,26 +132,16 @@ Module {
152132
. . . . Col: 5
153133
. . . }
154134
. . . EndPosition: {
155-
. . . . Offset: 72
156-
. . . . Line: 4
157-
. . . . Col: 14
135+
. . . . Offset: 31
136+
. . . . Line: 3
137+
. . . . Col: 12
158138
. . . }
159139
. . . Properties: {
160140
. . . . internalRole: body
161141
. . . }
162142
. . . Children: {
163143
. . . . 0: arguments {
164144
. . . . . Roles: FunctionDeclarationArgument,Incomplete
165-
. . . . . StartPosition: {
166-
. . . . . . Offset: 34
167-
. . . . . . Line: 3
168-
. . . . . . Col: 15
169-
. . . . . }
170-
. . . . . EndPosition: {
171-
. . . . . . Offset: 46
172-
. . . . . . Line: 3
173-
. . . . . . Col: 27
174-
. . . . . }
175145
. . . . . Properties: {
176146
. . . . . . internalRole: args
177147
. . . . . . kwarg: <nil>
@@ -187,9 +157,9 @@ Module {
187157
. . . . . . . . Col: 14
188158
. . . . . . . }
189159
. . . . . . . EndPosition: {
190-
. . . . . . . . Offset: 38
160+
. . . . . . . . Offset: 33
191161
. . . . . . . . Line: 3
192-
. . . . . . . . Col: 19
162+
. . . . . . . . Col: 14
193163
. . . . . . . }
194164
. . . . . . . Properties: {
195165
. . . . . . . . internalRole: args
@@ -224,9 +194,9 @@ Module {
224194
. . . . . . . . Col: 22
225195
. . . . . . . }
226196
. . . . . . . EndPosition: {
227-
. . . . . . . . Offset: 46
197+
. . . . . . . . Offset: 41
228198
. . . . . . . . Line: 3
229-
. . . . . . . . Col: 27
199+
. . . . . . . . Col: 22
230200
. . . . . . . }
231201
. . . . . . . Properties: {
232202
. . . . . . . . internalRole: args
@@ -268,9 +238,9 @@ Module {
268238
. . . . . . . . Col: 5
269239
. . . . . . . }
270240
. . . . . . . EndPosition: {
271-
. . . . . . . . Offset: 72
241+
. . . . . . . . Offset: 68
272242
. . . . . . . . Line: 4
273-
. . . . . . . . Col: 14
243+
. . . . . . . . Col: 10
274244
. . . . . . . }
275245
. . . . . . . Children: {
276246
. . . . . . . . 0: NumLiteral {

0 commit comments

Comments
 (0)