moved scanner sources to package 'scan'

operator-in.go

@@ -6,17 +6,18 @@ package expr
 
 import (
 	"git.portale-stac.it/go-pkg/expr/kern"
+	"git.portale-stac.it/go-pkg/expr/scan"
 )
 
 //-------- in term
 
-func newInTerm(tk *Token) (inst *term) {
-	return &term{
-		tk:       *tk,
-		children: make([]*term, 0, 2),
-		position: posInfix,
-		priority: priRelational,
-		evalFunc: evalIn,
+func newInTerm(tk *scan.Token) (inst *scan.Term) {
+	return &scan.Term{
+		Tk:       *tk,
+		Children: make([]*scan.Term, 0, 2),
+		Position: scan.PosInfix,
+		Priority: scan.PriRelational,
+		EvalFunc: evalIn,
 	}
 }
 
@@ -25,10 +26,10 @@ func newInTerm(tk *Token) (inst *term) {
 // 	return
 // }
 
-func evalIn(ctx kern.ExprContext, opTerm *term) (v any, err error) {
+func evalIn(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
 	var leftValue, rightValue any
 
-	if leftValue, rightValue, err = opTerm.evalInfix(ctx); err != nil {
+	if leftValue, rightValue, err = opTerm.EvalInfix(ctx); err != nil {
 		return
 	}
 
@@ -39,12 +40,12 @@ func evalIn(ctx kern.ExprContext, opTerm *term) (v any, err error) {
 		dict, _ := rightValue.(*kern.DictType)
 		v = dict.HasKey(leftValue)
 	} else {
-		err = opTerm.errIncompatibleTypes(leftValue, rightValue)
+		err = opTerm.ErrIncompatibleTypes(leftValue, rightValue)
 	}
 	return
 }
 
 // init
 func init() {
-	registerTermConstructor(SymKwIn, newInTerm)
+	scan.RegisterTermConstructor(scan.SymKwIn, newInTerm)
 }