update sdk version

Signed-off-by: Denys Smirnov <denys@sourced.tech>

.travis.yml

@@ -1,13 +1,13 @@
 language: go
 
 go:
-  - '1.10'
+  - '1.11'
 
 services:
   - docker
 
 env:
-  - BBLFSHD_VERSION=v2.9.1
+  - BBLFSHD_VERSION=v2.11.7
 
 install:
   - curl -L https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 > $GOPATH/bin/dep

Gopkg.toml

@@ -3,7 +3,7 @@
 
 [[constraint]]
   name = "gopkg.in/bblfsh/sdk.v2"
-  version = "2.13.x"
+  version = "2.15.x"
 
 [prune]
   go-tests = true

driver/fixtures/fixtures_test.go

@@ -36,9 +36,6 @@ var Suite = &fixtures.Suite{
 			"Stmt_Function",
 		},
 	},
-	Docker: fixtures.DockerConfig{
-		Image: "php:7",
-	},
 }
 
 func TestPHPDriver(t *testing.T) {

driver/normalizer/normalizer.go

@@ -100,24 +100,27 @@ var PreNormilizers = []Mapping{
 // Normalizers is the main block of normalization rules to convert native AST to semantic UAST.
 var Normalizers = []Mapping{
 	MapSemantic("Name", uast.Identifier{}, MapObj(
-		Obj{
-			uast.KeyToken: Var("name"),
+		Fields{
+			{Name: uast.KeyToken, Op: Var("name")},
+			{Name: "comments", Drop: true, Op: Any()}, // FIXME(dennwc): handle comments
 		},
 		Obj{
 			"Name": Var("name"),
 		},
 	)),
 	MapSemantic("Name", uast.Identifier{}, MapObj(
-		Obj{
-			"parts": One(Var("name")),
+		Fields{
+			{Name: "parts", Op: One(Var("name"))},
+			{Name: "comments", Drop: true, Op: Any()}, // FIXME(dennwc): handle comments
 		},
 		Obj{
 			"Name": Var("name"),
 		},
 	)),
 	MapSemantic("Name", uast.QualifiedIdentifier{}, MapObj(
-		Obj{
-			"parts": Each("names", Var("name")),
+		Fields{
+			{Name: "parts", Op: Each("names", Var("name"))},
+			{Name: "comments", Drop: true, Op: Any()}, // FIXME(dennwc): handle comments
 		},
 		Obj{
 			"Names": Each("names", UASTType(uast.Identifier{}, Obj{
@@ -352,15 +355,16 @@ var Normalizers = []Mapping{
 		},
 	)),
 	MapSemantic("Stmt_Function", uast.FunctionGroup{}, MapObj(
-		Obj{
-			"byRef": Cases("by_ref",
+		Fields{
+			{Name: "byRef", Op: Cases("by_ref",
 				Bool(false),
 				Bool(true),
-			),
-			"name":       Var("name"),
-			"params":     Var("params"),
-			"returnType": typeCaseLeft("return"),
-			"stmts":      Var("body"),
+			)},
+			{Name: "name", Op: Var("name")},
+			{Name: "params", Op: Var("params")},
+			{Name: "returnType", Op: typeCaseLeft("return")},
+			{Name: "stmts", Op: Var("body")},
+			{Name: "comments", Drop: true, Op: Any()}, // FIXME(dennwc): handle comments
 		},
 		Obj{
 			"Nodes": Arr(