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:
+132
-130
@@ -1,14 +1,16 @@
|
||||
// Copyright (c) 2024-2026 Celestino Amoroso (celestino.amoroso@gmail.com).
|
||||
// All rights reserved.
|
||||
|
||||
// Symbol.go
|
||||
// symbol-map.go
|
||||
package scan
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"git.portale-stac.it/go-pkg/expr/sym"
|
||||
)
|
||||
|
||||
var symbolMap map[Symbol]symbolSpec
|
||||
var symbolMap map[sym.Symbol]symbolSpec
|
||||
|
||||
type SymbolClass int16
|
||||
|
||||
@@ -31,139 +33,139 @@ type symbolSpec struct {
|
||||
|
||||
func init() {
|
||||
|
||||
symbolMap = map[Symbol]symbolSpec{
|
||||
SymUnknown: {"<unknown>", SymClassOther, PosLeaf}, // -1: Unknown symbol
|
||||
SymNone: {"<null>", SymClassOther, PosLeaf}, // 0: Null value for variable of type symbol
|
||||
SymError: {"<error>", SymClassOther, PosLeaf}, // 1: Error reading from stream
|
||||
SymEos: {"<eos>", SymClassOther, PosLeaf}, // 2: End of stream
|
||||
SymMinus: {"-", SymClassOperator, PosInfix}, // 3: '-'
|
||||
SymMinusEqual: {"-=", SymClassOperator, PosInfix}, // 4: '-='
|
||||
SymDoubleMinus: {"--", SymClassOperator, PosPostfix}, // 5: '--'
|
||||
SymPlus: {"+", SymClassOperator, PosInfix}, // 6: '+'
|
||||
SymPlusEqual: {"+=", SymClassOperator, PosInfix}, // 7: '+='
|
||||
SymDoublePlus: {"++", SymClassOperator, PosPostfix}, // 8: '++'
|
||||
SymStar: {"*", SymClassOperator, PosInfix}, // 9: '*'
|
||||
SymDoubleStar: {"**", SymClassOperator, PosInfix}, // 10: '**'
|
||||
SymSlash: {"/", SymClassOperator, PosInfix}, // 11: '/'
|
||||
SymBackSlash: {"\\", SymClassOperator, PosLeaf}, // 12: '\'
|
||||
SymVertBar: {"|", SymClassOperator, PosInfix}, // 13: '|'
|
||||
SymDoubleVertBar: {"||", SymClassOperator, PosInfix}, // 14: '||'
|
||||
SymComma: {",", SymClassOperator, PosInfix}, // 15: ','
|
||||
SymColon: {":", SymClassOperator, PosInfix}, // 16: ':'
|
||||
SymSemiColon: {";", SymClassOperator, PosInfix}, // 17: ';'
|
||||
SymDot: {".", SymClassOperator, PosInfix}, // 18: '.'
|
||||
SymDotSlash: {"./", SymClassOperator, PosInfix}, // 19: './'
|
||||
SymQuote: {"'", SymClassDelimiter, PosLeaf}, // 20: '\''
|
||||
SymDoubleQuote: {"\"", SymClassDelimiter, PosLeaf}, // 21: '"'
|
||||
SymBackTick: {"`", SymClassDelimiter, PosLeaf}, // 22: '`'
|
||||
SymExclamation: {"!", SymClassOperator, PosPostfix}, // 23: '!'
|
||||
SymQuestion: {"?", SymClassOperator, PosInfix}, // 24: '?'
|
||||
SymAmpersand: {"&", SymClassOperator, PosInfix}, // 25: '&'
|
||||
SymDoubleAmpersand: {"&&", SymClassOperator, PosInfix}, // 26: '&&'
|
||||
SymPercent: {"%", SymClassOperator, PosInfix}, // 27: '%'
|
||||
SymAt: {"@", SymClassOperator, PosPrefix}, // 28: '@'
|
||||
SymUndescore: {"_", SymClassIdentifier, PosLeaf}, // 29: '_'
|
||||
SymEqual: {"=", SymClassOperator, PosInfix}, // 30: '='
|
||||
SymColonEqual: {":=", SymClassOperator, PosInfix}, // 31: ':='
|
||||
SymDoubleEqual: {"==", SymClassOperator, PosInfix}, // 32: '=='
|
||||
SymLess: {"<", SymClassOperator, PosInfix}, // 33: '<'
|
||||
SymLessOrEqual: {"<=", SymClassOperator, PosInfix}, // 34: '<='
|
||||
SymGreater: {">", SymClassOperator, PosInfix}, // 35: '>'
|
||||
SymGreaterOrEqual: {">=", SymClassOperator, PosInfix}, // 36: '>='
|
||||
SymLessGreater: {"<>", SymClassOperator, PosInfix}, // 37: '<>'
|
||||
SymNotEqual: {"!=", SymClassOperator, PosInfix}, // 38: '!='
|
||||
SymDollar: {"$", SymClassOperator, PosPrefix}, // 39: '$'
|
||||
SymHash: {"#", SymClassOperator, PosPrefix}, // 40: '#'
|
||||
SymOpenRound: {"(", SymClassParenthesis, PosPrefix}, // 41: '('
|
||||
SymClosedRound: {")", SymClassParenthesis, PosPostfix}, // 42: ')'
|
||||
SymOpenSquare: {"[", SymClassParenthesis, PosPrefix}, // 43: '['
|
||||
SymClosedSquare: {"]", SymClassParenthesis, PosPostfix}, // 44: ']'
|
||||
SymOpenBrace: {"{", SymClassParenthesis, PosPrefix}, // 45: '{'
|
||||
SymClosedBrace: {"}", SymClassParenthesis, PosPostfix}, // 46: '}'
|
||||
SymTilde: {"~", SymClassOperator, PosPrefix}, // 47: '~'
|
||||
SymDoubleQuestion: {"??", SymClassOperator, PosInfix}, // 48: '??'
|
||||
SymQuestionEqual: {"?=", SymClassOperator, PosInfix}, // 49: '?='
|
||||
SymQuestionExclam: {"?!", SymClassOperator, PosInfix}, // 50: '?!'
|
||||
SymDoubleAt: {"@@", SymClassCommand, PosLeaf}, // 51: '@@'
|
||||
SymDoubleColon: {"::", SymClassOperator, PosInfix}, // 52: '::'
|
||||
SymDoubleGreater: {">>", SymClassOperator, PosInfix}, // 53: '>>'
|
||||
SymDoubleLess: {"<<", SymClassOperator, PosInfix}, // 54: '<<'
|
||||
SymCaret: {"^", SymClassOperator, PosInfix}, // 55: '^'
|
||||
SymDollarRound: {"$(", SymClassOperator, PosPrefix}, // 56: '$('
|
||||
SymOpenClosedRound: {"()", SymClassOperator, PosPostfix}, // 57: '()'
|
||||
SymDoubleDollar: {"$$", SymClassCommand, PosLeaf}, // 58: '$$'
|
||||
SymDoubleDot: {"..", SymClassOperator, PosInfix}, // 59: '..'
|
||||
SymTripleDot: {"...", SymClassOperator, PosPostfix}, // 60: '...'
|
||||
SymStarEqual: {"*=", SymClassOperator, PosInfix}, // 61: '*='
|
||||
SymSlashEqual: {"/=", SymClassOperator, PosInfix}, // 62: '/='
|
||||
SymPercEqual: {"%=", SymClassOperator, PosInfix}, // 63: '%='
|
||||
SymDoubleLessEqual: {"<<=", SymClassOperator, PosInfix}, // 64: '<<='
|
||||
SymDoubleGreaterEqual: {">>=", SymClassOperator, PosInfix}, // 65: '>>='
|
||||
SymAmpersandEqual: {"&=", SymClassOperator, PosInfix}, // 66: '&='
|
||||
SymVertBarEqual: {"|=", SymClassOperator, PosInfix}, // 67: '|='
|
||||
SymCaretEqual: {"^=", SymClassOperator, PosInfix}, // 68: '^='
|
||||
SymPlusGreater: {"+>", SymClassOperator, PosInfix}, // 69: '+>'
|
||||
SymLessPlus: {"<+", SymClassOperator, PosInfix}, // 70: '<+'
|
||||
SymPreInc: {"++", SymClassOperator, PosPrefix}, // 71: '++'
|
||||
SymPreDec: {"--", SymClassOperator, PosPrefix}, // 72: '--'
|
||||
SymOpenSquareLess: {"[<", SymClassOperator, PosPrefix}, // 97: '[<'
|
||||
SymGreaterClosedSquare: {">]", SymClassOperator, PosPostfix}, // 98: '>]'
|
||||
// SymChangeSign
|
||||
// SymUnchangeSign
|
||||
// SymIdentifier
|
||||
// SymBool
|
||||
// SymInteger
|
||||
// SymVariable
|
||||
// SymFloat
|
||||
// SymFraction
|
||||
// SymString
|
||||
// SymIterator
|
||||
// SymOr: "or",
|
||||
// SymAnd: "and",
|
||||
// SymNot: "not",
|
||||
// SymComment
|
||||
// SymFuncCall
|
||||
// SymFuncDef
|
||||
// SymList
|
||||
// SymLinkedList
|
||||
// SymDict
|
||||
// SymIndex
|
||||
// SymExpression
|
||||
// SymSelector // <selector> ::= <expr> "?" <selector-case> {":" <selector-case>} ["::" <default-selector-case>]
|
||||
// SymSelectorCase // <selector-case> ::= [<list>] "{" <multi-expr> "}"
|
||||
// // SymOpenComment // 0: '/*'
|
||||
// // SymClosedComment // 0: '*/'
|
||||
// // SymOneLineComment // 0: '//'
|
||||
symbolMap = map[sym.Symbol]symbolSpec{
|
||||
sym.SymUnknown: {"<unknown>", SymClassOther, PosLeaf}, // -1: Unknown symbol
|
||||
sym.SymNone: {"<null>", SymClassOther, PosLeaf}, // 0: Null value for variable of type symbol
|
||||
sym.SymError: {"<error>", SymClassOther, PosLeaf}, // 1: Error reading from stream
|
||||
sym.SymEos: {"<eos>", SymClassOther, PosLeaf}, // 2: End of stream
|
||||
sym.SymMinus: {"-", SymClassOperator, PosInfix}, // 3: '-'
|
||||
sym.SymMinusEqual: {"-=", SymClassOperator, PosInfix}, // 4: '-='
|
||||
sym.SymDoubleMinus: {"--", SymClassOperator, PosPostfix}, // 5: '--'
|
||||
sym.SymPlus: {"+", SymClassOperator, PosInfix}, // 6: '+'
|
||||
sym.SymPlusEqual: {"+=", SymClassOperator, PosInfix}, // 7: '+='
|
||||
sym.SymDoublePlus: {"++", SymClassOperator, PosPostfix}, // 8: '++'
|
||||
sym.SymStar: {"*", SymClassOperator, PosInfix}, // 9: '*'
|
||||
sym.SymDoubleStar: {"**", SymClassOperator, PosInfix}, // 10: '**'
|
||||
sym.SymSlash: {"/", SymClassOperator, PosInfix}, // 11: '/'
|
||||
sym.SymBackSlash: {"\\", SymClassOperator, PosLeaf}, // 12: '\'
|
||||
sym.SymVertBar: {"|", SymClassOperator, PosInfix}, // 13: '|'
|
||||
sym.SymDoubleVertBar: {"||", SymClassOperator, PosInfix}, // 14: '||'
|
||||
sym.SymComma: {",", SymClassOperator, PosInfix}, // 15: ','
|
||||
sym.SymColon: {":", SymClassOperator, PosInfix}, // 16: ':'
|
||||
sym.SymSemiColon: {";", SymClassOperator, PosInfix}, // 17: ';'
|
||||
sym.SymDot: {".", SymClassOperator, PosInfix}, // 18: '.'
|
||||
sym.SymDotSlash: {"./", SymClassOperator, PosInfix}, // 19: './'
|
||||
sym.SymQuote: {"'", SymClassDelimiter, PosLeaf}, // 20: '\''
|
||||
sym.SymDoubleQuote: {"\"", SymClassDelimiter, PosLeaf}, // 21: '"'
|
||||
sym.SymBackTick: {"`", SymClassDelimiter, PosLeaf}, // 22: '`'
|
||||
sym.SymExclamation: {"!", SymClassOperator, PosPostfix}, // 23: '!'
|
||||
sym.SymQuestion: {"?", SymClassOperator, PosInfix}, // 24: '?'
|
||||
sym.SymAmpersand: {"&", SymClassOperator, PosInfix}, // 25: '&'
|
||||
sym.SymDoubleAmpersand: {"&&", SymClassOperator, PosInfix}, // 26: '&&'
|
||||
sym.SymPercent: {"%", SymClassOperator, PosInfix}, // 27: '%'
|
||||
sym.SymAt: {"@", SymClassOperator, PosPrefix}, // 28: '@'
|
||||
sym.SymUndescore: {"_", SymClassIdentifier, PosLeaf}, // 29: '_'
|
||||
sym.SymEqual: {"=", SymClassOperator, PosInfix}, // 30: '='
|
||||
sym.SymColonEqual: {":=", SymClassOperator, PosInfix}, // 31: ':='
|
||||
sym.SymDoubleEqual: {"==", SymClassOperator, PosInfix}, // 32: '=='
|
||||
sym.SymLess: {"<", SymClassOperator, PosInfix}, // 33: '<'
|
||||
sym.SymLessOrEqual: {"<=", SymClassOperator, PosInfix}, // 34: '<='
|
||||
sym.SymGreater: {">", SymClassOperator, PosInfix}, // 35: '>'
|
||||
sym.SymGreaterOrEqual: {">=", SymClassOperator, PosInfix}, // 36: '>='
|
||||
sym.SymLessGreater: {"<>", SymClassOperator, PosInfix}, // 37: '<>'
|
||||
sym.SymNotEqual: {"!=", SymClassOperator, PosInfix}, // 38: '!='
|
||||
sym.SymDollar: {"$", SymClassOperator, PosPrefix}, // 39: '$'
|
||||
sym.SymHash: {"#", SymClassOperator, PosPrefix}, // 40: '#'
|
||||
sym.SymOpenRound: {"(", SymClassParenthesis, PosPrefix}, // 41: '('
|
||||
sym.SymClosedRound: {")", SymClassParenthesis, PosPostfix}, // 42: ')'
|
||||
sym.SymOpenSquare: {"[", SymClassParenthesis, PosPrefix}, // 43: '['
|
||||
sym.SymClosedSquare: {"]", SymClassParenthesis, PosPostfix}, // 44: ']'
|
||||
sym.SymOpenBrace: {"{", SymClassParenthesis, PosPrefix}, // 45: '{'
|
||||
sym.SymClosedBrace: {"}", SymClassParenthesis, PosPostfix}, // 46: '}'
|
||||
sym.SymTilde: {"~", SymClassOperator, PosPrefix}, // 47: '~'
|
||||
sym.SymDoubleQuestion: {"??", SymClassOperator, PosInfix}, // 48: '??'
|
||||
sym.SymQuestionEqual: {"?=", SymClassOperator, PosInfix}, // 49: '?='
|
||||
sym.SymQuestionExclam: {"?!", SymClassOperator, PosInfix}, // 50: '?!'
|
||||
sym.SymDoubleAt: {"@@", SymClassCommand, PosLeaf}, // 51: '@@'
|
||||
sym.SymDoubleColon: {"::", SymClassOperator, PosInfix}, // 52: '::'
|
||||
sym.SymDoubleGreater: {">>", SymClassOperator, PosInfix}, // 53: '>>'
|
||||
sym.SymDoubleLess: {"<<", SymClassOperator, PosInfix}, // 54: '<<'
|
||||
sym.SymCaret: {"^", SymClassOperator, PosInfix}, // 55: '^'
|
||||
sym.SymDollarRound: {"$(", SymClassOperator, PosPrefix}, // 56: '$('
|
||||
sym.SymOpenClosedRound: {"()", SymClassOperator, PosPostfix}, // 57: '()'
|
||||
sym.SymDoubleDollar: {"$$", SymClassCommand, PosLeaf}, // 58: '$$'
|
||||
sym.SymDoubleDot: {"..", SymClassOperator, PosInfix}, // 59: '..'
|
||||
sym.SymTripleDot: {"...", SymClassOperator, PosPostfix}, // 60: '...'
|
||||
sym.SymStarEqual: {"*=", SymClassOperator, PosInfix}, // 61: '*='
|
||||
sym.SymSlashEqual: {"/=", SymClassOperator, PosInfix}, // 62: '/='
|
||||
sym.SymPercEqual: {"%=", SymClassOperator, PosInfix}, // 63: '%='
|
||||
sym.SymDoubleLessEqual: {"<<=", SymClassOperator, PosInfix}, // 64: '<<='
|
||||
sym.SymDoubleGreaterEqual: {">>=", SymClassOperator, PosInfix}, // 65: '>>='
|
||||
sym.SymAmpersandEqual: {"&=", SymClassOperator, PosInfix}, // 66: '&='
|
||||
sym.SymVertBarEqual: {"|=", SymClassOperator, PosInfix}, // 67: '|='
|
||||
sym.SymCaretEqual: {"^=", SymClassOperator, PosInfix}, // 68: '^='
|
||||
sym.SymPlusGreater: {"+>", SymClassOperator, PosInfix}, // 69: '+>'
|
||||
sym.SymLessPlus: {"<+", SymClassOperator, PosInfix}, // 70: '<+'
|
||||
sym.SymPreInc: {"++", SymClassOperator, PosPrefix}, // 71: '++'
|
||||
sym.SymPreDec: {"--", SymClassOperator, PosPrefix}, // 72: '--'
|
||||
sym.SymOpenSquareLess: {"[<", SymClassOperator, PosPrefix}, // 97: '[<'
|
||||
sym.SymGreaterClosedSquare: {">]", SymClassOperator, PosPostfix}, // 98: '>]'
|
||||
// sym.SymChangeSign
|
||||
// sym.SymUnchangeSign
|
||||
// sym.SymIdentifier
|
||||
// sym.SymBool
|
||||
// sym.SymInteger
|
||||
// sym.SymVariable
|
||||
// sym.SymFloat
|
||||
// sym.SymFraction
|
||||
// sym.SymString
|
||||
// sym.SymIterator
|
||||
// sym.SymOr: "or",
|
||||
// sym.SymAnd: "and",
|
||||
// sym.SymNot: "not",
|
||||
// sym.SymComment
|
||||
// sym.SymFuncCall
|
||||
// sym.SymFuncDef
|
||||
// sym.SymList
|
||||
// sym.SymLinkedList
|
||||
// sym.SymDict
|
||||
// sym.SymIndex
|
||||
// sym.SymExpression
|
||||
// sym.SymSelector // <selector> ::= <expr> "?" <selector-case> {":" <selector-case>} ["::" <default-selector-case>]
|
||||
// sym.SymSelectorCase // <selector-case> ::= [<list>] "{" <multi-expr> "}"
|
||||
// // sym.SymOpenComment // 0: '/*'
|
||||
// // sym.SymClosedComment // 0: '*/'
|
||||
// // sym.SymOneLineComment // 0: '//'
|
||||
// keywordBase
|
||||
SymKwAnd: {"and", SymClassOperator, PosInfix},
|
||||
SymKwNot: {"not", SymClassOperator, PosInfix},
|
||||
SymKwOr: {"or", SymClassOperator, PosInfix},
|
||||
SymKwBut: {"but", SymClassOperator, PosInfix},
|
||||
SymKwMap: {"map", SymClassOperator, PosInfix},
|
||||
SymKwFilter: {"filter", SymClassOperator, PosInfix},
|
||||
SymKwDigest: {"digest", SymClassOperator, PosInfix},
|
||||
SymKwCat: {"cat", SymClassOperator, PosInfix},
|
||||
SymKwJoin: {"join", SymClassOperator, PosInfix},
|
||||
SymKwGroupBy: {"groupby", SymClassOperator, PosInfix},
|
||||
SymKwFunc: {"func(", SymClassDeclaration, PosPrefix},
|
||||
SymKwBuiltin: {"builtin", SymClassOperator, PosPrefix},
|
||||
SymKwPlugin: {"plugin", SymClassOperator, PosPrefix},
|
||||
SymKwIn: {"in", SymClassOperator, PosInfix},
|
||||
SymKwAt: {"at", SymClassOperator, PosInfix},
|
||||
SymKwInclude: {"include", SymClassOperator, PosPrefix},
|
||||
SymKwNil: {"nil", SymClassValue, PosLeaf},
|
||||
SymKwUnset: {"unset", SymClassOperator, PosPrefix},
|
||||
sym.SymKwAnd: {"and", SymClassOperator, PosInfix},
|
||||
sym.SymKwNot: {"not", SymClassOperator, PosInfix},
|
||||
sym.SymKwOr: {"or", SymClassOperator, PosInfix},
|
||||
sym.SymKwBut: {"but", SymClassOperator, PosInfix},
|
||||
sym.SymKwMap: {"map", SymClassOperator, PosInfix},
|
||||
sym.SymKwFilter: {"filter", SymClassOperator, PosInfix},
|
||||
sym.SymKwDigest: {"digest", SymClassOperator, PosInfix},
|
||||
sym.SymKwCat: {"cat", SymClassOperator, PosInfix},
|
||||
sym.SymKwJoin: {"join", SymClassOperator, PosInfix},
|
||||
sym.SymKwGroupBy: {"groupby", SymClassOperator, PosInfix},
|
||||
sym.SymKwFunc: {"func(", SymClassDeclaration, PosPrefix},
|
||||
sym.SymKwBuiltin: {"builtin", SymClassOperator, PosPrefix},
|
||||
sym.SymKwPlugin: {"plugin", SymClassOperator, PosPrefix},
|
||||
sym.SymKwIn: {"in", SymClassOperator, PosInfix},
|
||||
sym.SymKwAt: {"at", SymClassOperator, PosInfix},
|
||||
sym.SymKwInclude: {"include", SymClassOperator, PosPrefix},
|
||||
sym.SymKwNil: {"nil", SymClassValue, PosLeaf},
|
||||
sym.SymKwUnset: {"unset", SymClassOperator, PosPrefix},
|
||||
}
|
||||
}
|
||||
|
||||
func SymToString(sym Symbol) string {
|
||||
func SymToString(sym sym.Symbol) string {
|
||||
if s, ok := symbolMap[sym]; ok {
|
||||
return s.repr
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func SymListToString(symList []Symbol, quote bool) string {
|
||||
func SymListToString(symList []sym.Symbol, quote bool) string {
|
||||
var sb strings.Builder
|
||||
if len(symList) == 0 {
|
||||
sb.WriteString("<nothing>")
|
||||
@@ -186,13 +188,13 @@ func SymListToString(symList []Symbol, quote bool) string {
|
||||
}
|
||||
|
||||
func StringEndsWithOperator(s string) bool {
|
||||
return endingOperator(s) != SymNone
|
||||
return endingOperator(s) != sym.SymNone
|
||||
}
|
||||
|
||||
func endingOperator(s string) (sym Symbol) {
|
||||
func endingOperator(s string) (resultSym sym.Symbol) {
|
||||
var matchLength = 0
|
||||
var repr string
|
||||
sym = SymNone
|
||||
resultSym = sym.SymNone
|
||||
lower := strings.TrimRight(strings.ToLower(s), " \t")
|
||||
for symbol, spec := range symbolMap {
|
||||
if len(spec.repr) > matchLength || repr == spec.repr {
|
||||
@@ -200,9 +202,9 @@ func endingOperator(s string) (sym Symbol) {
|
||||
if isNotEndingSymbol(spec) && repr != spec.repr {
|
||||
repr = spec.repr
|
||||
matchLength = len(spec.repr)
|
||||
sym = symbol
|
||||
resultSym = symbol
|
||||
} else {
|
||||
sym = SymNone
|
||||
resultSym = sym.SymNone
|
||||
break
|
||||
// matchLength = 0
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user