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

Expr's functions now support parameters with default value

Browse Source
This commit is contained in:
Celestino Amoroso
2024-06-01 19:56:40 +02:00
parent f66cd1fdb1
commit 9bba40f155
12 changed files with 180 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
operand-func.go
+42 -9
View File
@@ -22,13 +22,22 @@ func newFuncCallTerm(tk *Token, args []*term) *term {
}
// -------- eval func call
func checkFunctionCall(ctx ExprContext, name string, params []any) (err error) {
func checkFunctionCall(ctx ExprContext, name string, varParams *[]any) (err error) {
if info, exists, owner := GetFuncInfo(ctx, name); exists {
if info.MinArgs() > len(params) {
err = errTooFewParams(name, info.MinArgs(), info.MaxArgs(), len(params))
passedCount := len(*varParams)
if info.MinArgs() > passedCount {
err = errTooFewParams(name, info.MinArgs(), info.MaxArgs(), passedCount)
}
if err == nil && info.MaxArgs() >= 0 && info.MaxArgs() < len(params) {
err = errTooMuchParams(name, info.MaxArgs(), len(params))
for i, p := range info.Params() {
if i >= passedCount {
if !p.IsOptional() {
break
}
*varParams = append(*varParams, p.DefaultValue())
}
}
if err == nil && info.MaxArgs() >= 0 && info.MaxArgs() < len(*varParams) {
err = errTooMuchParams(name, info.MaxArgs(), len(*varParams))
}
if err == nil && owner != ctx {
// ctx.RegisterFunc(name, info.Functor(), info.MinArgs(), info.MaxArgs())
@@ -44,7 +53,7 @@ func evalFuncCall(parentCtx ExprContext, self *term) (v any, err error) {
ctx := cloneContext(parentCtx)
name, _ := self.tk.Value.(string)
// fmt.Printf("Call %s(), context: %p\n", name, ctx)
params := make([]any, len(self.children))
params := make([]any, len(self.children), len(self.children)+5)
for i, tree := range self.children {
var param any
if param, err = tree.compute(ctx); err != nil {
@@ -52,8 +61,9 @@ func evalFuncCall(parentCtx ExprContext, self *term) (v any, err error) {
}
params[i] = param
}
if err == nil {
if err = checkFunctionCall(ctx, name, params); err == nil {
if err = checkFunctionCall(ctx, name, &params); err == nil {
if v, err = ctx.Call(name, params); err == nil {
exportObjects(parentCtx, ctx)
}
@@ -75,12 +85,35 @@ func newFuncDefTerm(tk *Token, args []*term) *term {
}
// -------- eval func def
// func _evalFuncDef(ctx ExprContext, self *term) (v any, err error) {
// bodySpec := self.value()
// if expr, ok := bodySpec.(*ast); ok {
// paramList := make([]string, 0, len(self.children))
// for _, param := range self.children {
// paramList = append(paramList, param.source())
// }
// v = newExprFunctor(expr, paramList, ctx)
// } else {
// err = errors.New("invalid function definition: the body specification must be an expression")
// }
// return
// }
func evalFuncDef(ctx ExprContext, self *term) (v any, err error) {
bodySpec := self.value()
if expr, ok := bodySpec.(*ast); ok {
paramList := make([]string, 0, len(self.children))
paramList := make([]ExprFuncParam, 0, len(self.children))
for _, param := range self.children {
paramList = append(paramList, param.source())
var defValue any
flags := paramFlags(0)
if len(param.children) > 0 {
flags |= pfOptional
if defValue, err = param.children[0].compute(ctx); err != nil {
return
}
}
info := newFuncParamFlagDef(param.source(), flags, defValue)
paramList = append(paramList, info)
}
v = newExprFunctor(expr, paramList, ctx)
} else {