Rename expr.CompileFieldExprArray to CompileFieldExprs (#392)

brimdata · Mar 6, 2020 · 41e5c88 · 41e5c88
1 parent e34ca3b
commit 41e5c88
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/expr/fieldexpr.go b/expr/fieldexpr.go
@@ -138,7 +138,8 @@ outer:
 	}, nil
 }
 
-func CompileFieldExprArray(nodes []ast.FieldExpr) ([]FieldExprResolver, error) {
+// CompileFieldExprs calls CompileFieldExpr for each element of nodes.
+func CompileFieldExprs(nodes []ast.FieldExpr) ([]FieldExprResolver, error) {
 	var resolvers []FieldExprResolver
 	if nodes != nil {
 		resolvers = make([]FieldExprResolver, 0, len(nodes))

diff --git a/proc/cut.go b/proc/cut.go
@@ -27,7 +27,7 @@ type Cut struct {
 // do this now since it might confuse users who expect to see output
 // fields in the order they specified.
 func CompileCutProc(c *Context, parent Proc, node *ast.CutProc) (*Cut, error) {
-	resolvers, err := expr.CompileFieldExprArray(node.Fields)
+	resolvers, err := expr.CompileFieldExprs(node.Fields)
 	if err != nil {
 		return nil, fmt.Errorf("compiling cut: %w", err)
 	}

diff --git a/proc/proc.go b/proc/proc.go
@@ -152,7 +152,7 @@ func CompileProc(custom Compiler, node ast.Proc, c *Context, parent Proc) ([]Pro
 		return []Proc{cut}, nil
 
 	case *ast.SortProc:
-		fields, err := expr.CompileFieldExprArray(v.Fields)
+		fields, err := expr.CompileFieldExprs(v.Fields)
 		if err != nil {
 			return nil, fmt.Errorf("compiling sort: %w", err)
 		}
@@ -186,7 +186,7 @@ func CompileProc(custom Compiler, node ast.Proc, c *Context, parent Proc) ([]Pro
 		return []Proc{NewFilter(c, parent, f)}, nil
 
 	case *ast.TopProc:
-		fields, err := expr.CompileFieldExprArray(v.Fields)
+		fields, err := expr.CompileFieldExprs(v.Fields)
 		if err != nil {
 			return nil, fmt.Errorf("compiling top: %w", err)
 		}