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

Update to v1 and modify Roles to match BIP-003 #171

Merged
merged 8 commits into from
Sep 14, 2017
Merged

Update to v1 and modify Roles to match BIP-003 #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
42f3f0a
Move to v1 version of the SDK
abeaumont Sep 8, 2017
40c481a
uast: Update roles to BIP-003
abeaumont Sep 14, 2017
611409b
uast: Minor style fixes
abeaumont Sep 14, 2017
38a1bc6
uast: Rename Path to Pathname to avoid naming collision
abeaumont Sep 14, 2017
9aa3e9e
uast: Update autogenerated files
abeaumont Sep 14, 2017
cce3781
positions: Upgrade sdk version
abeaumont Sep 14, 2017
52b7d96
roles: Update autogenerated role string file
abeaumont Sep 14, 2017
17a30ba
tests: Update tests to new roles.
abeaumont Sep 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go:
- 1.8
- tip

go_import_path: gopkg.in/bblfsh/sdk.v0
go_import_path: gopkg.in/bblfsh/sdk.v1

matrix:
fast_finish: true
Expand Down
16 changes: 8 additions & 8 deletions assets/skeleton/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cli/bblfsh-sdk-tools/cmd/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"path/filepath"
"strings"

"gopkg.in/bblfsh/sdk.v0/cli"
"gopkg.in/bblfsh/sdk.v0/manifest"
"gopkg.in/bblfsh/sdk.v1/cli"
"gopkg.in/bblfsh/sdk.v1/manifest"
)

const ManifestCommandDescription = "" +
Expand Down
2 changes: 1 addition & 1 deletion cli/bblfsh-sdk-tools/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"gopkg.in/bblfsh/sdk.v0/cli/bblfsh-sdk-tools/cmd"
"gopkg.in/bblfsh/sdk.v1/cli/bblfsh-sdk-tools/cmd"

"github.com/jessevdk/go-flags"
)
Expand Down
4 changes: 2 additions & 2 deletions cli/bblfsh-sdk/cmd/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cmd
import (
"path/filepath"

"gopkg.in/bblfsh/sdk.v0/assets/build"
"gopkg.in/bblfsh/sdk.v0/cli"
"gopkg.in/bblfsh/sdk.v1/assets/build"
"gopkg.in/bblfsh/sdk.v1/cli"
)

const sdkPath = ".sdk"
Expand Down
2 changes: 1 addition & 1 deletion cli/bblfsh-sdk/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"
"strings"

"gopkg.in/bblfsh/sdk.v0/cli"
"gopkg.in/bblfsh/sdk.v1/cli"
)

const InitCommandDescription = "initializes a driver for a given language and OS"
Expand Down
6 changes: 3 additions & 3 deletions cli/bblfsh-sdk/cmd/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"path/filepath"
"strings"

"gopkg.in/bblfsh/sdk.v0/assets/skeleton"
"gopkg.in/bblfsh/sdk.v0/cli"
"gopkg.in/bblfsh/sdk.v0/manifest"
"gopkg.in/bblfsh/sdk.v1/assets/skeleton"
"gopkg.in/bblfsh/sdk.v1/cli"
"gopkg.in/bblfsh/sdk.v1/manifest"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cli/bblfsh-sdk/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"gopkg.in/bblfsh/sdk.v0/cli/bblfsh-sdk/cmd"
"gopkg.in/bblfsh/sdk.v1/cli/bblfsh-sdk/cmd"

"github.com/jessevdk/go-flags"
)
Expand Down
2 changes: 1 addition & 1 deletion doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
//
// Babelfish SDK contains the tools and libraries required to create
// a Babelfish driver for a programming language.
package sdk // import "gopkg.in/bblfsh/sdk.v0"
package sdk // import "gopkg.in/bblfsh/sdk.v1"
2 changes: 1 addition & 1 deletion etc/skeleton/.travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
- docker

before_script:
- go get -v gopkg.in/bblfsh/sdk.v0/...
- go get -v gopkg.in/bblfsh/sdk.v1/...
- bblfsh-sdk prepare-build .
- go get -v -t ./...

Expand Down
2 changes: 1 addition & 1 deletion etc/skeleton/driver/main.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"gopkg.in/bblfsh/sdk.v0/protocol/driver"
"gopkg.in/bblfsh/sdk.v1/protocol/driver"

"github.com/bblfsh/{{.Manifest.Language}}-driver/driver/normalizer"
)
Expand Down
6 changes: 3 additions & 3 deletions etc/skeleton/driver/normalizer/annotation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package normalizer

import (
. "gopkg.in/bblfsh/sdk.v0/uast"
. "gopkg.in/bblfsh/sdk.v0/uast/ann"
"gopkg.in/bblfsh/sdk.v1/uast"
. "gopkg.in/bblfsh/sdk.v1/uast/ann"
)

// AnnotationRules annotate a UAST with roles.
var AnnotationRules = On(Any).Roles(File)
var AnnotationRules = On(Any).Roles(uast.File)
4 changes: 2 additions & 2 deletions etc/skeleton/driver/normalizer/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package normalizer

import (
"gopkg.in/bblfsh/sdk.v0/protocol/driver"
"gopkg.in/bblfsh/sdk.v0/protocol/native"
"gopkg.in/bblfsh/sdk.v1/protocol/driver"
"gopkg.in/bblfsh/sdk.v1/protocol/native"
)

