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

empty expressions no more return error, now they return nil

Browse Source
This commit is contained in:
Celestino Amoroso 2024-04-20 06:56:26 +02:00
parent 475ef3c80a
commit 943ef3327e
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ast.go
View File

@ -5,7 +5,6 @@
package expr package expr
import ( import (
"errors"
"strings" "strings"
) )
@ -129,8 +128,8 @@ func (self *ast) eval(ctx ExprContext, preset bool) (result any, err error) {
if err == nil { if err == nil {
result, err = self.root.compute(ctx) result, err = self.root.compute(ctx)
} }
} else { // } else {
err = errors.New("empty expression") // err = errors.New("empty expression")
} }
return return
} }

12
expr_test.go
View File

@ -18,17 +18,19 @@ func TestExpr(t *testing.T) {
} }
inputs := []inputType{ inputs := []inputType{
/* 1 */ {`fact=func(n){(n)?{1}::{n*fact(n-1)}}; fact(5)`, int64(120), nil}, /* 1 */ {`0?{}`, nil, nil},
/* 2 */ {`fact=func(n){(n)?{1}::{n*fact(n-1)}}; fact(5)`, int64(120), nil},
/* 3 */ {`f=openFile("test-file.txt"); line=readFile(f); closeFile(f); line`, "uno", nil},
} }
succeeded := 0 succeeded := 0
failed := 0 failed := 0
inputs1 := []inputType{ // inputs1 := []inputType{
{`f=openFile("test-file.txt"); line=readFile(f); closeFile(f); line`, "uno", nil}, // /* 1 */ {`0?{}`, nil, nil},
} // }
for i, input := range inputs1 { for i, input := range inputs {
var expr Expr var expr Expr
var gotResult any var gotResult any
var gotErr error var gotErr error

11
operator-selector.go
View File

@ -74,18 +74,21 @@ func newSelectorTerm(tk *Token) (inst *term) {
} }
} }
func isSelectorCase(ctx ExprContext, exprValue, caseSel any, caseIndex int) (selectedValue any, err error) { func isSelectorCase(ctx ExprContext, exprValue, caseSel any, caseIndex int) (match bool, selectedValue any, err error) {
caseData, _ := caseSel.(*selectorCase) caseData, _ := caseSel.(*selectorCase)
if caseData.filterList == nil { if caseData.filterList == nil {
selectedValue, err = caseData.caseExpr.eval(ctx, false) selectedValue, err = caseData.caseExpr.eval(ctx, false)
match = true
} else if filterList, ok := caseData.filterList.value().([]*term); ok { } else if filterList, ok := caseData.filterList.value().([]*term); ok {
if len(filterList) == 0 && exprValue == int64(caseIndex) { if len(filterList) == 0 && exprValue == int64(caseIndex) {
selectedValue, err = caseData.caseExpr.eval(ctx, false) selectedValue, err = caseData.caseExpr.eval(ctx, false)
match = true
} else { } else {
var caseValue any var caseValue any
for _, caseTerm := range filterList { for _, caseTerm := range filterList {
if caseValue, err = caseTerm.compute(ctx); err != nil || caseValue == exprValue { if caseValue, err = caseTerm.compute(ctx); err != nil || caseValue == exprValue {
selectedValue, err = caseData.caseExpr.eval(ctx, false) selectedValue, err = caseData.caseExpr.eval(ctx, false)
match = true
break break
} }
} }
@ -96,7 +99,7 @@ func isSelectorCase(ctx ExprContext, exprValue, caseSel any, caseIndex int) (sel
func evalSelector(ctx ExprContext, self *term) (v any, err error) { func evalSelector(ctx ExprContext, self *term) (v any, err error) {
var exprValue any var exprValue any
// var caseList []*term var match bool
if err = self.checkOperands(); err != nil { if err = self.checkOperands(); err != nil {
return return
@ -110,11 +113,11 @@ func evalSelector(ctx ExprContext, self *term) (v any, err error) {
caseList, _ := caseListTerm.value().([]*term) caseList, _ := caseListTerm.value().([]*term)
for i, caseTerm := range caseList { for i, caseTerm := range caseList {
caseSel := caseTerm.value() caseSel := caseTerm.value()
if v, err = isSelectorCase(ctx, exprValue, caseSel, i); err != nil || v != nil { if match, v, err = isSelectorCase(ctx, exprValue, caseSel, i); err != nil || match {
break break
} }
} }
if err == nil && v == nil { if err == nil && !match {
err = exprTerm.tk.Errorf("no case catches the value (%v) of the selection expression", exprValue) err = exprTerm.tk.Errorf("no case catches the value (%v) of the selection expression", exprValue)
} }
return return