moved scanner sources to package 'scan'

operator-sign.go

@@ -6,61 +6,60 @@ package expr
 
 import (
 	"git.portale-stac.it/go-pkg/expr/kern"
+	"git.portale-stac.it/go-pkg/expr/scan"
 )
 
 //-------- plus sign term
 
-func newPlusSignTerm(tk *Token) (inst *term) {
-	return &term{
-		tk: *tk,
-		// class:    classOperator,
-		// kind:     kindUnknown,
-		children: make([]*term, 0, 1),
-		position: posPrefix,
-		priority: priSign,
-		evalFunc: evalSign,
+func newPlusSignTerm(tk *scan.Token) (inst *scan.Term) {
+	return &scan.Term{
+		Tk:       *tk,
+		Children: make([]*scan.Term, 0, 1),
+		Position: scan.PosPrefix,
+		Priority: scan.PriSign,
+		EvalFunc: evalSign,
 	}
 }
 
-func newMinusSignTerm(tk *Token) (inst *term) {
-	return &term{
-		tk:       *tk,
-		children: make([]*term, 0, 1),
-		position: posPrefix,
-		priority: priSign,
-		evalFunc: evalSign,
+func newMinusSignTerm(tk *scan.Token) (inst *scan.Term) {
+	return &scan.Term{
+		Tk:       *tk,
+		Children: make([]*scan.Term, 0, 1),
+		Position: scan.PosPrefix,
+		Priority: scan.PriSign,
+		EvalFunc: evalSign,
 	}
 }
 
-func evalSign(ctx kern.ExprContext, opTerm *term) (v any, err error) {
+func evalSign(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
 	var rightValue any
 
-	if rightValue, err = opTerm.evalPrefix(ctx); err != nil {
+	if rightValue, err = opTerm.EvalPrefix(ctx); err != nil {
 		return
 	}
 
 	if kern.IsFloat(rightValue) {
-		if opTerm.tk.Sym == SymChangeSign {
+		if opTerm.Tk.Sym == scan.SymChangeSign {
 			f, _ := rightValue.(float64)
 			v = -f
 		} else {
 			v = rightValue
 		}
 	} else if kern.IsInteger(rightValue) {
-		if opTerm.tk.Sym == SymChangeSign {
+		if opTerm.Tk.Sym == scan.SymChangeSign {
 			i, _ := rightValue.(int64)
 			v = -i
 		} else {
 			v = rightValue
 		}
 	} else {
-		err = opTerm.errIncompatiblePrefixPostfixType(rightValue)
+		err = opTerm.ErrIncompatiblePrefixPostfixType(rightValue)
 	}
 	return
 }
 
 // init
 func init() {
-	registerTermConstructor(SymUnchangeSign, newPlusSignTerm)
-	registerTermConstructor(SymChangeSign, newMinusSignTerm)
+	scan.RegisterTermConstructor(scan.SymUnchangeSign, newPlusSignTerm)
+	scan.RegisterTermConstructor(scan.SymChangeSign, newMinusSignTerm)
 }