moved scanner sources to package 'scan'
This commit is contained in:
+13
-12
@@ -8,21 +8,22 @@ import (
|
||||
"strings"
|
||||
|
||||
"git.portale-stac.it/go-pkg/expr/kern"
|
||||
"git.portale-stac.it/go-pkg/expr/scan"
|
||||
)
|
||||
|
||||
//-------- unset term
|
||||
|
||||
func newUnsetTerm(tk *Token) (inst *term) {
|
||||
return &term{
|
||||
tk: *tk,
|
||||
children: make([]*term, 0, 1),
|
||||
position: posPrefix,
|
||||
priority: priSign,
|
||||
evalFunc: evalUnset,
|
||||
func newUnsetTerm(tk *scan.Token) (inst *scan.Term) {
|
||||
return &scan.Term{
|
||||
Tk: *tk,
|
||||
Children: make([]*scan.Term, 0, 1),
|
||||
Position: scan.PosPrefix,
|
||||
Priority: scan.PriSign,
|
||||
EvalFunc: evalUnset,
|
||||
}
|
||||
}
|
||||
|
||||
func deleteContextItem(ctx kern.ExprContext, opTerm *term, item any) (deleted bool, err error) {
|
||||
func deleteContextItem(ctx kern.ExprContext, opTerm *scan.Term, item any) (deleted bool, err error) {
|
||||
if name, ok := item.(string); ok {
|
||||
var size int
|
||||
if strings.HasSuffix(name, "()") {
|
||||
@@ -35,16 +36,16 @@ func deleteContextItem(ctx kern.ExprContext, opTerm *term, item any) (deleted bo
|
||||
deleted = ctx.VarCount() < size
|
||||
}
|
||||
} else {
|
||||
err = opTerm.errIncompatiblePrefixPostfixType(item)
|
||||
err = opTerm.ErrIncompatiblePrefixPostfixType(item)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func evalUnset(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
func evalUnset(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
|
||||
var childValue any
|
||||
var deleted bool
|
||||
|
||||
if childValue, err = opTerm.evalPrefix(ctx); err != nil {
|
||||
if childValue, err = opTerm.EvalPrefix(ctx); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -69,5 +70,5 @@ func evalUnset(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
|
||||
// init
|
||||
func init() {
|
||||
registerTermConstructor(SymKwUnset, newUnsetTerm)
|
||||
scan.RegisterTermConstructor(scan.SymKwUnset, newUnsetTerm)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user