// ToNoder specifies the driver options. Driver programmers should fill it
Expand Down
4 changes: 2 additions & 2 deletions protocol/driver/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package driver
import (
"io"

"gopkg.in/bblfsh/sdk.v0/protocol"
"gopkg.in/bblfsh/sdk.v0/protocol/jsonlines"
"gopkg.in/bblfsh/sdk.v1/protocol"
"gopkg.in/bblfsh/sdk.v1/protocol/jsonlines"
)

// Client is a client to communicate with a driver.
Expand Down
6 changes: 3 additions & 3 deletions protocol/driver/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"io"
"testing"

"gopkg.in/bblfsh/sdk.v0/protocol"
"gopkg.in/bblfsh/sdk.v0/protocol/jsonlines"
"gopkg.in/bblfsh/sdk.v0/uast"
"gopkg.in/bblfsh/sdk.v1/protocol"
"gopkg.in/bblfsh/sdk.v1/protocol/jsonlines"
"gopkg.in/bblfsh/sdk.v1/uast"

"github.com/stretchr/testify/require"
)
Expand Down
8 changes: 4 additions & 4 deletions protocol/driver/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"os"
"strings"

"gopkg.in/bblfsh/sdk.v0/protocol"
"gopkg.in/bblfsh/sdk.v0/protocol/native"
"gopkg.in/bblfsh/sdk.v0/uast"
"gopkg.in/bblfsh/sdk.v0/uast/ann"
"gopkg.in/bblfsh/sdk.v1/protocol"
"gopkg.in/bblfsh/sdk.v1/protocol/native"
"gopkg.in/bblfsh/sdk.v1/uast"
"gopkg.in/bblfsh/sdk.v1/uast/ann"

"github.com/jessevdk/go-flags"
)
Expand Down
10 changes: 5 additions & 5 deletions protocol/driver/driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"bytes"
"testing"

"gopkg.in/bblfsh/sdk.v0/etc/skeleton/driver/normalizer"
. "gopkg.in/bblfsh/sdk.v0/protocol/driver"
"gopkg.in/bblfsh/sdk.v0/uast"
"gopkg.in/bblfsh/sdk.v0/uast/ann"
"gopkg.in/bblfsh/sdk.v1/etc/skeleton/driver/normalizer"
. "gopkg.in/bblfsh/sdk.v1/protocol/driver"
"gopkg.in/bblfsh/sdk.v1/uast"
"gopkg.in/bblfsh/sdk.v1/uast/ann"

"github.com/stretchr/testify/require"
)
Expand All @@ -23,7 +23,7 @@ func testDriver(t *testing.T, args []string, expectedErr bool, expectedStdout, e
Version: "test",
Build: "test",
ParserBuilder: normalizer.ParserBuilder,
Annotate: ann.On(ann.Any).Roles(uast.SimpleIdentifier),
Annotate: ann.On(ann.Any).Roles(uast.Identifier),
In: stdin,
Out: stdout,
Err: stderr,
Expand Down
4 changes: 2 additions & 2 deletions protocol/driver/drivermain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os/exec"
"testing"

"gopkg.in/bblfsh/sdk.v0/protocol"
"gopkg.in/bblfsh/sdk.v0/protocol/jsonlines"
"gopkg.in/bblfsh/sdk.v1/protocol"
"gopkg.in/bblfsh/sdk.v1/protocol/jsonlines"

"github.com/stretchr/testify/require"
)
Expand Down
6 changes: 3 additions & 3 deletions protocol/driver/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package driver
import (
"io"

"gopkg.in/bblfsh/sdk.v0/protocol"
"gopkg.in/bblfsh/sdk.v0/uast"
"gopkg.in/bblfsh/sdk.v0/uast/ann"
"gopkg.in/bblfsh/sdk.v1/protocol"
"gopkg.in/bblfsh/sdk.v1/uast"
"gopkg.in/bblfsh/sdk.v1/uast/ann"
)

type ParserOptions struct {
Expand Down
4 changes: 2 additions & 2 deletions protocol/driver/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"testing"

"gopkg.in/bblfsh/sdk.v0/protocol"
"gopkg.in/bblfsh/sdk.v0/uast"
"gopkg.in/bblfsh/sdk.v1/protocol"
"gopkg.in/bblfsh/sdk.v1/uast"

"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion protocol/driver/positions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"sort"

"gopkg.in/bblfsh/sdk.v0/uast"
"gopkg.in/bblfsh/sdk.v1/uast"
)

// FillOffsetFromLineCol gets the original source code and its parsed form
Expand Down
2 changes: 1 addition & 1 deletion protocol/driver/positions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/stretchr/testify/require"
"gopkg.in/bblfsh/sdk.v0/uast"
"gopkg.in/bblfsh/sdk.v1/uast"
)

func TestFillLineColFromOffset(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions protocol/driver/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package driver
import (
"io"

"gopkg.in/bblfsh/sdk.v0/protocol"
"gopkg.in/bblfsh/sdk.v0/protocol/jsonlines"
"gopkg.in/bblfsh/sdk.v1/protocol"
"gopkg.in/bblfsh/sdk.v1/protocol/jsonlines"

"gopkg.in/src-d/go-errors.v0"
)
Expand Down
4 changes: 2 additions & 2 deletions protocol/driver/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"
"time"

"gopkg.in/bblfsh/sdk.v0/protocol"
"gopkg.in/bblfsh/sdk.v0/protocol/jsonlines"
"gopkg.in/bblfsh/sdk.v1/protocol"
"gopkg.in/bblfsh/sdk.v1/protocol/jsonlines"

"github.com/stretchr/testify/require"
)
Expand Down
Loading