moved scanner sources to package 'scan'
This commit is contained in:
+20
-19
@@ -8,6 +8,7 @@ import (
|
||||
"fmt"
|
||||
|
||||
"git.portale-stac.it/go-pkg/expr/kern"
|
||||
"git.portale-stac.it/go-pkg/expr/scan"
|
||||
)
|
||||
|
||||
// -------- range term
|
||||
@@ -28,35 +29,35 @@ func isIntPair(v any) bool {
|
||||
return ok
|
||||
}
|
||||
|
||||
func newRangeTerm(tk *Token) (inst *term) {
|
||||
return &term{
|
||||
tk: *tk,
|
||||
children: make([]*term, 0, 2),
|
||||
position: posInfix,
|
||||
priority: priRange,
|
||||
evalFunc: evalRange,
|
||||
func newRangeTerm(tk *scan.Token) (inst *scan.Term) {
|
||||
return &scan.Term{
|
||||
Tk: *tk,
|
||||
Children: make([]*scan.Term, 0, 2),
|
||||
Position: scan.PosInfix,
|
||||
Priority: scan.PriRange,
|
||||
EvalFunc: evalRange,
|
||||
}
|
||||
}
|
||||
|
||||
func changeColonToRange(t *term) {
|
||||
if t.tk.IsSymbol(SymColon) {
|
||||
t.tk.Sym = SymRange
|
||||
t.evalFunc = evalRange
|
||||
func changeColonToRange(t *scan.Term) {
|
||||
if t.Tk.IsSymbol(scan.SymColon) {
|
||||
t.Tk.Sym = scan.SymRange
|
||||
t.EvalFunc = evalRange
|
||||
}
|
||||
}
|
||||
|
||||
func evalRange(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
func evalRange(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
|
||||
var leftValue, rightValue any
|
||||
|
||||
if len(opTerm.children) == 0 {
|
||||
if len(opTerm.Children) == 0 {
|
||||
leftValue = int64(0)
|
||||
rightValue = int64(-1)
|
||||
} else if len(opTerm.children) == 1 {
|
||||
if leftValue, err = opTerm.children[0].Compute(ctx); err != nil {
|
||||
} else if len(opTerm.Children) == 1 {
|
||||
if leftValue, err = opTerm.Children[0].Compute(ctx); err != nil {
|
||||
return
|
||||
}
|
||||
rightValue = int64(kern.ConstLastIndex)
|
||||
} else if leftValue, rightValue, err = opTerm.evalInfix(ctx); err != nil {
|
||||
} else if leftValue, rightValue, err = opTerm.EvalInfix(ctx); err != nil {
|
||||
return
|
||||
}
|
||||
if !(kern.IsInteger(leftValue) && kern.IsInteger(rightValue)) {
|
||||
@@ -72,15 +73,15 @@ func evalRange(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
return
|
||||
}
|
||||
|
||||
func errRangeInvalidSpecification(t *term) error {
|
||||
func errRangeInvalidSpecification(t *scan.Term) error {
|
||||
return t.Errorf("invalid range specification")
|
||||
}
|
||||
|
||||
func errRangeUnexpectedExpression(t *term) error {
|
||||
func errRangeUnexpectedExpression(t *scan.Term) error {
|
||||
return t.Errorf("unexpected range expression")
|
||||
}
|
||||
|
||||
// init
|
||||
func init() {
|
||||
registerTermConstructor(SymRange, newRangeTerm)
|
||||
scan.RegisterTermConstructor(scan.SymRange, newRangeTerm)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user