support v2 protocol

Signed-off-by: Denys Smirnov <[email protected]>

Author: Denys Smirnov

Gopkg.lock

@@ -5,8 +5,9 @@ import (
 	"testing"
 
 	"github.com/bblfsh/python-driver/driver/normalizer"
-	"gopkg.in/bblfsh/sdk.v2/sdk/driver"
-	"gopkg.in/bblfsh/sdk.v2/sdk/driver/fixtures"
+	"gopkg.in/bblfsh/sdk.v2/driver"
+	"gopkg.in/bblfsh/sdk.v2/driver/fixtures"
+	"gopkg.in/bblfsh/sdk.v2/driver/native"
 )
 
 const projectRoot = "../../"
@@ -15,8 +16,8 @@ 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"))
+	NewDriver: func() driver.Native {
+		return native.NewDriverAt(filepath.Join(projectRoot, "build/bin/native"), native.UTF8)
 	},
 	Transforms: normalizer.Transforms,
 	BenchName:  "issue_server101",

driver/fixtures/fixtures_test.go

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

driver/impl/impl.go

@@ -4,9 +4,9 @@ import (
 	_ "github.com/bblfsh/python-driver/driver/impl"
 	"github.com/bblfsh/python-driver/driver/normalizer"
 
-	"gopkg.in/bblfsh/sdk.v2/sdk/driver"
+	"gopkg.in/bblfsh/sdk.v2/driver/server"
 )
 
 func main() {
-	driver.Run(normalizer.Transforms)
+	server.Run(normalizer.Transforms)
 }

driver/main.go

@@ -1,10 +1,10 @@
 package normalizer
 
-import "gopkg.in/bblfsh/sdk.v2/sdk/driver"
+import "gopkg.in/bblfsh/sdk.v2/driver"
 
 var Transforms = driver.Transforms{
-	Preprocess: Preprocess,
-	Normalize:  Normalize,
-	Native:     Native,
-	Code:       Code,
+	Preprocess:  Preprocess,
+	Normalize:   Normalize,
+	Annotations: Native,
+	Code:        Code,
 }

driver/normalizer/transforms.go

@@ -2,7 +2,7 @@ Module {
 .  Roles: File,Module
 .  Children: {
 .  .  0: ClassDef {
-.  .  .  Roles: Declaration,Identifier,Statement,Type
+.  .  .  Roles: Type,Declaration,Identifier,Statement
 .  .  .  TOKEN "testcls1"
 .  .  .  StartPosition: {
 .  .  .  .  Offset: 6
@@ -19,19 +19,19 @@ Module {
 .  .  .  }
 .  .  .  Children: {
 .  .  .  .  0: ClassDef.bases {
-.  .  .  .  .  Roles: Base,Declaration,Type
+.  .  .  .  .  Roles: Type,Declaration,Base
 .  .  .  .  .  Properties: {
 .  .  .  .  .  .  internalRole: bases
 .  .  .  .  .  }
 .  .  .  .  }
 .  .  .  .  1: ClassDef.decorator_list {
-.  .  .  .  .  Roles: Call,Declaration,Incomplete,Type
+.  .  .  .  .  Roles: Type,Declaration,Call,Incomplete
 .  .  .  .  .  Properties: {
 .  .  .  .  .  .  internalRole: decorator_list
 .  .  .  .  .  }
 .  .  .  .  }
 .  .  .  .  2: ClassDef.body {
-.  .  .  .  .  Roles: Body,Declaration,Type
+.  .  .  .  .  Roles: Type,Declaration,Body
 .  .  .  .  .  Properties: {
 .  .  .  .  .  .  internalRole: body
 .  .  .  .  .  }