moved scanner sources to package 'scan'
This commit is contained in:
+27
-26
@@ -6,34 +6,35 @@ package expr
|
||||
|
||||
import (
|
||||
"git.portale-stac.it/go-pkg/expr/kern"
|
||||
"git.portale-stac.it/go-pkg/expr/scan"
|
||||
)
|
||||
|
||||
//-------- prepend term
|
||||
|
||||
func newPrependTerm(tk *Token) (inst *term) {
|
||||
return &term{
|
||||
tk: *tk,
|
||||
children: make([]*term, 0, 2),
|
||||
position: posInfix,
|
||||
priority: priInsert,
|
||||
evalFunc: evalPrepend,
|
||||
func newPrependTerm(tk *scan.Token) (inst *scan.Term) {
|
||||
return &scan.Term{
|
||||
Tk: *tk,
|
||||
Children: make([]*scan.Term, 0, 2),
|
||||
Position: scan.PosInfix,
|
||||
Priority: scan.PriInsert,
|
||||
EvalFunc: evalPrepend,
|
||||
}
|
||||
}
|
||||
|
||||
func newAppendTerm(tk *Token) (inst *term) {
|
||||
return &term{
|
||||
tk: *tk,
|
||||
children: make([]*term, 0, 2),
|
||||
position: posInfix,
|
||||
priority: priInsert,
|
||||
evalFunc: evalAppend,
|
||||
func newAppendTerm(tk *scan.Token) (inst *scan.Term) {
|
||||
return &scan.Term{
|
||||
Tk: *tk,
|
||||
Children: make([]*scan.Term, 0, 2),
|
||||
Position: scan.PosInfix,
|
||||
Priority: scan.PriInsert,
|
||||
EvalFunc: evalAppend,
|
||||
}
|
||||
}
|
||||
|
||||
func evalPrepend(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
func evalPrepend(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
|
||||
var leftValue, rightValue any
|
||||
|
||||
if leftValue, rightValue, err = opTerm.evalInfix(ctx); err != nil {
|
||||
if leftValue, rightValue, err = opTerm.EvalInfix(ctx); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -41,19 +42,19 @@ func evalPrepend(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
list, _ := rightValue.(*kern.ListType)
|
||||
newList := append(kern.ListType{leftValue}, *list...)
|
||||
v = &newList
|
||||
if opTerm.children[1].symbol() == SymVariable {
|
||||
ctx.UnsafeSetVar(opTerm.children[1].Source(), v)
|
||||
if opTerm.Children[1].Symbol() == scan.SymVariable {
|
||||
ctx.UnsafeSetVar(opTerm.Children[1].Source(), v)
|
||||
}
|
||||
} else {
|
||||
err = opTerm.errIncompatibleTypes(leftValue, rightValue)
|
||||
err = opTerm.ErrIncompatibleTypes(leftValue, rightValue)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func evalAppend(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
func evalAppend(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
|
||||
var leftValue, rightValue any
|
||||
|
||||
if leftValue, rightValue, err = opTerm.evalInfix(ctx); err != nil {
|
||||
if leftValue, rightValue, err = opTerm.EvalInfix(ctx); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -61,11 +62,11 @@ func evalAppend(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
list, _ := leftValue.(*kern.ListType)
|
||||
newList := append(*list, rightValue)
|
||||
v = &newList
|
||||
if opTerm.children[0].symbol() == SymVariable {
|
||||
ctx.UnsafeSetVar(opTerm.children[0].Source(), v)
|
||||
if opTerm.Children[0].Symbol() == scan.SymVariable {
|
||||
ctx.UnsafeSetVar(opTerm.Children[0].Source(), v)
|
||||
}
|
||||
} else {
|
||||
err = opTerm.errIncompatibleTypes(leftValue, rightValue)
|
||||
err = opTerm.ErrIncompatibleTypes(leftValue, rightValue)
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -90,6 +91,6 @@ func evalAppend(ctx kern.ExprContext, opTerm *term) (v any, err error) {
|
||||
|
||||
// init
|
||||
func init() {
|
||||
registerTermConstructor(SymPlusGreater, newPrependTerm)
|
||||
registerTermConstructor(SymLessPlus, newAppendTerm)
|
||||
scan.RegisterTermConstructor(scan.SymPlusGreater, newPrependTerm)
|
||||
scan.RegisterTermConstructor(scan.SymLessPlus, newAppendTerm)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user