Merge pull request #47 from juanjux/fix/tonoder_endposition

Add the EndLineKey and EndColumnKey to the driver ToNoder

Author: juanjux

Dockerfile.tpl

@@ -3,7 +3,7 @@ MAINTAINER source{d}
 
 ARG DEVDEPS=native/dev_deps
 ARG CONTAINER_DEVDEPS=/tmp/dev_deps
-ARG PYDETECTOR_VER=0.11.0
+ARG PYDETECTOR_VER=0.11.1
 
 RUN apk add --no-cache --update python python3 py-pip py2-pip git
 

driver/normalizer/parser.go

@@ -8,7 +8,9 @@ import (
 var ToNoder = &native.ObjectToNoder{
 	InternalTypeKey: "ast_type",
 	LineKey:         "lineno",
+	EndLineKey:      "end_lineno",
 	ColumnKey:       "col_offset",
+	EndColumnKey:    "end_col_offset",
 
 	TokenKeys: map[string]bool{
 		"module": true, // Module on ImportFrom

native/python_package/requirements.txt

@@ -1,3 +1,3 @@
-pydetector-bblfsh==0.11.0
+pydetector-bblfsh==0.11.1
 -e git+git://github.com/python/mypy.git@0bb2d1680e8b9522108b38d203cb73021a617e64#egg=mypy-lang
 typed-ast==1.0.1

native/python_package/setup.py

@@ -31,7 +31,7 @@
         ]
     },
     install_requires=[
-        "pydetector-bblfsh==0.11.0"
+        "pydetector-bblfsh==0.11.1"
     ],
     classifiers=[
         "Development Status :: 4 - Beta",

tests/aritmeticops.py.native

@@ -224,8 +224,6 @@
                         "op": {
                             "ast_type": "Mod",
                             "col_offset": 1,
-                            "end_col_offset": 1,
-                            "end_lineno": 6,
                             "lineno": 6
                         },
                         "right": {
@@ -280,8 +278,8 @@
                 }
             ],
             "col_offset": 1,
-            "end_col_offset": 4,
-            "end_lineno": 7,
+            "end_col_offset": 1,
+            "end_lineno": 8,
             "lineno": 1,
             "noops_remainder": {
                 "ast_type": "RemainderNoops",