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

changed the structer of the selector components: now all case are a list value assigned as right operand of the selector operator

Browse Source
This commit is contained in:
Celestino Amoroso
2024-04-13 10:10:25 +02:00
parent efd9af9030
commit 70cdb9367e
4 changed files with 119 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
operator-selector.go
+61 -2
View File
@@ -4,13 +4,71 @@
// operator-selector.go
package expr
// //-------- export all term
// func newSelectorTerm(tk *Token) (inst *term) {
// return &term{
// tk: *tk,
// children: make([]*term, 0, 3),
// position: posMultifix,
// priority: priSelector,
// evalFunc: evalSelector,
// }
// }
// func isSelectorCase(ctx ExprContext, exprValue, caseSel any, caseIndex int) (selectedValue any, err error) {
// caseData, _ := caseSel.(*selectorCase)
// if caseData.filterList == nil {
// selectedValue, err = caseData.caseExpr.eval(ctx, false)
// } else {
// filterList := caseData.filterList.children
// if len(filterList) == 0 && exprValue == int64(caseIndex) {
// selectedValue, err = caseData.caseExpr.eval(ctx, false)
// } else {
// var caseValue any
// for _, caseTerm := range filterList {
// if caseValue, err = caseTerm.compute(ctx); err != nil || caseValue == exprValue {
// selectedValue, err = caseData.caseExpr.eval(ctx, false)
// break
// }
// }
// }
// }
// return
// }
// func evalSelector(ctx ExprContext, self *term) (v any, err error) {
// var exprValue any
// // var caseList []*term
// if err = self.checkOperands(); err != nil {
// return
// }
// exprTerm := self.children[0]
// if exprValue, err = exprTerm.compute(ctx); err != nil {
// return
// }
// caseList := self.children[1:]
// for i, caseTerm := range caseList {
// caseSel := caseTerm.value()
// if v, err = isSelectorCase(ctx, exprValue, caseSel, i); err != nil || v != nil {
// break
// }
// }
// if err == nil && v == nil {
// err = exprTerm.tk.Errorf("no case catches the value (%v) of the selection expression", exprValue)
// }
// return
// }
//-------- export all term
func newSelectorTerm(tk *Token) (inst *term) {
return &term{
tk: *tk,
children: make([]*term, 0, 3),
position: posMultifix,
position: posInfix,
priority: priSelector,
evalFunc: evalSelector,
}
@@ -49,7 +107,8 @@ func evalSelector(ctx ExprContext, self *term) (v any, err error) {
return
}
caseList := self.children[1:]
caseListTerm := self.children[1]
caseList, _ := caseListTerm.value().([]*term)
for i, caseTerm := range caseList {
caseSel := caseTerm.value()
if v, err = isSelectorCase(ctx, exprValue, caseSel, i); err != nil || v != nil {