moved scanner sources to package 'scan'
This commit is contained in:
+29
-30
@@ -6,24 +6,24 @@ package expr
|
||||
|
||||
import (
|
||||
"git.portale-stac.it/go-pkg/expr/kern"
|
||||
"git.portale-stac.it/go-pkg/expr/scan"
|
||||
)
|
||||
|
||||
// -------- post increment term
|
||||
|
||||
func newPostIncTerm(tk *Token) *term {
|
||||
return &term{
|
||||
tk: *tk,
|
||||
parent: nil,
|
||||
children: make([]*term, 0, 1),
|
||||
position: posPostfix,
|
||||
priority: priIncDec,
|
||||
evalFunc: evalPostInc,
|
||||
func newPostIncTerm(tk *scan.Token) *scan.Term {
|
||||
return &scan.Term{
|
||||
Tk: *tk,
|
||||
Children: make([]*scan.Term, 0, 1),
|
||||
Position: scan.PosPostfix,
|
||||
Priority: scan.PriIncDec,
|
||||
EvalFunc: evalPostInc,
|
||||
}
|
||||
}
|
||||
|
||||
func evalPostInc(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
func evalPostInc(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
|
||||
var childValue any
|
||||
if childValue, err = opTerm.evalPrefix(ctx); err != nil {
|
||||
if childValue, err = opTerm.EvalPrefix(ctx); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -31,8 +31,8 @@ func evalPostInc(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
var namePrefix string
|
||||
v, err = it.Next()
|
||||
|
||||
if opTerm.children[0].symbol() == SymVariable {
|
||||
namePrefix = opTerm.children[0].Source()
|
||||
if opTerm.Children[0].Symbol() == scan.SymVariable {
|
||||
namePrefix = opTerm.Children[0].Source()
|
||||
}
|
||||
ctx.UnsafeSetVar(namePrefix+"_index", it.Index())
|
||||
if c, err1 := it.Current(); err1 == nil {
|
||||
@@ -49,49 +49,48 @@ func evalPostInc(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
ctx.UnsafeSetVar(namePrefix+"_value", v1)
|
||||
}
|
||||
}
|
||||
} else if kern.IsInteger(childValue) && opTerm.children[0].symbol() == SymVariable {
|
||||
} else if kern.IsInteger(childValue) && opTerm.Children[0].Symbol() == scan.SymVariable {
|
||||
v = childValue
|
||||
i, _ := childValue.(int64)
|
||||
ctx.SetVar(opTerm.children[0].Source(), i+1)
|
||||
ctx.SetVar(opTerm.Children[0].Source(), i+1)
|
||||
} else {
|
||||
err = opTerm.errIncompatiblePrefixPostfixType(childValue)
|
||||
err = opTerm.ErrIncompatiblePrefixPostfixType(childValue)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// -------- post decrement term
|
||||
|
||||
func newPostDecTerm(tk *Token) *term {
|
||||
return &term{
|
||||
tk: *tk,
|
||||
parent: nil,
|
||||
children: make([]*term, 0, 1),
|
||||
position: posPostfix,
|
||||
priority: priIncDec,
|
||||
evalFunc: evalPostDec,
|
||||
func newPostDecTerm(tk *scan.Token) *scan.Term {
|
||||
return &scan.Term{
|
||||
Tk: *tk,
|
||||
Children: make([]*scan.Term, 0, 1),
|
||||
Position: scan.PosPostfix,
|
||||
Priority: scan.PriIncDec,
|
||||
EvalFunc: evalPostDec,
|
||||
}
|
||||
}
|
||||
|
||||
func evalPostDec(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
func evalPostDec(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
|
||||
var childValue any
|
||||
if childValue, err = opTerm.evalPrefix(ctx); err != nil {
|
||||
if childValue, err = opTerm.EvalPrefix(ctx); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
/* if it, ok := childValue.(Iterator); ok {
|
||||
v, err = it.Next()
|
||||
} else */if kern.IsInteger(childValue) && opTerm.children[0].symbol() == SymVariable {
|
||||
} else */if kern.IsInteger(childValue) && opTerm.Children[0].Symbol() == scan.SymVariable {
|
||||
v = childValue
|
||||
i, _ := childValue.(int64)
|
||||
ctx.SetVar(opTerm.children[0].Source(), i-1)
|
||||
ctx.SetVar(opTerm.Children[0].Source(), i-1)
|
||||
} else {
|
||||
err = opTerm.errIncompatiblePrefixPostfixType(childValue)
|
||||
err = opTerm.ErrIncompatiblePrefixPostfixType(childValue)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// init
|
||||
func init() {
|
||||
registerTermConstructor(SymDoublePlus, newPostIncTerm)
|
||||
registerTermConstructor(SymDoubleMinus, newPostDecTerm)
|
||||
scan.RegisterTermConstructor(scan.SymDoublePlus, newPostIncTerm)
|
||||
scan.RegisterTermConstructor(scan.SymDoubleMinus, newPostDecTerm)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user