Move ast.Function to builtin.Function

Author: antonmedv

ast/func.go

@@ -9,10 +9,18 @@ import (
 	"strings"
 	"time"
 
-	"github.com/expr-lang/expr/ast"
 	"github.com/expr-lang/expr/vm/runtime"
 )
 
+type Function struct {
+	Name      string
+	Func      func(args ...any) (any, error)
+	Fast      func(arg any) any
+	Types     []reflect.Type
+	Validate  func(args []reflect.Type) (reflect.Type, error)
+	Predicate bool
+}
+
 var (
 	Index map[string]int
 	Names []string
@@ -27,7 +35,7 @@ func init() {
 	}
 }
 
-var Builtins = []*ast.Function{
+var Builtins = []*Function{
 	{
 		Name:      "all",
 		Predicate: true,

builtin/builtin.go

@@ -6,7 +6,6 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/expr-lang/expr/ast"
 	"github.com/expr-lang/expr/vm/runtime"
 )
 
@@ -274,8 +273,8 @@ func Min(args ...any) (any, error) {
 	return min, nil
 }
 
-func bitFunc(name string, fn func(x, y int) (any, error)) *ast.Function {
-	return &ast.Function{
+func bitFunc(name string, fn func(x, y int) (any, error)) *Function {
+	return &Function{
 		Name: name,
 		Func: func(args ...any) (any, error) {
 			if len(args) != 2 {

builtin/lib.go

@@ -71,7 +71,7 @@ type varScope struct {
 
 type info struct {
 	method bool
-	fn     *ast.Function
+	fn     *builtin.Function
 
 	// elem is element type of array or map.
 	// Arrays created with type []any, but
@@ -819,7 +819,7 @@ func (v *checker) checkBuiltinGet(node *ast.BuiltinNode) (reflect.Type, info) {
 	return v.error(val, "type %v does not support indexing", t)
 }
 
-func (v *checker) checkFunction(f *ast.Function, node ast.Node, arguments []ast.Node) (reflect.Type, info) {
+func (v *checker) checkFunction(f *builtin.Function, node ast.Node, arguments []ast.Node) (reflect.Type, info) {
 	if f.Validate != nil {
 		args := make([]reflect.Type, len(arguments))
 		for i, arg := range arguments {

checker/checker.go

@@ -144,7 +144,7 @@ func (c *compiler) addVariable(name string) int {
 }
 
 // emitFunction adds builtin.Function.Func to the program.functions and emits call opcode.
-func (c *compiler) emitFunction(fn *ast.Function, argsLen int) {
+func (c *compiler) emitFunction(fn *builtin.Function, argsLen int) {
 	switch argsLen {
 	case 0:
 		c.emit(OpCall0, c.addFunction(fn))
@@ -161,7 +161,7 @@ func (c *compiler) emitFunction(fn *ast.Function, argsLen int) {
 }
 
 // addFunction adds builtin.Function.Func to the program.functions and returns its index.
-func (c *compiler) addFunction(fn *ast.Function) int {
+func (c *compiler) addFunction(fn *builtin.Function) int {
 	if fn == nil {
 		panic("function is nil")
 	}

compiler/compiler.go

@@ -21,8 +21,8 @@ type Config struct {
 	Strict      bool
 	ConstFns    map[string]reflect.Value
 	Visitors    []ast.Visitor
-	Functions   map[string]*ast.Function
-	Builtins    map[string]*ast.Function
+	Functions   map[string]*builtin.Function
+	Builtins    map[string]*builtin.Function
 	Disabled    map[string]bool // disabled builtins
 }
 
@@ -32,8 +32,8 @@ func CreateNew() *Config {
 		Optimize:  true,
 		Operators: make(map[string][]string),
 		ConstFns:  make(map[string]reflect.Value),
-		Functions: make(map[string]*ast.Function),
-		Builtins:  make(map[string]*ast.Function),
+		Functions: make(map[string]*builtin.Function),
+		Builtins:  make(map[string]*builtin.Function),
 		Disabled:  make(map[string]bool),
 	}
 	for _, f := range builtin.Builtins {

conf/config.go

@@ -6,6 +6,7 @@ import (
 	"reflect"
 
 	"github.com/expr-lang/expr/ast"
+	"github.com/expr-lang/expr/builtin"
 	"github.com/expr-lang/expr/checker"
 	"github.com/expr-lang/expr/compiler"
 	"github.com/expr-lang/expr/conf"
@@ -123,7 +124,7 @@ func Function(name string, fn func(params ...any) (any, error), types ...any) Op
 			}
 			ts[i] = t
 		}
-		c.Functions[name] = &ast.Function{
+		c.Functions[name] = &builtin.Function{
 			Name:  name,
 			Func:  fn,
 			Types: ts,