EvalArg -> Arg
This commit is contained in:
parent
c4a2fcce3d
commit
8ab2c28343
@ -19,16 +19,16 @@ func EvalString(ctx ExprContext, source string) (result any, err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
type EvalArg struct {
|
type Arg struct {
|
||||||
name string
|
name string
|
||||||
value any
|
value any
|
||||||
}
|
}
|
||||||
|
|
||||||
func EvalStringA(source string, args ...EvalArg) (result any, err error) {
|
func EvalStringA(source string, args ...Arg) (result any, err error) {
|
||||||
return EvalStringV(source, args)
|
return EvalStringV(source, args)
|
||||||
}
|
}
|
||||||
|
|
||||||
func EvalStringV(source string, args []EvalArg) (result any, err error) {
|
func EvalStringV(source string, args []Arg) (result any, err error) {
|
||||||
ctx := NewSimpleFuncStore()
|
ctx := NewSimpleFuncStore()
|
||||||
for _, arg := range args {
|
for _, arg := range args {
|
||||||
if isFunc(arg.value) {
|
if isFunc(arg.value) {
|
||||||
|
@ -24,7 +24,7 @@ func subtract(ctx ExprContext, name string, args []any) (result any, err error)
|
|||||||
func TestEvalStringA(t *testing.T) {
|
func TestEvalStringA(t *testing.T) {
|
||||||
|
|
||||||
source := `a + b * subtract(4,2)`
|
source := `a + b * subtract(4,2)`
|
||||||
args := []EvalArg{
|
args := []Arg{
|
||||||
{"a", uint8(1)},
|
{"a", uint8(1)},
|
||||||
{"b", int8(2)},
|
{"b", int8(2)},
|
||||||
{"subtract", FuncTemplate(subtract)},
|
{"subtract", FuncTemplate(subtract)},
|
||||||
|
Loading…
Reference in New Issue
Block a user