several changes:
1. moved scan/symbol.go to new package sym and adapted all files that reference Symbol type and its values. 2. new type interval defined by begin, end and step values. 3. replaced operator-range.go with operator-interval.go. 4. replaced range operator begin:end with begin..end..step. 5. new implementation of sub-collection extraction based on new interval literal.
This commit is contained in:
@@ -7,6 +7,7 @@ package expr
|
||||
import (
|
||||
"git.portale-stac.it/go-pkg/expr/kern"
|
||||
"git.portale-stac.it/go-pkg/expr/scan"
|
||||
"git.portale-stac.it/go-pkg/expr/sym"
|
||||
"git.portale-stac.it/go-pkg/expr/types"
|
||||
)
|
||||
|
||||
@@ -28,7 +29,7 @@ func evalPreInc(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
|
||||
return
|
||||
}
|
||||
|
||||
if types.IsInteger(childValue) && opTerm.Children[0].Symbol() == scan.SymVariable {
|
||||
if types.IsInteger(childValue) && opTerm.Children[0].Symbol() == sym.SymVariable {
|
||||
i := childValue.(int64) + 1
|
||||
ctx.SetVar(opTerm.Children[0].Source(), i)
|
||||
v = i
|
||||
@@ -57,7 +58,7 @@ func evalPreDec(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
|
||||
return
|
||||
}
|
||||
|
||||
if types.IsInteger(childValue) && opTerm.Children[0].Symbol() == scan.SymVariable {
|
||||
if types.IsInteger(childValue) && opTerm.Children[0].Symbol() == sym.SymVariable {
|
||||
i := childValue.(int64) - 1
|
||||
ctx.SetVar(opTerm.Children[0].Source(), i)
|
||||
v = i
|
||||
@@ -69,6 +70,6 @@ func evalPreDec(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
|
||||
|
||||
// init
|
||||
func init() {
|
||||
scan.RegisterTermConstructor(scan.SymPreInc, newPreIncTerm)
|
||||
scan.RegisterTermConstructor(scan.SymPreDec, newPreDecTerm)
|
||||
scan.RegisterTermConstructor(sym.SymPreInc, newPreIncTerm)
|
||||
scan.RegisterTermConstructor(sym.SymPreDec, newPreDecTerm)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user