moved a subset of source file to the kern package
This commit is contained in:
+15
-11
@@ -4,20 +4,24 @@
|
||||
// function.go
|
||||
package expr
|
||||
|
||||
import (
|
||||
"git.portale-stac.it/go-pkg/expr/kern"
|
||||
)
|
||||
|
||||
// ---- Linking with Expr functions
|
||||
type exprFunctor struct {
|
||||
baseFunctor
|
||||
params []ExprFuncParam
|
||||
kern.BaseFunctor
|
||||
params []kern.ExprFuncParam
|
||||
expr Expr
|
||||
defCtx ExprContext
|
||||
defCtx kern.ExprContext
|
||||
}
|
||||
|
||||
func (functor *exprFunctor) GetParams() (params []ExprFuncParam) {
|
||||
func (functor *exprFunctor) GetParams() (params []kern.ExprFuncParam) {
|
||||
return functor.params
|
||||
}
|
||||
|
||||
func newExprFunctor(e Expr, params []ExprFuncParam, ctx ExprContext) *exprFunctor {
|
||||
var defCtx ExprContext
|
||||
func newExprFunctor(e Expr, params []kern.ExprFuncParam, ctx kern.ExprContext) *exprFunctor {
|
||||
var defCtx kern.ExprContext
|
||||
if ctx != nil {
|
||||
defCtx = ctx
|
||||
}
|
||||
@@ -28,17 +32,17 @@ func (functor *exprFunctor) TypeName() string {
|
||||
return "ExprFunctor"
|
||||
}
|
||||
|
||||
func (functor *exprFunctor) GetDefinitionContext() ExprContext {
|
||||
func (functor *exprFunctor) GetDefinitionContext() kern.ExprContext {
|
||||
return functor.defCtx
|
||||
}
|
||||
|
||||
func (functor *exprFunctor) InvokeNamed(ctx ExprContext, name string, args map[string]any) (result any, err error) {
|
||||
func (functor *exprFunctor) InvokeNamed(ctx kern.ExprContext, name string, args map[string]any) (result any, err error) {
|
||||
var missing []string
|
||||
for _, p := range functor.params {
|
||||
if arg, exists := args[p.Name()]; exists {
|
||||
if funcArg, ok := arg.(Functor); ok {
|
||||
if funcArg, ok := arg.(kern.Functor); ok {
|
||||
paramSpecs := funcArg.GetParams()
|
||||
ctx.RegisterFunc(p.Name(), funcArg, TypeAny, paramSpecs)
|
||||
ctx.RegisterFunc(p.Name(), funcArg, kern.TypeAny, paramSpecs)
|
||||
} else {
|
||||
ctx.UnsafeSetVar(p.Name(), arg)
|
||||
}
|
||||
@@ -51,7 +55,7 @@ func (functor *exprFunctor) InvokeNamed(ctx ExprContext, name string, args map[s
|
||||
}
|
||||
}
|
||||
if missing != nil {
|
||||
err = ErrMissingParams(name, missing)
|
||||
err = kern.ErrMissingParams(name, missing)
|
||||
} else {
|
||||
result, err = functor.expr.Eval(ctx)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user