oec/goparsify
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only skip past hyphens that are truly part of ranges

Browse Source
This commit is contained in:
Ted Kornish 2018-03-01 11:40:29 -08:00
parent c43616cf3a
commit 268bdd51a1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
parser.go
View File

@ -169,7 +169,11 @@ func parseRepetition(defaultMin, defaultMax int, repetition ...int) (min int, ma
func parseMatcher(matcher string) (alphabet string, ranges [][]rune) { func parseMatcher(matcher string) (alphabet string, ranges [][]rune) {
runes := []rune(matcher) runes := []rune(matcher)
for i := 0; i < len(runes); i++ { i := 0
for {
if i >= len(runes) {
break
}
if i+2 < len(runes) && runes[i+1] == '-' && runes[i] != '\\' { if i+2 < len(runes) && runes[i+1] == '-' && runes[i] != '\\' {
start := runes[i] start := runes[i]
@ -179,14 +183,17 @@ func parseMatcher(matcher string) (alphabet string, ranges [][]rune) {
} else { } else {
ranges = append(ranges, []rune{end, start}) ranges = append(ranges, []rune{end, start})
} }
} else if i+1 < len(runes) && runes[i] == '\\' { i += 3 // we just consumed 3 bytes: range start, hyphen, and range end
alphabet += string(runes[i+1])
} else if runes[i] == '-' {
continue continue
}
if i+1 < len(runes) && runes[i] == '\\' {
alphabet += string(runes[i+1])
} else { } else {
alphabet += string(runes[i]) alphabet += string(runes[i])
} }
i++
} }
return alphabet, ranges return alphabet, ranges