Merge pull request #154 from juanjux/bip-5

Migration to the new DSL

.gitignore

@@ -1,111 +1,7 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*,cover
-.hypothesis/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# IPython Notebook
-.ipynb_checkpoints
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# dotenv
-.env
-
-# virtualenv
-venv/
-ENV/
-
-# Spyder project settings
-.spyderproject
-
-# Rope project settings
-.ropeproject
-
-.idea/*
-
-test/nimcache/*
-test/sendmsg
-
-# pycharm
-.idea/*
-
-# virtualenv
-36env/*
-install.sh
-mypy/*
-
-Dockerfile
-
-.sdk/*
-driver/main
-main
-.local/*
-
+.sdk
+build
 .mypy_cache
+.local/*
+.cache/*
+__pycache__
+makebuild.sh

.travis.yml

@@ -7,7 +7,7 @@ services:
   - docker
 
 before_script:
-  - go get -v gopkg.in/bblfsh/sdk.v1/...
+  - go get -v gopkg.in/bblfsh/sdk.v2/...
   - bblfsh-sdk prepare-build .
   - go get -v -t ./driver/...
 

Dockerfile.build.tpl

@@ -3,6 +3,6 @@ FROM alpine:3.7
 RUN mkdir -p /opt/driver/src && \
     adduser $BUILD_USER -u $BUILD_UID -D -h /opt/driver/src
 
-RUN apk add --no-cache --update python python3 git make
+RUN apk add --no-cache --update python python3 py-pip py2-pip git make
 
 WORKDIR /opt/driver/src

Dockerfile.tpl

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

Makefile

@@ -2,15 +2,15 @@ DEV_DEPS ?= native/dev_deps
 
 test-native-internal:
 	pip3 install --user ${DEV_DEPS}/python-pydetector/ || pip3 install --user pydetector-bblfsh
+	pip2 install --user ${DEV_DEPS}/python-pydetector/ || pip2 install --user pydetector-bblfsh
 	cd native/python_package/test && \
 	python3 -m unittest discover
 
 build-native-internal:
 	pip3 install --user ${DEV_DEPS}/python-pydetector/ || pip3 install --user pydetector-bblfsh
-	cd native/python_package/ && \
-	pip3 install -U --user .
+	pip2 install --user ${DEV_DEPS}/python-pydetector/ || pip2 install --user pydetector-bblfsh
+	cd native/python_package/ && pip3 install -U --user .
 	cp native/sh/native.sh $(BUILD_PATH)/bin/native;
 	chmod +x $(BUILD_PATH)/bin/native
 
-
 include .sdk/Makefile

README.md

@@ -7,7 +7,7 @@ Development Environment
 
 Requirements:
 - `docker`
-- [`bblfsh-sdk`](https://github.com/bblfsh/sdk) _(go get -u gopkg.in/bblfsh/sdk.v1/...)_
+- [`bblfsh-sdk`](https://github.com/bblfsh/sdk) _(go get -u gopkg.in/bblfsh/sdk.v2/...)_
 - UAST converter dependencies _(go get -t -v ./...)_
 
 To initialize the build system execute: `bblfsh-sdk prepare-build`, at the root of the project. This will install the SDK at `.sdk` for this driver.

driver/fixtures/fixtures_test.go

@@ -0,0 +1,34 @@
+package fixtures
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/bblfsh/python-driver/driver/normalizer"
+	"gopkg.in/bblfsh/sdk.v2/sdk/driver"
+	"gopkg.in/bblfsh/sdk.v2/sdk/driver/fixtures"
+)
+
+const projectRoot = "../../"
+
+var Suite = &fixtures.Suite{
+	Lang: "python",
+	Ext:  ".py",
+	Path: filepath.Join(projectRoot, fixtures.Dir),
+	NewDriver: func() driver.BaseDriver {
+		return driver.NewExecDriverAt(filepath.Join(projectRoot, "build/bin/native"))
+	},
+	Transforms: driver.Transforms{
+		Native: normalizer.Native,
+		Code:   normalizer.Code,
+	},
+	BenchName: "issue_server101",
+}
+
+func TestPythonDriver(t *testing.T) {
+	Suite.RunTests(t)
+}
+
+func BenchmarkPythonDriver(b *testing.B) {
+	Suite.RunBenchmarks(b)
+}

driver/impl/impl.go

@@ -0,0 +1,8 @@
+package impl
+
+import "gopkg.in/bblfsh/sdk.v2/sdk/driver"
+
+func init() {
+	// Can be overridden to link a native driver into a Go driver server.
+	driver.DefaultDriver = driver.NewExecDriver()
+}

driver/main.go

@@ -1,11 +1,15 @@
 package main
 
 import (
+	_ "github.com/bblfsh/python-driver/driver/impl"
 	"github.com/bblfsh/python-driver/driver/normalizer"
 
-	"gopkg.in/bblfsh/sdk.v1/sdk/driver"
+	"gopkg.in/bblfsh/sdk.v2/sdk/driver"
 )
 
 func main() {
-	driver.Run(normalizer.ToNode, normalizer.Transformers)
+	driver.Run(driver.Transforms{
+		Native: normalizer.Native,
+		Code:   normalizer.Code,
+	})
 }