moved scanner sources to package 'scan'
This commit is contained in:
+17
-16
@@ -6,17 +6,18 @@ package expr
|
||||
|
||||
import (
|
||||
"git.portale-stac.it/go-pkg/expr/kern"
|
||||
"git.portale-stac.it/go-pkg/expr/scan"
|
||||
)
|
||||
|
||||
//-------- selector term
|
||||
|
||||
func newSelectorTerm(tk *Token) (inst *term) {
|
||||
return &term{
|
||||
tk: *tk,
|
||||
children: make([]*term, 0, 3),
|
||||
position: posInfix,
|
||||
priority: priSelector,
|
||||
evalFunc: evalSelector,
|
||||
func newSelectorTerm(tk *scan.Token) (inst *scan.Term) {
|
||||
return &scan.Term{
|
||||
Tk: *tk,
|
||||
Children: make([]*scan.Term, 0, 3),
|
||||
Position: scan.PosInfix,
|
||||
Priority: scan.PriSelector,
|
||||
EvalFunc: evalSelector,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,7 +26,7 @@ func trySelectorCase(ctx kern.ExprContext, exprValue, caseSel any, caseIndex int
|
||||
if caseData.filterList == nil {
|
||||
selectedValue, err = caseData.caseExpr.Eval(ctx)
|
||||
match = true
|
||||
} else if filterList, ok := caseData.filterList.value().([]*term); ok {
|
||||
} else if filterList, ok := caseData.filterList.Value().([]*scan.Term); ok {
|
||||
if len(filterList) == 0 {
|
||||
var valueAsInt = int64(0)
|
||||
if b, ok := exprValue.(bool); ok {
|
||||
@@ -53,33 +54,33 @@ func trySelectorCase(ctx kern.ExprContext, exprValue, caseSel any, caseIndex int
|
||||
return
|
||||
}
|
||||
|
||||
func evalSelector(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
func evalSelector(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
|
||||
var exprValue any
|
||||
var match bool
|
||||
|
||||
if err = opTerm.checkOperands(); err != nil {
|
||||
if err = opTerm.CheckOperands(); err != nil {
|
||||
return
|
||||
}
|
||||
exprTerm := opTerm.children[0]
|
||||
exprTerm := opTerm.Children[0]
|
||||
if exprValue, err = exprTerm.Compute(ctx); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
caseListTerm := opTerm.children[1]
|
||||
caseList, _ := caseListTerm.value().([]*term)
|
||||
caseListTerm := opTerm.Children[1]
|
||||
caseList, _ := caseListTerm.Value().([]*scan.Term)
|
||||
for i, caseTerm := range caseList {
|
||||
caseSel := caseTerm.value()
|
||||
caseSel := caseTerm.Value()
|
||||
if match, v, err = trySelectorCase(ctx, exprValue, caseSel, i); err != nil || match {
|
||||
break
|
||||
}
|
||||
}
|
||||
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
|
||||
}
|
||||
|
||||
// init
|
||||
func init() {
|
||||
registerTermConstructor(SymSelector, newSelectorTerm)
|
||||
scan.RegisterTermConstructor(scan.SymSelector, newSelectorTerm)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user