The function parameter model has been modified to support the passing of named parameters
This commit is contained in:
+16
-10
@@ -21,27 +21,33 @@ func getStdout(ctx ExprContext) io.Writer {
|
||||
return w
|
||||
}
|
||||
|
||||
func printFunc(ctx ExprContext, name string, args []any) (result any, err error) {
|
||||
var n int
|
||||
if n, err = fmt.Fprint(getStdout(ctx), args...); err == nil {
|
||||
result = int64(n)
|
||||
func printFunc(ctx ExprContext, name string, args map[string]any) (result any, err error) {
|
||||
var n int = 0
|
||||
if v, exists := args[ParamItem]; exists && v != nil {
|
||||
argv := v.([]any)
|
||||
n, err = fmt.Fprint(getStdout(ctx), argv...)
|
||||
}
|
||||
result = int64(n)
|
||||
return
|
||||
}
|
||||
|
||||
func printLnFunc(ctx ExprContext, name string, args []any) (result any, err error) {
|
||||
var n int
|
||||
if n, err = fmt.Fprintln(getStdout(ctx), args...); err == nil {
|
||||
result = int64(n)
|
||||
func printLnFunc(ctx ExprContext, name string, args map[string]any) (result any, err error) {
|
||||
var n int = 0
|
||||
if v, exists := args[ParamItem]; exists && v != nil {
|
||||
argv := v.([]any)
|
||||
n, err = fmt.Fprintln(getStdout(ctx), argv...)
|
||||
} else {
|
||||
n, err = fmt.Fprintln(getStdout(ctx))
|
||||
}
|
||||
result = int64(n)
|
||||
return
|
||||
}
|
||||
|
||||
func ImportFmtFuncs(ctx ExprContext) {
|
||||
ctx.RegisterFunc("print", NewGolangFunctor(printFunc), TypeInt, []ExprFuncParam{
|
||||
ctx.RegisterFunc("print", NewGolangFunctor2(printFunc), TypeInt, []ExprFuncParam{
|
||||
NewFuncParamFlag(ParamItem, PfRepeat),
|
||||
})
|
||||
ctx.RegisterFunc("println", NewGolangFunctor(printLnFunc), TypeInt, []ExprFuncParam{
|
||||
ctx.RegisterFunc("println", NewGolangFunctor2(printLnFunc), TypeInt, []ExprFuncParam{
|
||||
NewFuncParamFlag(ParamItem, PfRepeat),
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user