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

Fix/issue 58 #60

Merged
merged 1 commit into from
Aug 9, 2017
Merged

Fix/issue 58 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MAINTAINER source{d}

ARG DEVDEPS=native/dev_deps
ARG CONTAINER_DEVDEPS=/tmp/dev_deps
ARG PYDETECTOR_VER=0.11.1
ARG PYDETECTOR_VER=0.11.3

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

Expand Down
2 changes: 1 addition & 1 deletion native/python_package/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pydetector-bblfsh==0.11.1
pydetector-bblfsh==0.11.3
-e git+git://github.com/python/mypy.git@0bb2d1680e8b9522108b38d203cb73021a617e64#egg=mypy-lang
typed-ast==1.0.1
2 changes: 1 addition & 1 deletion native/python_package/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
]
},
install_requires=[
"pydetector-bblfsh==0.11.1"
"pydetector-bblfsh==0.11.3"
],
classifiers=[
"Development Status :: 4 - Beta",
Expand Down
8 changes: 4 additions & 4 deletions tests/classdef.py.native
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"noops_previous": {
"ast_type": "PreviousNoops",
"col_offset": 1,
"end_col_offset": 0,
"end_col_offset": 1,
"end_lineno": 5,
"lineno": 5,
"lines": [
Expand Down Expand Up @@ -210,7 +210,7 @@
"noops_previous": {
"ast_type": "PreviousNoops",
"col_offset": 1,
"end_col_offset": 0,
"end_col_offset": 1,
"end_lineno": 8,
"lineno": 8,
"lines": [
Expand Down Expand Up @@ -258,7 +258,7 @@
"noops_previous": {
"ast_type": "PreviousNoops",
"col_offset": 1,
"end_col_offset": 0,
"end_col_offset": 1,
"end_lineno": 12,
"lineno": 12,
"lines": [
Expand Down Expand Up @@ -376,7 +376,7 @@
"noops_previous": {
"ast_type": "PreviousNoops",
"col_offset": 1,
"end_col_offset": 0,
"end_col_offset": 1,
"end_lineno": 16,
"lineno": 16,
"lines": [
Expand Down
185 changes: 92 additions & 93 deletions tests/classdef.py.uast
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/classdef_inheritance.py.native
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"noops_previous": {
"ast_type": "PreviousNoops",
"col_offset": 1,
"end_col_offset": 0,
"end_col_offset": 1,
"end_lineno": 3,
"lineno": 3,
"lines": [
Expand Down
21 changes: 10 additions & 11 deletions tests/classdef_inheritance.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Status: error
Status: ok
Errors:
. column out of bounds: 0 [1, 1]
UAST:
Module {
. Roles: File
Expand Down Expand Up @@ -123,9 +122,9 @@ Module {
. . . . . . . . . . Col: 1
. . . . . . . . . }
. . . . . . . . . EndPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 28
. . . . . . . . . . Line: 3
. . . . . . . . . . Col: 0
. . . . . . . . . . Col: 1
. . . . . . . . . }
. . . . . . . . . Properties: {
. . . . . . . . . . internalRole: noops_previous
Expand All @@ -136,7 +135,7 @@ Module {
. . . . . . . . . . . TOKEN "
"
. . . . . . . . . . . StartPosition: {
. . . . . . . . . . . . Offset: 0
. . . . . . . . . . . . Offset: 28
. . . . . . . . . . . . Line: 3
. . . . . . . . . . . . Col: 1
. . . . . . . . . . . }
Expand All @@ -152,12 +151,12 @@ Module {
. . . . . . . Roles: SimpleIdentifier,Expression
. . . . . . . TOKEN "Dog"
. . . . . . . StartPosition: {
. . . . . . . . Offset: 0
. . . . . . . . Offset: 51
. . . . . . . . Line: 4
. . . . . . . . Col: 23
. . . . . . . }
. . . . . . . EndPosition: {
. . . . . . . . Offset: 0
. . . . . . . . Offset: 53
. . . . . . . . Line: 4
. . . . . . . . Col: 25
. . . . . . . }
Expand All @@ -176,7 +175,7 @@ Module {
. . . . . . 0: Pass {
. . . . . . . Roles: Noop,Statement
. . . . . . . StartPosition: {
. . . . . . . . Offset: 0
. . . . . . . . Offset: 61
. . . . . . . . Line: 5
. . . . . . . . Col: 5
. . . . . . . }
Expand All @@ -188,12 +187,12 @@ Module {
. . 2: RemainderNoops {
. . . Roles: Whitespace
. . . StartPosition: {
. . . . Offset: 0
. . . . Offset: 66
. . . . Line: 6
. . . . Col: 1
. . . }
. . . EndPosition: {
. . . . Offset: 0
. . . . Offset: 66
. . . . Line: 6
. . . . Col: 1
. . . }
Expand All @@ -206,7 +205,7 @@ Module {
. . . . . TOKEN "
"
. . . . . StartPosition: {
. . . . . . Offset: 0
. . . . . . Offset: 66
. . . . . . Line: 6
. . . . . . Col: 1
. . . . . }
Expand Down
2 changes: 1 addition & 1 deletion tests/classdef_metaclass_py3.py.native
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"noops_previous": {
"ast_type": "PreviousNoops",
"col_offset": 1,
"end_col_offset": 0,
"end_col_offset": 1,
"end_lineno": 3,
"lineno": 3,
"lines": [
Expand Down
19 changes: 9 additions & 10 deletions tests/classdef_metaclass_py3.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Status: error
Status: ok
Errors:
. column out of bounds: 0 [1, 1]
UAST:
Module {
. Roles: File
Expand Down Expand Up @@ -140,9 +139,9 @@ Module {
. . . . . . . . . . Col: 1
. . . . . . . . . }
. . . . . . . . . EndPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 49
. . . . . . . . . . Line: 3
. . . . . . . . . . Col: 0
. . . . . . . . . . Col: 1
. . . . . . . . . }
. . . . . . . . . Properties: {
. . . . . . . . . . internalRole: noops_previous
Expand All @@ -153,7 +152,7 @@ Module {
. . . . . . . . . . . TOKEN "
"
. . . . . . . . . . . StartPosition: {
. . . . . . . . . . . . Offset: 0
. . . . . . . . . . . . Offset: 49
. . . . . . . . . . . . Line: 3
. . . . . . . . . . . . Col: 1
. . . . . . . . . . . }
Expand All @@ -176,7 +175,7 @@ Module {
. . . . . . 0: Pass {
. . . . . . . Roles: Noop,Statement
. . . . . . . StartPosition: {
. . . . . . . . Offset: 0
. . . . . . . . Offset: 107
. . . . . . . . Line: 5
. . . . . . . . Col: 5
. . . . . . . }
Expand All @@ -193,12 +192,12 @@ Module {
. . . . . . . Roles: Unannotated
. . . . . . . TOKEN "metaclass"
. . . . . . . StartPosition: {
. . . . . . . . Offset: 0
. . . . . . . . Offset: 81
. . . . . . . . Line: 4
. . . . . . . . Col: 32
. . . . . . . }
. . . . . . . EndPosition: {
. . . . . . . . Offset: 0
. . . . . . . . Offset: 99
. . . . . . . . Line: 4
. . . . . . . . Col: 50
. . . . . . . }
Expand All @@ -207,12 +206,12 @@ Module {
. . . . . . . . . Roles: SimpleIdentifier,Expression
. . . . . . . . . TOKEN "Singleton"
. . . . . . . . . StartPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 91
. . . . . . . . . . Line: 4
. . . . . . . . . . Col: 42
. . . . . . . . . }
. . . . . . . . . EndPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 99
. . . . . . . . . . Line: 4
. . . . . . . . . . Col: 50
. . . . . . . . . }
Expand Down
4 changes: 2 additions & 2 deletions tests/functiondef_decorated.py.native
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@
{
"ast_type": "Return",
"col_offset": 5,
"end_col_offset": 0,
"end_col_offset": 1,
"end_lineno": 4,
"lineno": 7,
"noops_previous": {
"ast_type": "PreviousNoops",
"col_offset": 1,
"end_col_offset": 0,
"end_col_offset": 1,
"end_lineno": 4,
"lineno": 4,
"lines": [
Expand Down
35 changes: 17 additions & 18 deletions tests/functiondef_decorated.py.uast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Status: error
Status: ok
Errors:
. column out of bounds: 0 [1, 1]
UAST:
Module {
. Roles: File
Expand Down Expand Up @@ -137,9 +136,9 @@ Module {
. . . . . . . . Col: 5
. . . . . . . }
. . . . . . . EndPosition: {
. . . . . . . . Offset: 0
. . . . . . . . Offset: 42
. . . . . . . . Line: 4
. . . . . . . . Col: 0
. . . . . . . . Col: 1
. . . . . . . }
. . . . . . . Properties: {
. . . . . . . . value: <nil>
Expand All @@ -148,14 +147,14 @@ Module {
. . . . . . . . 0: PreviousNoops {
. . . . . . . . . Roles: Whitespace
. . . . . . . . . StartPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 42
. . . . . . . . . . Line: 4
. . . . . . . . . . Col: 1
. . . . . . . . . }
. . . . . . . . . EndPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 42
. . . . . . . . . . Line: 4
. . . . . . . . . . Col: 0
. . . . . . . . . . Col: 1
. . . . . . . . . }
. . . . . . . . . Properties: {
. . . . . . . . . . internalRole: noops_previous
Expand All @@ -166,7 +165,7 @@ Module {
. . . . . . . . . . . TOKEN "
"
. . . . . . . . . . . StartPosition: {
. . . . . . . . . . . . Offset: 0
. . . . . . . . . . . . Offset: 42
. . . . . . . . . . . . Line: 4
. . . . . . . . . . . . Col: 1
. . . . . . . . . . . }
Expand All @@ -189,12 +188,12 @@ Module {
. . . . . . 0: Call {
. . . . . . . Roles: Call,Expression
. . . . . . . StartPosition: {
. . . . . . . . Offset: 0
. . . . . . . . Offset: 45
. . . . . . . . Line: 5
. . . . . . . . Col: 3
. . . . . . . }
. . . . . . . EndPosition: {
. . . . . . . . Offset: 0
. . . . . . . . Offset: 70
. . . . . . . . Line: 5
. . . . . . . . Col: 28
. . . . . . . }
Expand All @@ -203,12 +202,12 @@ Module {
. . . . . . . . . Roles: NumberLiteral,Expression,CallPositionalArgument
. . . . . . . . . TOKEN "1"
. . . . . . . . . StartPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 64
. . . . . . . . . . Line: 5
. . . . . . . . . . Col: 22
. . . . . . . . . }
. . . . . . . . . EndPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 64
. . . . . . . . . . Line: 5
. . . . . . . . . . Col: 22
. . . . . . . . . }
Expand All @@ -221,12 +220,12 @@ Module {
. . . . . . . . . Roles: NumberLiteral,Expression,CallPositionalArgument
. . . . . . . . . TOKEN "2"
. . . . . . . . . StartPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 67
. . . . . . . . . . Line: 5
. . . . . . . . . . Col: 25
. . . . . . . . . }
. . . . . . . . . EndPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 67
. . . . . . . . . . Line: 5
. . . . . . . . . . Col: 25
. . . . . . . . . }
Expand All @@ -239,12 +238,12 @@ Module {
. . . . . . . . . Roles: NumberLiteral,Expression,CallPositionalArgument
. . . . . . . . . TOKEN "3"
. . . . . . . . . StartPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 70
. . . . . . . . . . Line: 5
. . . . . . . . . . Col: 28
. . . . . . . . . }
. . . . . . . . . EndPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 70
. . . . . . . . . . Line: 5
. . . . . . . . . . Col: 28
. . . . . . . . . }
Expand All @@ -257,12 +256,12 @@ Module {
. . . . . . . . . Roles: Call,SimpleIdentifier,Expression
. . . . . . . . . TOKEN "somedecoratorparams"
. . . . . . . . . StartPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 44
. . . . . . . . . . Line: 5
. . . . . . . . . . Col: 2
. . . . . . . . . }
. . . . . . . . . EndPosition: {
. . . . . . . . . . Offset: 0
. . . . . . . . . . Offset: 62
. . . . . . . . . . Line: 5
. . . . . . . . . . Col: 20
. . . . . . . . . }
Expand Down
2 changes: 1 addition & 1 deletion tests/functiondef_kwarg.py.native
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"noops_previous": {
"ast_type": "PreviousNoops",
"col_offset": 1,
"end_col_offset": 0,
"end_col_offset": 1,
"end_lineno": 3,
"lineno": 3,
"lines": [
Expand Down
Loading