refactor: mv dsl/deparse.go dsl/deparse/deparse.go

tyru · tyru · commit 6d9fd03720aa · 2018-04-24T22:56:52.000+09:00
diff --git a/dsl/deparse/deparse.go b/dsl/deparse/deparse.go
@@ -1,4 +1,4 @@
-package dsl
+package deparse
 
 import (
 	"github.com/pkg/errors"
diff --git a/dsl/execute.go b/dsl/execute.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/vim-volt/volt/config"
+	"github.com/vim-volt/volt/dsl/deparse"
 	"github.com/vim-volt/volt/dsl/dslctx"
 	"github.com/vim-volt/volt/dsl/ops/util"
 	"github.com/vim-volt/volt/dsl/types"
@@ -120,7 +121,7 @@ func doExpandMacro(expr types.Expr) (types.Value, error) {
 }
 
 func writeTrxLog(ctx context.Context, expr types.Expr) (result error) {
-	deparsed, err := Deparse(expr)
+	deparsed, err := deparse.Deparse(expr)
 	if err != nil {
 		return errors.Wrap(err, "failed to deparse expression")
 	}
diff --git a/dsl/parse/parse.go b/dsl/parse/parse.go

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`
`11`	`11`	`"github.com/pkg/errors"`
`12`	`12`	`"github.com/vim-volt/volt/config"`
	`13`	`+ "github.com/vim-volt/volt/dsl/deparse"`
`13`	`14`	`"github.com/vim-volt/volt/dsl/dslctx"`
`14`	`15`	`"github.com/vim-volt/volt/dsl/ops/util"`
`15`	`16`	`"github.com/vim-volt/volt/dsl/types"`
`@@ -120,7 +121,7 @@ func doExpandMacro(expr types.Expr) (types.Value, error) {`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	`func writeTrxLog(ctx context.Context, expr types.Expr) (result error) {`
`123`		`- deparsed, err := Deparse(expr)`
	`124`	`+ deparsed, err := deparse.Deparse(expr)`
`124`	`125`	`if err != nil {`
`125`	`126`	`return errors.Wrap(err, "failed to deparse expression")`
`126`	`127`	`}`