moved scanner sources to package 'scan'

operand-selector-case.go

@@ -9,19 +9,20 @@ import (
 	"strings"
 
 	"git.portale-stac.it/go-pkg/expr/kern"
+	"git.portale-stac.it/go-pkg/expr/scan"
 )
 
 // -------- selector case term
 
 type selectorCase struct {
-	filterList *term
-	caseExpr   Expr
+	filterList *scan.Term
+	caseExpr   kern.Expr
 }
 
 func (sc *selectorCase) String() string {
 	var sb strings.Builder
 	if sc.filterList != nil {
-		sc.filterList.toString(&sb)
+		sc.filterList.ToString(&sb)
 		sb.WriteByte(' ')
 	}
 	sb.WriteByte('{')
@@ -30,23 +31,23 @@ func (sc *selectorCase) String() string {
 	return sb.String()
 }
 
-func newSelectorCaseTerm(row, col int, filterList *term, caseExpr Expr) *term {
-	tk := NewValueToken(row, col, SymSelectorCase, "", &selectorCase{filterList: filterList, caseExpr: caseExpr})
-	return &term{
-		tk:       *tk,
-		parent:   nil,
-		children: nil,
-		position: posLeaf,
-		priority: priValue,
-		evalFunc: evalSelectorCase,
+func newSelectorCaseTerm(row, col int, filterList *scan.Term, caseExpr kern.Expr) *scan.Term {
+	tk := scan.NewValueToken(row, col, scan.SymSelectorCase, "", &selectorCase{filterList: filterList, caseExpr: caseExpr})
+	return &scan.Term{
+		Tk:       *tk,
+		Parent:   nil,
+		Children: nil,
+		Position: scan.PosLeaf,
+		Priority: scan.PriValue,
+		EvalFunc: evalSelectorCase,
 	}
 }
 
 // -------- eval selector case
-func evalSelectorCase(ctx kern.ExprContext, opTerm *term) (v any, err error) {
+func evalSelectorCase(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
 	var ok bool
-	if v, ok = opTerm.value().(*selectorCase); !ok {
-		err = fmt.Errorf("selector-case expected, got %T", opTerm.value())
+	if v, ok = opTerm.Value().(*selectorCase); !ok {
+		err = fmt.Errorf("selector-case expected, got %T", opTerm.Value())
 	}
 	return
 }