go/ucan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: tidy regexps

Browse Source
This commit is contained in:
Alan Shaw
2024-08-20 22:34:25 +02:00
parent e7bbe02143
commit ce8008b650
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
selector/selector.go
View File

@@ -40,7 +40,13 @@ type Segment interface {
String() string String() string
} }
var Identity = Segment(segment{".", true, false, false, nil, "", 0}) var Identity = segment{".", true, false, false, nil, "", 0}
var (
indexRegex = regexp.MustCompile(`^-?\d+$`)
sliceRegex = regexp.MustCompile(`^((\-?\d+:\-?\d*)|(\-?\d*:\-?\d+))$`)
fieldRegex = regexp.MustCompile(`^\.[a-zA-Z_]*?$`)
)
type segment struct { type segment struct {
str string str string
@@ -105,7 +111,7 @@ func Parse(str string) (Selector, error) {
if strings.HasPrefix(seg, "[") && strings.HasSuffix(seg, "]") { if strings.HasPrefix(seg, "[") && strings.HasSuffix(seg, "]") {
lookup := seg[1 : len(seg)-1] lookup := seg[1 : len(seg)-1]
if regexp.MustCompile(`^-?\d+$`).MatchString(lookup) { // index if indexRegex.MatchString(lookup) { // index
idx, err := strconv.Atoi(lookup) idx, err := strconv.Atoi(lookup)
if err != nil { if err != nil {
return nil, NewParseError("invalid index", str, col, tok) return nil, NewParseError("invalid index", str, col, tok)
@@ -113,7 +119,7 @@ func Parse(str string) (Selector, error) {
sel = append(sel, segment{str: tok, optional: opt, index: idx}) sel = append(sel, segment{str: tok, optional: opt, index: idx})
} else if strings.HasPrefix(lookup, "\"") && strings.HasSuffix(lookup, "\"") { // explicit field } else if strings.HasPrefix(lookup, "\"") && strings.HasSuffix(lookup, "\"") { // explicit field
sel = append(sel, segment{str: tok, optional: opt, field: lookup[1 : len(lookup)-1]}) sel = append(sel, segment{str: tok, optional: opt, field: lookup[1 : len(lookup)-1]})
} else if regexp.MustCompile(`^((\-?\d+:\-?\d*)|(\-?\d*:\-?\d+))$`).MatchString(lookup) { // slice [3:5] or [:5] or [3:] } else if sliceRegex.MatchString(lookup) { // slice [3:5] or [:5] or [3:]
var rng []int var rng []int
splt := strings.Split(lookup, ":") splt := strings.Split(lookup, ":")
if splt[0] == "" { if splt[0] == "" {
@@ -136,7 +142,7 @@ func Parse(str string) (Selector, error) {
} else { } else {
return nil, NewParseError(fmt.Sprintf("invalid segment: %s", seg), str, col, tok) return nil, NewParseError(fmt.Sprintf("invalid segment: %s", seg), str, col, tok)
} }
} else if regexp.MustCompile(`^\.[a-zA-Z_]*?$`).MatchString(seg) { } else if fieldRegex.MatchString(seg) {
sel = append(sel, segment{str: tok, optional: opt, field: seg[1:]}) sel = append(sel, segment{str: tok, optional: opt, field: seg[1:]})
} else { } else {
return nil, NewParseError(fmt.Sprintf("invalid segment: %s", seg), str, col, tok) return nil, NewParseError(fmt.Sprintf("invalid segment: %s", seg), str, col, tok)