go-pkg/expr
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

builtin-iterator.go: Added function abort() ans fixed typos in error messages

Browse Source
This commit is contained in:
Celestino Amoroso
2026-07-30 14:56:00 +02:00
parent 648533cbe3
commit 1c4ba5ef0b
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builtin-iterator.go
+32 -12
View File
@@ -17,26 +17,31 @@ const (
iterParamOperator = "operator" iterParamOperator = "operator"
iterParamVars = "vars" iterParamVars = "vars"
iterVarStatus = "status" iterVarStatus = "status"
iterParamStatus = "status"
iterVarAbort = "__abort"
) )
func parseRunArgs(localCtx kern.ExprContext, args map[string]any) (it kern.Iterator, op kern.Functor, err error) { func parseRunArgs(localCtx kern.ExprContext, args map[string]any) (it kern.Iterator, op kern.Functor, err error) {
var ok bool var ok bool
if it, ok = args[kern.ParamIterator].(kern.Iterator); !ok { if it, ok = args[kern.ParamIterator].(kern.Iterator); !ok {
err = fmt.Errorf("paramter %q must be an iterator, passed %v [%s]", kern.ParamIterator, args[kern.ParamIterator], kern.TypeName(args[kern.ParamIterator])) // err = fmt.Errorf("parameter %q must be an iterator, passed %v [%s]", kern.ParamIterator, args[kern.ParamIterator], kern.TypeName(args[kern.ParamIterator]))
err = errBadParamType(kern.ParamIterator, kern.TypeIterator, args[kern.ParamIterator])
return return
} }
if args[iterParamOperator] != nil { if args[iterParamOperator] != nil {
if op, ok = args[iterParamOperator].(kern.Functor); !ok || op == nil { if op, ok = args[iterParamOperator].(kern.Functor); !ok || op == nil {
err = fmt.Errorf("paramter %q must be a function, passed %v [%s]", iterParamOperator, args[iterParamOperator], kern.TypeName(args[iterParamOperator])) // err = fmt.Errorf("parameter %q must be a function, passed %v [%s]", iterParamOperator, args[iterParamOperator], kern.TypeName(args[iterParamOperator]))
err = errBadParamType(iterParamOperator, "function", args[iterParamOperator])
return return
} }
} }
var vars *dict.DictType var vars *dict.DictType
if vars, ok = args[iterParamVars].(*dict.DictType); !ok && args[iterParamVars] != nil { if vars, ok = args[iterParamVars].(*dict.DictType); !ok && args[iterParamVars] != nil {
err = fmt.Errorf("paramter %q must be a dictionary, passed %v [%s]", iterParamVars, args[iterParamVars], kern.TypeName(args[iterParamVars])) // err = fmt.Errorf("parameter %q must be a dictionary, passed %v [%s]", iterParamVars, args[iterParamVars], kern.TypeName(args[iterParamVars]))
err = errBadParamType(iterParamVars, kern.TypeDict, args[iterParamVars])
return return
} }
@@ -52,12 +57,21 @@ func parseRunArgs(localCtx kern.ExprContext, args map[string]any) (it kern.Itera
return return
} }
func errBadParamType(paramName, wantedType string, wantedValue any) error {
return fmt.Errorf("type of %q must be %s, passed %v [%s]", paramName, wantedType, wantedValue, kern.TypeName(wantedValue))
}
func abortFunc(ctx kern.ExprContext, name string, args map[string]any) (result any, err error) {
if status, provided := args[iterParamStatus]; provided {
ctx.UnsafeSetVar("@"+iterVarStatus, status)
}
ctx.UnsafeSetVar("@"+iterVarAbort, true)
return
}
func runFunc(ctx kern.ExprContext, name string, args map[string]any) (result any, err error) { func runFunc(ctx kern.ExprContext, name string, args map[string]any) (result any, err error) {
var it kern.Iterator var it kern.Iterator
var ok bool
var op kern.Functor var op kern.Functor
var v any
// var usingDefaultOp = false
var params map[string]any var params map[string]any
var item any var item any
@@ -68,14 +82,20 @@ func runFunc(ctx kern.ExprContext, name string, args map[string]any) (result any
return return
} }
localCtx.RegisterFunc("abort", kern.NewGolangFunctor(abortFunc), kern.TypeAny, []kern.ExprFuncParam{
kern.NewFuncParamFlagDef(iterParamStatus, kern.PfOptional, "aborted"),
})
params = map[string]any{kern.ParamIndex: 0, kern.ParamItem: nil}
for item, err = it.Next(); err == nil; item, err = it.Next() { for item, err = it.Next(); err == nil; item, err = it.Next() {
if op != nil { if op != nil {
params = map[string]any{kern.ParamIndex: it.Index(), kern.ParamItem: item} // params = map[string]any{kern.ParamIndex: it.Index(), kern.ParamItem: item}
if v, err = op.InvokeNamed(localCtx, iterParamOperator, params); err != nil { params[kern.ParamIndex] = it.Index()
params[kern.ParamItem] = item
if _, err = op.InvokeNamed(localCtx, iterParamOperator, params); err != nil {
break break
} else { } else if abortAny, exists := localCtx.GetVar(iterVarAbort); exists {
var success bool if abort, ok := boolean.ToBool(abortAny); ok && abort {
if success, ok = boolean.ToBool(v); !success || !ok {
break break
} }
} }
@@ -87,7 +107,7 @@ func runFunc(ctx kern.ExprContext, name string, args map[string]any) (result any
} }
if err == nil { if err == nil {
if op == nil { if op == nil {
ctx.UnsafeSetVar(iterVarStatus, it.Count()) localCtx.UnsafeSetVar(iterVarStatus, it.Count())
} }
result, _ = localCtx.GetVar(iterVarStatus) result, _ = localCtx.GetVar(iterVarStatus)
} }