Move expressions -> expression

osteele · Jul 4, 2017 · 9691dc2 · 9691dc2
1 parent 405c5bf
commit 9691dc2
Show file tree

Hide file tree

Showing 28 changed files with 633 additions and 577 deletions.
diff --git a/Makefile b/Makefile
@@ -34,7 +34,7 @@ install-dev-tools: ## install dependencies and development tools
 	gometalinter --install
 
 lint: ## lint the package
-	gometalinter ./... --deadline=5m --exclude expressions/scanner.go --exclude y.go --exclude '.*_string.go'
+	gometalinter ./... --deadline=5m --exclude expression/scanner.go --exclude y.go --exclude '.*_string.go' --disable=gotype
 	@echo lint passed
 
 test: ## test the package

diff --git a/expressions/builders.go → expression/builders.go b/expressions/builders.go → expression/builders.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 import (
 	"reflect"

diff --git a/expressions/config.go → expression/config.go b/expressions/config.go → expression/config.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 // Config holds configuration information for expression interpretation.
 type Config struct {

diff --git a/expressions/context.go → expression/context.go b/expressions/context.go → expression/context.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 // Context is the expression evaluation context. It maps variables names to values.
 type Context interface {

diff --git a/expressions/drops.go → expression/drops.go b/expressions/drops.go → expression/drops.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 type drop interface {
 	ToLiquid() interface{}

diff --git a/expressions/expressions.go → expression/expressions.go b/expressions/expressions.go → expression/expressions.go
@@ -1,5 +1,5 @@
-// Package expressions parses and evaluates the expression language that is used in objects {{a.b[c]}} and tag parameters {%assign pages = site.pages | reverse%}.
-package expressions
+// Package expression parses and evaluates the expression language that is used in objects {{a.b[c]}} and tag parameters {%assign pages = site.pages | reverse%}.
+package expression
 
 import (
 	"github.com/osteele/liquid/generics"

diff --git a/expressions/expressions.y → expression/expressions.y b/expressions/expressions.y → expression/expressions.y
diff --git a/expressions/expressions_test.go → expression/expressions_test.go b/expressions/expressions_test.go → expression/expressions_test.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 import (
 	"fmt"

diff --git a/expressions/filters.go → expression/filters.go b/expressions/filters.go → expression/filters.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 import (
 	"fmt"

diff --git a/expressions/functional.go → expression/functional.go b/expressions/functional.go → expression/functional.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 type expressionWrapper struct {
 	fn func(ctx Context) (interface{}, error)

diff --git a/expressions/parser.go → expression/parser.go b/expressions/parser.go → expression/parser.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 import (
 	"fmt"

diff --git a/expressions/parser_test.go → expression/parser_test.go b/expressions/parser_test.go → expression/parser_test.go
@@ -1,4 +1,4 @@
-package expressions
+package expression
 
 import (
 	"fmt"