moved scanner sources to package 'scan'
This commit is contained in:
+12
-11
@@ -6,31 +6,32 @@ package expr
|
||||
|
||||
import (
|
||||
"git.portale-stac.it/go-pkg/expr/kern"
|
||||
"git.portale-stac.it/go-pkg/expr/scan"
|
||||
)
|
||||
|
||||
//-------- iter value term
|
||||
|
||||
func newIterValueTerm(tk *Token) (inst *term) {
|
||||
return &term{
|
||||
tk: *tk,
|
||||
children: make([]*term, 0, 1),
|
||||
position: posPrefix,
|
||||
priority: priDereference,
|
||||
evalFunc: evalIterValue,
|
||||
func newIterValueTerm(tk *scan.Token) (inst *scan.Term) {
|
||||
return &scan.Term{
|
||||
Tk: *tk,
|
||||
Children: make([]*scan.Term, 0, 1),
|
||||
Position: scan.PosPrefix,
|
||||
Priority: scan.PriDereference,
|
||||
EvalFunc: evalIterValue,
|
||||
}
|
||||
}
|
||||
|
||||
func evalIterValue(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
func evalIterValue(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.(kern.Iterator); ok {
|
||||
v, err = it.Current()
|
||||
} else {
|
||||
err = opTerm.errIncompatiblePrefixPostfixType(childValue)
|
||||
err = opTerm.ErrIncompatiblePrefixPostfixType(childValue)
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -38,5 +39,5 @@ func evalIterValue(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
// init
|
||||
func init() {
|
||||
// registerTermConstructor(SymOpenClosedRound, newIterValueTerm)
|
||||
registerTermConstructor(SymDereference, newIterValueTerm)
|
||||
scan.RegisterTermConstructor(scan.SymDereference, newIterValueTerm)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user