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

member ctx removed from struct parser because it is unused

Browse Source
This commit is contained in:
Celestino Amoroso 2024-06-07 09:03:42 +02:00
parent 00c76b41f1
commit 0d01afcc9f
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helpers.go
View File

@ -16,10 +16,10 @@ func EvalString(ctx ExprContext, source string) (result any, err error) {
r := strings.NewReader(source) r := strings.NewReader(source)
scanner := NewScanner(r, DefaultTranslations()) scanner := NewScanner(r, DefaultTranslations())
parser := NewParser(ctx) parser := NewParser()
if tree, err = parser.Parse(scanner); err == nil { if tree, err = parser.Parse(scanner); err == nil {
result, err = tree.eval(ctx, true) result, err = tree.Eval(ctx)
} }
return return
} }
@ -41,7 +41,7 @@ func EvalStringV(source string, args []Arg) (result any, err error) {
functor := NewGolangFunctor(f) functor := NewGolangFunctor(f)
// ctx.RegisterFunc(arg.Name, functor, 0, -1) // ctx.RegisterFunc(arg.Name, functor, 0, -1)
ctx.RegisterFunc(arg.Name, functor, TypeAny, []ExprFuncParam{ ctx.RegisterFunc(arg.Name, functor, TypeAny, []ExprFuncParam{
NewFuncParamFlagDef(paramValue, PfOptional|PfRepeat, 0), NewFuncParamFlagDef(paramValue, PfDefault|PfRepeat, 0),
}) })
} else { } else {
err = fmt.Errorf("invalid function specification: %q", arg.Name) err = fmt.Errorf("invalid function specification: %q", arg.Name)
@ -68,7 +68,7 @@ func EvalStringV(source string, args []Arg) (result any, err error) {
func EvalStream(ctx ExprContext, r io.Reader) (result any, err error) { func EvalStream(ctx ExprContext, r io.Reader) (result any, err error) {
var tree *ast var tree *ast
scanner := NewScanner(r, DefaultTranslations()) scanner := NewScanner(r, DefaultTranslations())
parser := NewParser(ctx) parser := NewParser()
if tree, err = parser.Parse(scanner); err == nil { if tree, err = parser.Parse(scanner); err == nil {
result, err = tree.Eval(ctx) result, err = tree.Eval(ctx)

7
parser.go
View File

@ -11,13 +11,10 @@ import (
//-------- parser //-------- parser
type parser struct { type parser struct {
ctx ExprContext
} }
func NewParser(ctx ExprContext) (p *parser) { func NewParser() (p *parser) {
p = &parser{ p = &parser{}
ctx: ctx,
}
return p return p
} }

2
t_dict_test.go
View File

@ -49,7 +49,7 @@ func TestDictParser(t *testing.T) {
ctx.SetVar("var1", int64(123)) ctx.SetVar("var1", int64(123))
ctx.SetVar("var2", "abc") ctx.SetVar("var2", "abc")
ImportMathFuncs(ctx) ImportMathFuncs(ctx)
parser := NewParser(ctx) parser := NewParser()
logTest(t, i+1, "Dict", input.source, input.wantResult, input.wantErr) logTest(t, i+1, "Dict", input.source, input.wantResult, input.wantErr)

2
t_parser_test.go
View File

@ -188,7 +188,7 @@ func doTest(t *testing.T, section string, input *inputType, count int) (good boo
var gotErr error var gotErr error
ctx := NewSimpleStore() ctx := NewSimpleStore()
parser := NewParser(ctx) parser := NewParser()
logTest(t, count, section, input.source, input.wantResult, input.wantErr) logTest(t, count, section, input.source, input.wantResult, input.wantErr)