Move package expression -> expressions

Makefile

@@ -14,7 +14,10 @@ clean: ## remove binary files
 	rm -f ${LIB} ${CMD}
 
 deps: ## list dependencies
-	go list -f '{{join .Imports "\n"}}' ./... | grep -v ${PACKAGE} | grep '\.' | sort | uniq
+	go list -f '{{join .Deps "\n"}}' ./... | grep -v `go list -f '{{.ImportPath}}'` | grep '\.' | sort | uniq
+
+imports: ## list imports
+	go list -f '{{join .Imports "\n"}}' ./... | grep -v `go list -f '{{.ImportPath}}'` | grep '\.' | sort | uniq
 
 generate:
 	go generate ./...
@@ -26,7 +29,7 @@ setup: ## install dependencies and development tools
 	gometalinter --install
 
 lint: ## lint the package
-	gometalinter ./... --deadline=5m --exclude expression/scanner.go --exclude y.go --exclude '.*_string.go' --disable=gotype
+	gometalinter ./... --deadline=5m --exclude expressions/scanner.go --exclude y.go --exclude '.*_string.go' --disable=gotype
 	@echo lint passed
 
 test: ## test the package

expression/builders.go → expressions/builders.go

@@ -1,4 +1,4 @@
-package expression
+package expressions
 
 import (
 	"fmt"

expression/config.go → expressions/config.go

@@ -1,11 +1,11 @@
-package expression
+package expressions
 
 // Config holds configuration information for expression interpretation.
 type Config struct {
 	filters map[string]interface{}
 }
 
-// NewConfig creates a new Settings.
+// NewConfig creates a new Config.
 func NewConfig() Config {
 	return Config{}
 }

expression/context.go → expressions/context.go

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

expression/drops.go → expressions/drops.go

@@ -1,4 +1,4 @@
-package expression
+package expressions
 
 type drop interface {
 	ToLiquid() interface{}

expression/expressions.go → expressions/expressions.go

@@ -1,7 +1,7 @@
-// Package expression parses and evaluates the expression language.
+// Package expressions parses and evaluates the expression language.
 //
 // This is the language that is used inside Liquid object and tags; e.g. "a.b[c]" in {{ a.b[c] }}, and "pages = site.pages | reverse" in {% assign pages = site.pages | reverse %}.
-package expression
+package expressions
 
 import (
 	"github.com/osteele/liquid/evaluator"

expression/expressions.y → expressions/expressions.y

@@ -1,5 +1,5 @@
 %{
-package expression
+package expressions
 import (
     "fmt"
 	"github.com/osteele/liquid/evaluator"

expression/expressions_test.go → expressions/expressions_test.go

@@ -1,4 +1,4 @@
-package expression
+package expressions
 
 import (
 	"fmt"

expression/filters.go → expressions/filters.go

@@ -1,4 +1,4 @@
-package expression
+package expressions
 
 import (
 	"fmt"

expression/filters_test.go → expressions/filters_test.go

@@ -1,4 +1,4 @@
-package expression
+package expressions
 
 import (
 	"fmt"

expression/functional.go → expressions/functional.go

@@ -1,4 +1,4 @@
-package expression
+package expressions
 
 type expressionWrapper struct {
 	fn func(ctx Context) (interface{}, error)

expression/functional_test.go → expressions/functional_test.go

@@ -1,4 +1,4 @@
-package expression
+package expressions
 
 import (
 	"testing"

expression/parser.go → expressions/parser.go

@@ -2,7 +2,7 @@
 //go:generate gofmt -w scanner.go
 //go:generate goyacc expressions.y
 
-package expression
+package expressions
 
 import "fmt"
 

expression/parser_test.go → expressions/parser_test.go

@@ -1,4 +1,4 @@
-package expression
+package expressions
 
 import (
 	"fmt"

expression/scanner.go → expressions/scanner.go

@@ -1,5 +1,5 @@
 //line scanner.rl:1
-package expression
+package expressions
 
 import "strconv"
 

expression/scanner.rl → expressions/scanner.rl

@@ -1,4 +1,4 @@
-package expression
+package expressions
 
 import "strconv"
 

expression/scanner_test.go → expressions/scanner_test.go

@@ -1,4 +1,4 @@
-package expression
+package expressions
 
 import (
 	"fmt"

expression/statements.go → expressions/statements.go

@@ -1,4 +1,4 @@
-package expression
+package expressions
 
 // These strings match lexer tokens.
 const (

expression/y.go → expressions/y.go

@@ -1,5 +1,5 @@
 //line expressions.y:2
-package expression
+package expressions
 
 import __yyfmt__ "fmt"
 

filters/standard_filters_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/osteele/liquid/expression"
+	"github.com/osteele/liquid/expressions"
 	"github.com/stretchr/testify/require"
 )
 
@@ -203,13 +203,13 @@ func TestFilters(t *testing.T) {
 	)
 	filterTestBindings["dup_maps"] = []interface{}{m1, m2, m1, m3}
 
-	settings := expression.NewConfig()
+	settings := expressions.NewConfig()
 	AddStandardFilters(&settings)
-	context := expression.NewContext(filterTestBindings, settings)
+	context := expressions.NewContext(filterTestBindings, settings)
 
 	for i, test := range filterTests {
 		t.Run(fmt.Sprintf("%02d", i+1), func(t *testing.T) {
-			actual, err := expression.EvaluateString(test.in, context)
+			actual, err := expressions.EvaluateString(test.in, context)
 			require.NoErrorf(t, err, test.in)
 			expected := test.expected
 			switch v := actual.(type) {

liquid.go

@@ -10,7 +10,7 @@ package liquid
 
 import (
 	"github.com/osteele/liquid/evaluator"
-	"github.com/osteele/liquid/expression"
+	"github.com/osteele/liquid/expressions"
 	"github.com/osteele/liquid/parser"
 	"github.com/osteele/liquid/render"
 )
@@ -43,9 +43,9 @@ func IsTemplateError(err error) bool {
 	// now that interface calls return SourceError
 	case evaluator.TypeError:
 		return true
-	case expression.InterpreterError:
+	case expressions.InterpreterError:
 		return true
-	case expression.ParseError:
+	case expressions.ParseError:
 		return true
 	case parser.Error:
 		return true

parser/ast.go

@@ -1,7 +1,7 @@
 package parser
 
 import (
-	"github.com/osteele/liquid/expression"
+	"github.com/osteele/liquid/expressions"
 )
 
 // ASTNode is a node of an AST.
@@ -37,7 +37,7 @@ type ASTText struct {
 // ASTObject is an {{ object }} object.
 type ASTObject struct {
 	Token
-	Expr expression.Expression
+	Expr expressions.Expression
 }
 
 // ASTSeq is a sequence of nodes.

parser/config.go

@@ -1,10 +1,10 @@
 package parser
 
-import "github.com/osteele/liquid/expression"
+import "github.com/osteele/liquid/expressions"
 
 // A Config holds configuration information for parsing and rendering.
 type Config struct {
-	expression.Config
+	expressions.Config
 	Grammar    Grammar
 	SourcePath string
 	LineNo     int

parser/parser.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/osteele/liquid/expression"
+	"github.com/osteele/liquid/expressions"
 )
 
 // Parse parses a source template. It returns an AST root, that can be compiled and evaluated.
@@ -49,7 +49,7 @@ func (c Config) parseTokens(tokens []Token) (ASTNode, Error) { // nolint: gocycl
 				rawTag.Slices = append(rawTag.Slices, tok.Source)
 			}
 		case tok.Type == ObjTokenType:
-			expr, err := expression.Parse(tok.Args)
+			expr, err := expressions.Parse(tok.Args)
 			if err != nil {
 				return nil, WrapError(err, tok)
 			}

parser/token.go

@@ -14,7 +14,7 @@ type Token struct {
 // TokenType is the type of a Chunk
 type TokenType int
 
-//go:generate stringer -type=TokenType
+////go:generate stringer -type=TokenType
 
 const (
 	// TextTokenType is the type of a text Chunk

render/context.go

@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/osteele/liquid/expression"
+	"github.com/osteele/liquid/expressions"
 )
 
 // Context provides the rendering context for a tag renderer.
@@ -20,7 +20,7 @@ type Context interface {
 	// Use this to distinguish template errors from implementation errors.
 	Errorf(format string, a ...interface{}) Error
 	// Evaluate evaluates an expression within the template context.
-	Evaluate(expr expression.Expression) (interface{}, error)
+	Evaluate(expr expressions.Expression) (interface{}, error)
 	// Evaluate compiles and interprets an expression, such as “x”, “x < 10", or “a.b | split | first | default: 10”, within the current lexical context.
 	EvaluateString(source string) (interface{}, error)
 	// ExpandTagArg renders the current tag argument string as a Liquid template.
@@ -60,7 +60,7 @@ func (c rendererContext) WrapError(err error) Error {
 	return wrapRenderError(err, c.node)
 }
 
-func (c rendererContext) Evaluate(expr expression.Expression) (out interface{}, err error) {
+func (c rendererContext) Evaluate(expr expressions.Expression) (out interface{}, err error) {
 	return c.ctx.Evaluate(expr)
 }
 
@@ -69,15 +69,15 @@ func (c rendererContext) EvaluateString(source string) (out interface{}, err err
 	defer func() {
 		if r := recover(); r != nil {
 			switch e := r.(type) {
-			case expression.InterpreterError:
+			case expressions.InterpreterError:
 				err = e
 			default:
 				// fmt.Println(string(debug.Stack()))
 				panic(fmt.Errorf("%s during evaluation of %s", e, source))
 			}
 		}
 	}()
-	return expression.EvaluateString(source, expression.NewContext(c.ctx.bindings, c.ctx.config.Config.Config))
+	return expressions.EvaluateString(source, expressions.NewContext(c.ctx.bindings, c.ctx.config.Config.Config))
 }
 
 // Get gets a variable value within an evaluation context.

render/node_context.go

@@ -1,7 +1,7 @@
 package render
 
 import (
-	"github.com/osteele/liquid/expression"
+	"github.com/osteele/liquid/expressions"
 )
 
 // nodeContext provides the evaluation context for rendering the AST.
@@ -34,17 +34,17 @@ func (c nodeContext) Clone() nodeContext {
 }
 
 // Evaluate evaluates an expression within the template context.
-func (c nodeContext) Evaluate(expr expression.Expression) (out interface{}, err error) {
+func (c nodeContext) Evaluate(expr expressions.Expression) (out interface{}, err error) {
 	defer func() {
 		if r := recover(); r != nil {
 			switch e := r.(type) {
-			case expression.InterpreterError:
+			case expressions.InterpreterError:
 				err = e
 			default:
 				// fmt.Println(string(debug.Stack()))
 				panic(e)
 			}
 		}
 	}()
-	return expr.Evaluate(expression.NewContext(c.bindings, c.config.Config.Config))
+	return expr.Evaluate(expressions.NewContext(c.bindings, c.config.Config.Config))
 }

render/nodes.go

@@ -3,7 +3,7 @@ package render
 import (
 	"io"
 
-	"github.com/osteele/liquid/expression"
+	"github.com/osteele/liquid/expressions"
 	"github.com/osteele/liquid/parser"
 )
 
@@ -41,7 +41,7 @@ type TextNode struct {
 // ObjectNode is an {{ object }} object.
 type ObjectNode struct {
 	parser.Token
-	expr expression.Expression
+	expr expressions.Expression
 }
 
 // SeqNode is a sequence of nodes.

tags/control_flow_tags.go

@@ -4,7 +4,7 @@ import (
 	"io"
 
 	"github.com/osteele/liquid/evaluator"
-	e "github.com/osteele/liquid/expression"
+	e "github.com/osteele/liquid/expressions"
 	"github.com/osteele/liquid/render"
 )
 

tags/iteration_tags.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"regexp"
 
-	"github.com/osteele/liquid/expression"
+	"github.com/osteele/liquid/expressions"
 	"github.com/osteele/liquid/render"
 )
 
@@ -33,7 +33,7 @@ func continueTag(string) (func(io.Writer, render.Context) error, error) {
 }
 
 func cycleTag(args string) (func(io.Writer, render.Context) error, error) {
-	stmt, err := expression.ParseStatement(expression.CycleStatementSelector, args)
+	stmt, err := expressions.ParseStatement(expressions.CycleStatementSelector, args)
 	if err != nil {
 		return nil, err
 	}
@@ -64,7 +64,7 @@ func loopTagParser(node render.BlockNode) (func(io.Writer, render.Context) error
 	if m := loopRepairMatcher.FindStringSubmatch(src); m != nil {
 		src = m[1] + " .. " + m[2]
 	}
-	stmt, err := expression.ParseStatement(expression.LoopStatementSelector, src)
+	stmt, err := expressions.ParseStatement(expressions.LoopStatementSelector, src)
 	if err != nil {
 		return nil, err
 	}
@@ -114,7 +114,7 @@ func loopTagParser(node render.BlockNode) (func(io.Writer, render.Context) error
 	}, nil
 }
 
-func applyLoopModifiers(loop expression.Loop, iter iterable) iterable {
+func applyLoopModifiers(loop expressions.Loop, iter iterable) iterable {
 	if loop.Reversed {
 		iter = reverseWrapper{iter}
 	}