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

Commit 3984d57

Browse files
abeaumontabeaumont
authored
Merge pull request #47 from abeaumont/feature/upgrade-to-sdk-v1
Upgrade to sdk v1
2 parents 88c4dd3 + f094269 commit 3984d57

65 files changed

Lines changed: 1576 additions & 1577 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
- docker
88

99
before_script:
10-
- go get -v gopkg.in/bblfsh/sdk.v0/...
10+
- go get -v gopkg.in/bblfsh/sdk.v1/...
1111
- bblfsh-sdk prepare-build .
1212
- go get -v -t ./...
1313

‎ANNOTATION.md‎

Lines changed: 149 additions & 149 deletions
Large diffs are not rendered by default.

‎driver/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
"gopkg.in/bblfsh/sdk.v0/protocol/driver"
4+
"gopkg.in/bblfsh/sdk.v1/protocol/driver"
55

66
"github.com/bblfsh/java-driver/driver/normalizer"
77
)

‎driver/normalizer/annotation.go‎

Lines changed: 184 additions & 185 deletions
Large diffs are not rendered by default.

‎driver/normalizer/annotation_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"path/filepath"
99
"testing"
1010

11-
"gopkg.in/bblfsh/sdk.v0/uast"
11+
"gopkg.in/bblfsh/sdk.v1/uast"
1212
"github.com/stretchr/testify/require"
1313
)
1414

‎driver/normalizer/jdt/jdt.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package jdt
44
// GENERATED BY java-driver GoGen
55
// DO NOT EDIT
66

7-
import "gopkg.in/bblfsh/sdk.v0/uast/ann"
7+
import "gopkg.in/bblfsh/sdk.v1/uast/ann"
88

99
// Eclipse JDT node types.
1010
// This includes all non-abstract classes extending from ASTNode.

‎driver/normalizer/parser.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package normalizer
22

33
import (
4-
"gopkg.in/bblfsh/sdk.v0/protocol/driver"
5-
"gopkg.in/bblfsh/sdk.v0/protocol/native"
4+
"gopkg.in/bblfsh/sdk.v1/protocol/driver"
5+
"gopkg.in/bblfsh/sdk.v1/protocol/native"
66
)
77

88
var ToNoder = &native.ObjectToNoder{

‎native/src/test/java/bblfsh/GoGen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void generate() {
4747
+ "// GENERATED BY java-driver GoGen\n"
4848
+ "// DO NOT EDIT\n"
4949
+ "\n"
50-
+ "import \"gopkg.in/bblfsh/sdk.v0/uast/ann\"\n\n"
50+
+ "import \"gopkg.in/bblfsh/sdk.v1/uast/ann\"\n\n"
5151
);
5252
out.print(""
5353
+ "// Eclipse JDT node types.\n"

‎tests/annotation_type_declaration.uast‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ CompilationUnit {
55
. Roles: File
66
. Children: {
77
. . 0: AnnotationTypeDeclaration {
8-
. . . Roles: TypeDeclaration,Incomplete
8+
. . . Roles: Declaration,Type,Incomplete
99
. . . Properties: {
1010
. . . . internalRole: types
1111
. . . }
1212
. . . Children: {
1313
. . . . 0: SimpleName {
14-
. . . . . Roles: SimpleIdentifier,Expression
14+
. . . . . Roles: Expression,Identifier
1515
. . . . . TOKEN "A"
1616
. . . . . StartPosition: {
1717
. . . . . . Offset: 11

‎tests/annotation_type_member_declaration.uast‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ CompilationUnit {
55
. Roles: File
66
. Children: {
77
. . 0: AnnotationTypeDeclaration {
8-
. . . Roles: TypeDeclaration,Incomplete
8+
. . . Roles: Declaration,Type,Incomplete
99
. . . Properties: {
1010
. . . . internalRole: types
1111
. . . }
1212
. . . Children: {
1313
. . . . 0: SimpleName {
14-
. . . . . Roles: SimpleIdentifier,Expression
14+
. . . . . Roles: Expression,Identifier
1515
. . . . . TOKEN "A"
1616
. . . . . StartPosition: {
1717
. . . . . . Offset: 11
@@ -28,13 +28,13 @@ CompilationUnit {
2828
. . . . . }
2929
. . . . }
3030
. . . . 1: AnnotationTypeMemberDeclaration {
31-
. . . . . Roles: TypeDeclarationBody,Incomplete
31+
. . . . . Roles: Body,Declaration,Type,Incomplete
3232
. . . . . Properties: {
3333
. . . . . . internalRole: bodyDeclarations
3434
. . . . . }
3535
. . . . . Children: {
3636
. . . . . . 0: PrimitiveType {
37-
. . . . . . . Roles: Incomplete
37+
. . . . . . . Roles: Type,Primitive
3838
. . . . . . . TOKEN "int"
3939
. . . . . . . StartPosition: {
4040
. . . . . . . . Offset: 17
@@ -51,7 +51,7 @@ CompilationUnit {
5151
. . . . . . . }
5252
. . . . . . }
5353
. . . . . . 1: SimpleName {
54-
. . . . . . . Roles: SimpleIdentifier,Expression
54+
. . . . . . . Roles: Expression,Identifier
5555
. . . . . . . TOKEN "a"
5656
. . . . . . . StartPosition: {
5757
. . . . . . . . Offset: 21
@@ -68,7 +68,7 @@ CompilationUnit {
6868
. . . . . . . }
6969
. . . . . . }
7070
. . . . . . 2: NumberLiteral {
71-
. . . . . . . Roles: NumberLiteral,Expression
71+
. . . . . . . Roles: Expression,Literal,Number
7272
. . . . . . . StartPosition: {
7373
. . . . . . . . Offset: 33
7474
. . . . . . . . Line: 2

0 commit comments

Comments
 (0)