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

Commit d2fdd07

Browse files
juanjuxjuanjux
authored
Merge pull request #60 from juanjux/fix/issue_58
Fix/issue 58
2 parents 136e550 + 250c2bf commit d2fdd07

22 files changed

+320
-327
lines changed

‎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.11.1
6+
ARG PYDETECTOR_VER=0.11.3
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.11.1
1+
pydetector-bblfsh==0.11.3
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.11.1"
34+
"pydetector-bblfsh==0.11.3"
3535
],
3636
classifiers=[
3737
"Development Status :: 4 - Beta",

‎tests/classdef.py.native‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
"noops_previous": {
122122
"ast_type": "PreviousNoops",
123123
"col_offset": 1,
124-
"end_col_offset": 0,
124+
"end_col_offset": 1,
125125
"end_lineno": 5,
126126
"lineno": 5,
127127
"lines": [
@@ -210,7 +210,7 @@
210210
"noops_previous": {
211211
"ast_type": "PreviousNoops",
212212
"col_offset": 1,
213-
"end_col_offset": 0,
213+
"end_col_offset": 1,
214214
"end_lineno": 8,
215215
"lineno": 8,
216216
"lines": [
@@ -258,7 +258,7 @@
258258
"noops_previous": {
259259
"ast_type": "PreviousNoops",
260260
"col_offset": 1,
261-
"end_col_offset": 0,
261+
"end_col_offset": 1,
262262
"end_lineno": 12,
263263
"lineno": 12,
264264
"lines": [
@@ -376,7 +376,7 @@
376376
"noops_previous": {
377377
"ast_type": "PreviousNoops",
378378
"col_offset": 1,
379-
"end_col_offset": 0,
379+
"end_col_offset": 1,
380380
"end_lineno": 16,
381381
"lineno": 16,
382382
"lines": [

‎tests/classdef.py.uast‎

Lines changed: 92 additions & 93 deletions
Large diffs are not rendered by default.

‎tests/classdef_inheritance.py.native‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"noops_previous": {
4848
"ast_type": "PreviousNoops",
4949
"col_offset": 1,
50-
"end_col_offset": 0,
50+
"end_col_offset": 1,
5151
"end_lineno": 3,
5252
"lineno": 3,
5353
"lines": [

‎tests/classdef_inheritance.py.uast‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
Status: error
1+
Status: ok
22
Errors:
3-
. column out of bounds: 0 [1, 1]
43
UAST:
54
Module {
65
. Roles: File
@@ -123,9 +122,9 @@ Module {
123122
. . . . . . . . . . Col: 1
124123
. . . . . . . . . }
125124
. . . . . . . . . EndPosition: {
126-
. . . . . . . . . . Offset: 0
125+
. . . . . . . . . . Offset: 28
127126
. . . . . . . . . . Line: 3
128-
. . . . . . . . . . Col: 0
127+
. . . . . . . . . . Col: 1
129128
. . . . . . . . . }
130129
. . . . . . . . . Properties: {
131130
. . . . . . . . . . internalRole: noops_previous
@@ -136,7 +135,7 @@ Module {
136135
. . . . . . . . . . . TOKEN "
137136
"
138137
. . . . . . . . . . . StartPosition: {
139-
. . . . . . . . . . . . Offset: 0
138+
. . . . . . . . . . . . Offset: 28
140139
. . . . . . . . . . . . Line: 3
141140
. . . . . . . . . . . . Col: 1
142141
. . . . . . . . . . . }
@@ -152,12 +151,12 @@ Module {
152151
. . . . . . . Roles: SimpleIdentifier,Expression
153152
. . . . . . . TOKEN "Dog"
154153
. . . . . . . StartPosition: {
155-
. . . . . . . . Offset: 0
154+
. . . . . . . . Offset: 51
156155
. . . . . . . . Line: 4
157156
. . . . . . . . Col: 23
158157
. . . . . . . }
159158
. . . . . . . EndPosition: {
160-
. . . . . . . . Offset: 0
159+
. . . . . . . . Offset: 53
161160
. . . . . . . . Line: 4
162161
. . . . . . . . Col: 25
163162
. . . . . . . }
@@ -176,7 +175,7 @@ Module {
176175
. . . . . . 0: Pass {
177176
. . . . . . . Roles: Noop,Statement
178177
. . . . . . . StartPosition: {
179-
. . . . . . . . Offset: 0
178+
. . . . . . . . Offset: 61
180179
. . . . . . . . Line: 5
181180
. . . . . . . . Col: 5
182181
. . . . . . . }
@@ -188,12 +187,12 @@ Module {
188187
. . 2: RemainderNoops {
189188
. . . Roles: Whitespace
190189
. . . StartPosition: {
191-
. . . . Offset: 0
190+
. . . . Offset: 66
192191
. . . . Line: 6
193192
. . . . Col: 1
194193
. . . }
195194
. . . EndPosition: {
196-
. . . . Offset: 0
195+
. . . . Offset: 66
197196
. . . . Line: 6
198197
. . . . Col: 1
199198
. . . }
@@ -206,7 +205,7 @@ Module {
206205
. . . . . TOKEN "
207206
"
208207
. . . . . StartPosition: {
209-
. . . . . . Offset: 0
208+
. . . . . . Offset: 66
210209
. . . . . . Line: 6
211210
. . . . . . Col: 1
212211
. . . . . }

‎tests/classdef_metaclass_py3.py.native‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"noops_previous": {
5656
"ast_type": "PreviousNoops",
5757
"col_offset": 1,
58-
"end_col_offset": 0,
58+
"end_col_offset": 1,
5959
"end_lineno": 3,
6060
"lineno": 3,
6161
"lines": [

‎tests/classdef_metaclass_py3.py.uast‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
Status: error
1+
Status: ok
22
Errors:
3-
. column out of bounds: 0 [1, 1]
43
UAST:
54
Module {
65
. Roles: File
@@ -140,9 +139,9 @@ Module {
140139
. . . . . . . . . . Col: 1
141140
. . . . . . . . . }
142141
. . . . . . . . . EndPosition: {
143-
. . . . . . . . . . Offset: 0
142+
. . . . . . . . . . Offset: 49
144143
. . . . . . . . . . Line: 3
145-
. . . . . . . . . . Col: 0
144+
. . . . . . . . . . Col: 1
146145
. . . . . . . . . }
147146
. . . . . . . . . Properties: {
148147
. . . . . . . . . . internalRole: noops_previous
@@ -153,7 +152,7 @@ Module {
153152
. . . . . . . . . . . TOKEN "
154153
"
155154
. . . . . . . . . . . StartPosition: {
156-
. . . . . . . . . . . . Offset: 0
155+
. . . . . . . . . . . . Offset: 49
157156
. . . . . . . . . . . . Line: 3
158157
. . . . . . . . . . . . Col: 1
159158
. . . . . . . . . . . }
@@ -176,7 +175,7 @@ Module {
176175
. . . . . . 0: Pass {
177176
. . . . . . . Roles: Noop,Statement
178177
. . . . . . . StartPosition: {
179-
. . . . . . . . Offset: 0
178+
. . . . . . . . Offset: 107
180179
. . . . . . . . Line: 5
181180
. . . . . . . . Col: 5
182181
. . . . . . . }
@@ -193,12 +192,12 @@ Module {
193192
. . . . . . . Roles: Unannotated
194193
. . . . . . . TOKEN "metaclass"
195194
. . . . . . . StartPosition: {
196-
. . . . . . . . Offset: 0
195+
. . . . . . . . Offset: 81
197196
. . . . . . . . Line: 4
198197
. . . . . . . . Col: 32
199198
. . . . . . . }
200199
. . . . . . . EndPosition: {
201-
. . . . . . . . Offset: 0
200+
. . . . . . . . Offset: 99
202201
. . . . . . . . Line: 4
203202
. . . . . . . . Col: 50
204203
. . . . . . . }
@@ -207,12 +206,12 @@ Module {
207206
. . . . . . . . . Roles: SimpleIdentifier,Expression
208207
. . . . . . . . . TOKEN "Singleton"
209208
. . . . . . . . . StartPosition: {
210-
. . . . . . . . . . Offset: 0
209+
. . . . . . . . . . Offset: 91
211210
. . . . . . . . . . Line: 4
212211
. . . . . . . . . . Col: 42
213212
. . . . . . . . . }
214213
. . . . . . . . . EndPosition: {
215-
. . . . . . . . . . Offset: 0
214+
. . . . . . . . . . Offset: 99
216215
. . . . . . . . . . Line: 4
217216
. . . . . . . . . . Col: 50
218217
. . . . . . . . . }

‎tests/functiondef_decorated.py.native‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@
6161
{
6262
"ast_type": "Return",
6363
"col_offset": 5,
64-
"end_col_offset": 0,
64+
"end_col_offset": 1,
6565
"end_lineno": 4,
6666
"lineno": 7,
6767
"noops_previous": {
6868
"ast_type": "PreviousNoops",
6969
"col_offset": 1,
70-
"end_col_offset": 0,
70+
"end_col_offset": 1,
7171
"end_lineno": 4,
7272
"lineno": 4,
7373
"lines": [

0 commit comments

Comments
 (0)