The function parameter model has been modified to support the passing of named parameters
This commit is contained in:
@@ -86,8 +86,9 @@ func doAdd(ctx ExprContext, name string, it Iterator, count, level int) (result
|
||||
return
|
||||
}
|
||||
|
||||
func addFunc(ctx ExprContext, name string, args []any) (result any, err error) {
|
||||
result, err = doAdd(ctx, name, NewArrayIterator(args), 0, -1)
|
||||
func addFunc(ctx ExprContext, name string, args map[string]any) (result any, err error) {
|
||||
argv := args[ParamValue].([]any)
|
||||
result, err = doAdd(ctx, name, NewArrayIterator(argv), 0, -1)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -161,17 +162,18 @@ func doMul(ctx ExprContext, name string, it Iterator, count, level int) (result
|
||||
return
|
||||
}
|
||||
|
||||
func mulFunc(ctx ExprContext, name string, args []any) (result any, err error) {
|
||||
result, err = doMul(ctx, name, NewArrayIterator(args), 0, -1)
|
||||
func mulFunc(ctx ExprContext, name string, args map[string]any) (result any, err error) {
|
||||
argv := args[ParamValue].([]any)
|
||||
result, err = doMul(ctx, name, NewArrayIterator(argv), 0, -1)
|
||||
return
|
||||
}
|
||||
|
||||
func ImportMathFuncs(ctx ExprContext) {
|
||||
ctx.RegisterFunc("add", &golangFunctor{f: addFunc}, TypeNumber, []ExprFuncParam{
|
||||
ctx.RegisterFunc("add", NewGolangFunctor2(addFunc), TypeNumber, []ExprFuncParam{
|
||||
NewFuncParamFlagDef(ParamValue, PfDefault|PfRepeat, int64(0)),
|
||||
})
|
||||
|
||||
ctx.RegisterFunc("mul", &golangFunctor{f: mulFunc}, TypeNumber, []ExprFuncParam{
|
||||
ctx.RegisterFunc("mul", NewGolangFunctor2(mulFunc), TypeNumber, []ExprFuncParam{
|
||||
NewFuncParamFlagDef(ParamValue, PfDefault|PfRepeat, int64(1)),
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user