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:
+8
-7
@@ -7,13 +7,14 @@ 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/fract"
|
||||
)
|
||||
|
||||
// -------- literal term
|
||||
func newLiteralTerm(tk *scan.Token) *scan.Term {
|
||||
|
||||
if tk.Sym == scan.SymFraction {
|
||||
if tk.Sym == sym.SymFraction {
|
||||
if v, isString := tk.Value.(string); isString {
|
||||
var err error
|
||||
if tk.Value, err = fract.MakeGeneratingFraction(v); err != nil {
|
||||
@@ -40,10 +41,10 @@ func evalLiteral(ctx kern.ExprContext, opTerm *scan.Term) (v any, err error) {
|
||||
|
||||
// init
|
||||
func init() {
|
||||
scan.RegisterTermConstructor(scan.SymString, newLiteralTerm)
|
||||
scan.RegisterTermConstructor(scan.SymInteger, newLiteralTerm)
|
||||
scan.RegisterTermConstructor(scan.SymFloat, newLiteralTerm)
|
||||
scan.RegisterTermConstructor(scan.SymFraction, newLiteralTerm)
|
||||
scan.RegisterTermConstructor(scan.SymBool, newLiteralTerm)
|
||||
scan.RegisterTermConstructor(scan.SymKwNil, newLiteralTerm)
|
||||
scan.RegisterTermConstructor(sym.SymString, newLiteralTerm)
|
||||
scan.RegisterTermConstructor(sym.SymInteger, newLiteralTerm)
|
||||
scan.RegisterTermConstructor(sym.SymFloat, newLiteralTerm)
|
||||
scan.RegisterTermConstructor(sym.SymFraction, newLiteralTerm)
|
||||
scan.RegisterTermConstructor(sym.SymBool, newLiteralTerm)
|
||||
scan.RegisterTermConstructor(sym.SymKwNil, newLiteralTerm)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user