New var() function added to the builtin set

builtin-base.go

@@ -211,6 +211,25 @@ func evalFunc(ctx ExprContext, name string, args map[string]any) (result any, er
 	return
 }
 
+func varFunc(ctx ExprContext, name string, args map[string]any) (result any, err error) {
+	var varName string
+	var ok bool
+
+	if varName, ok = args[ParamName].(string); !ok {
+		return nil, ErrWrongParamType(name, ParamName, TypeString, args[ParamName])
+	}
+
+	if result, ok = args[ParamValue]; ok && result != nil {
+		ctx.GetParent().UnsafeSetVar(varName, result)
+		// } else {
+		// 	err = ErrWrongParamType(name, ParamSource, TypeString, args[ParamSource])
+		// }
+	} else if result, ok = ctx.GetVar(varName); !ok {
+		err = ErrUnknownVar(name, varName)
+	}
+	return
+}
+
 //// import
 
 func ImportBuiltinsFuncs(ctx ExprContext) {
@@ -240,6 +259,11 @@ func ImportBuiltinsFuncs(ctx ExprContext) {
 	ctx.RegisterFunc("eval", NewGolangFunctor(evalFunc), TypeAny, []ExprFuncParam{
 		NewFuncParam(ParamSource),
 	})
+
+	ctx.RegisterFunc("var", NewGolangFunctor(varFunc), TypeAny, []ExprFuncParam{
+		NewFuncParam(ParamName),
+		NewFuncParamFlagDef(ParamValue, PfDefault, nil),
+	})
 }
 
 func init() {

builtin-string.go

@@ -200,6 +200,24 @@ func splitStrFunc(ctx ExprContext, name string, args map[string]any) (result any
 	return
 }
 
+func upperStrFunc(ctx ExprContext, name string, args map[string]any) (result any, err error) {
+	if source, ok := args[ParamSource].(string); ok {
+		result = strings.ToUpper(source)
+	} else {
+		err = ErrWrongParamType(name, ParamSource, TypeString, args[ParamSource])
+	}
+	return
+}
+
+func lowerStrFunc(ctx ExprContext, name string, args map[string]any) (result any, err error) {
+	if source, ok := args[ParamSource].(string); ok {
+		result = strings.ToLower(source)
+	} else {
+		err = ErrWrongParamType(name, ParamSource, TypeString, args[ParamSource])
+	}
+	return
+}
+
 // --- End of function definitions
 
 // Import above functions in the context
@@ -236,6 +254,14 @@ func ImportStringFuncs(ctx ExprContext) {
 		NewFuncParam(ParamSuffix),
 		NewFuncParamFlag(strParamOther, PfRepeat),
 	})
+
+	ctx.RegisterFunc("strUpper", NewGolangFunctor(upperStrFunc), TypeString, []ExprFuncParam{
+		NewFuncParam(ParamSource),
+	})
+
+	ctx.RegisterFunc("strLower", NewGolangFunctor(lowerStrFunc), TypeString, []ExprFuncParam{
+		NewFuncParam(ParamSource),
+	})
 }
 
 // Register the import function in the import-register.

common-errors.go

@@ -80,6 +80,10 @@ func ErrUnknownParam(funcName, paramName string) error {
 	return fmt.Errorf("%s(): unknown parameter %q", funcName, paramName)
 }
 
+func ErrUnknownVar(funcName, varName string) error {
+	return fmt.Errorf("%s(): unknown variable %q", funcName, varName)
+}
+
 // --- Operator errors
 
 func ErrLeftOperandMustBeVariable(leftTerm, opTerm *term) error {

simple-store.go

@@ -24,6 +24,11 @@ func NewSimpleStore() *SimpleStore {
 	return ctx
 }
 
+func (ss *SimpleStore) Init() {
+	ss.varStore = make(map[string]any)
+	ss.funcStore = make(map[string]ExprFunc)
+}
+
 func filterRefName(name string) bool  { return name[0] != '@' }
 //func filterPrivName(name string) bool { return name[0] != '_' }
 

t_builtin-string_test.go

@@ -31,6 +31,8 @@ func TestFuncString(t *testing.T) {
 		/*  17 */ {`builtin "string"; strSplit("one-two-three", "-")`, newListA("one", "two", "three"), nil},
 		/*  18 */ {`builtin "string"; strJoin("-", [1, "two", "three"])`, nil, `strJoin(): expected string, got integer (1)`},
 		/*  19 */ {`builtin "string"; strJoin()`, nil, `strJoin(): too few params -- expected 1 or more, got 0`},
+		/*  20 */ {`builtin "string"; strUpper("StOp")`, "STOP", nil},
+		/*  21 */ {`builtin "string"; strLower("StOp")`, "stop", nil},
 
 		/*  69 */ /*{`builtin "string"; $$global`, `vars: {
 		}

t_funcs_test.go

@@ -68,3 +68,27 @@ func TestFunctionGetFunc(t *testing.T) {
 		t.Errorf(`(func() -> result = %v [%T], want = %v [%T]`, got, got, want, want)
 	}
 }
+
+func TestGoFunction(t *testing.T) {
+	section := "Funcs"
+	inputs := []inputType{
+		/*   1 */ {`myName()`, "Celestino Amoroso", nil},
+		/*   2 */ {`myName("Peppino")`, "Peppino", nil},
+	}
+
+	myName := func(ctx ExprContext, name string, args map[string]any) (result any, err error) {
+		var ok bool
+		if result, ok = args["name"].(string); !ok {
+			err = ErrWrongParamType(name, "name", TypeString, args["name"])
+		}
+		return
+	}
+
+	ctx := NewSimpleStore()
+	ctx.RegisterFunc("myName", NewGolangFunctor(myName), TypeString, []ExprFuncParam{
+		NewFuncParamFlagDef("name", PfOptional|PfDefault, "Celestino Amoroso"),
+	})
+
+	runCtxTestSuite(t, ctx, section, inputs)
+
+}