Merge branch 'master' of github.com:/oec/goparsify

13 files changed, 32 insertions, 72 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index bad883d..0000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: golang:1.9
-    working_directory: /go/src/github.com/vektah/goparsify
-    steps:
-      - checkout
-      - run: go get -u github.com/golang/dep/cmd/dep github.com/alecthomas/gometalinter && gometalinter --install
-      - run: dep ensure --vendor-only
-      - run: go vet ./...
-      - run: go test -v ./...
-      - run: gometalinter . --disable gocyclo
diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index eef10cc..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-trim_trailing_whitespace = true
-
-[*.go]
-indent_style = tab
-indent_size = 4
\ No newline at end of file
diff --git a/Gopkg.lock b/Gopkg.lock
deleted file mode 100644
index 573ca3b..0000000
--- a/Gopkg.lock
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/davecgh/go-spew"
-  packages = ["spew"]
-  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
-  version = "v1.1.0"
-
-[[projects]]
-  name = "github.com/pmezard/go-difflib"
-  packages = ["difflib"]
-  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/prataprc/goparsec"
-  packages = [".","json"]
-  revision = "82de4f9400c22ea84314f99bec5034895ae5eed9"
-
-[[projects]]
-  name = "github.com/stretchr/testify"
-  packages = ["assert","require"]
-  revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"
-  version = "v1.1.4"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "87eecb782b0100538dd03417f0dbedf48e19dec675ac73fb728f06da94d5606d"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
deleted file mode 100644
index 222c747..0000000
--- a/Gopkg.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[[constraint]]
-  branch = "master"
-  name = "github.com/prataprc/goparsec"
-
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.1.4"
diff --git a/calc/calc.go b/calc/calc.go
index a4d6f8a..1f7dc6a 100644
--- a/calc/calc.go
+++ b/calc/calc.go
@@ -3,7 +3,7 @@ package calc
 import (
 	"fmt"
 
-	. "github.com/vektah/goparsify"
+	. "github.com/oec/goparsify"
 )
 
 var (
diff --git a/debugon.go b/debugon.go
index 9889dc4..49039c8 100644
--- a/debugon.go
+++ b/debugon.go
@@ -45,7 +45,9 @@ func (dp *debugParser) logf(ps *State, result *Result, format string, args ...in
 	buf.WriteString(fmt.Sprintf("%-15s", ps.Preview(15)))
 	buf.WriteString(" | ")
 	buf.WriteString(strings.Repeat("  ", len(activeParsers)-1))
-	buf.WriteString(fmt.Sprint(append([]interface{}{format}, args...)...))
+	//buf.WriteString(fmt.Sprintf(format, args...))
+	buf.WriteString(format)
+	buf.WriteString(fmt.Sprint(args...))
 	if ps.Errored() {
 		buf.WriteString(fmt.Sprintf(" did not find %s", ps.Error.expected))
 	} else if result != nil {
@@ -72,10 +74,10 @@ func (dp *debugParser) logStart(ps *State) {
 func (dp *debugParser) logEnd(ps *State, result *Result) {
 	if log != nil {
 		if pendingOpenLog != "" {
-			fmt.Fprintf(log, dp.logf(ps, result, dp.Name()))
+			fmt.Fprint(log, dp.logf(ps, result, dp.Name()))
 			pendingOpenLog = ""
 		} else {
-			fmt.Fprintf(log, dp.logf(ps, result, "}"))
+			fmt.Fprint(log, dp.logf(ps, result, "}"))
 		}
 	}
 }
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..4dea363
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,10 @@
+module github.com/oec/goparsify
+
+go 1.12
+
+require (
+	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prataprc/goparsec v0.0.0-20170801142144-82de4f9400c2
+	github.com/stretchr/testify v1.1.4
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..29b2c70
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,10 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prataprc/goparsec v0.0.0-20170801142144-82de4f9400c2 h1:JBQTPu1dlxC7Mp/lbF8WQMH206np5ZJYFbVyfjF9HL0=
+github.com/prataprc/goparsec v0.0.0-20170801142144-82de4f9400c2/go.mod h1:YbpxZqbf10o5u96/iDpcfDQmbIOTX/iNCH/yBByTfaM=
+github.com/stretchr/testify v1.1.4 h1:ToftOQTytwshuOSj6bDSolVUa3GINfJP/fg3OkkOzQQ=
+github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/vektah/goparsify v0.0.0-20180611020250-3e20a3b9244a h1:kjtLFYYtOh6EJz4svAJjY4apt9SJFQxe23e0mzTnlng=
+github.com/vektah/goparsify v0.0.0-20180611020250-3e20a3b9244a/go.mod h1:DSfslQMj3gv774kof/dg5pwh62XUjimkRBoF2DgdyaY=
diff --git a/html/html.go b/html/html.go
index f6a715b..ce98d6c 100644
--- a/html/html.go
+++ b/html/html.go
@@ -1,7 +1,7 @@
 package html
 
 import (
-	. "github.com/vektah/goparsify"
+	. "github.com/oec/goparsify"
 )
 
 func parse(input string) (result interface{}, err error) {
diff --git a/html/html_test.go b/html/html_test.go
index 79b0191..f0c2ac0 100644
--- a/html/html_test.go
+++ b/html/html_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/oec/goparsify"
 	"github.com/stretchr/testify/require"
-	"github.com/vektah/goparsify"
 )
 
 func TestParse(t *testing.T) {
diff --git a/json/json.go b/json/json.go
index 18f6870..ca1a905 100644
--- a/json/json.go
+++ b/json/json.go
@@ -1,7 +1,7 @@
 package json
 
 import (
-	. "github.com/vektah/goparsify"
+	. "github.com/oec/goparsify"
 )
 
 var (
diff --git a/json/json_test.go b/json/json_test.go
index 13f2e40..097bc34 100644
--- a/json/json_test.go
+++ b/json/json_test.go
@@ -6,9 +6,9 @@ import (
 
 	"os"
 
+	"github.com/oec/goparsify"
 	parsecJson "github.com/prataprc/goparsec/json"
 	"github.com/stretchr/testify/require"
-	"github.com/vektah/goparsify"
 )
 
 func TestUnmarshal(t *testing.T) {
diff --git a/json/profile/json.go b/json/profile/json.go
index b7d9733..d02b5fa 100644
--- a/json/profile/json.go
+++ b/json/profile/json.go
@@ -7,8 +7,8 @@ import (
 	"runtime"
 	"runtime/pprof"
 
-	"github.com/vektah/goparsify"
-	"github.com/vektah/goparsify/json"
+	"github.com/oec/goparsify"
+	"github.com/oec/goparsify/json"
 )
 
 var cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")