Elara6331/pcre
1
0
Fork 1
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Fix bug with FindAllSubmatch() and increase efficiency of slice conversions

Browse Source
This commit is contained in:
Elara 2022-05-20 03:09:55 -07:00
parent e03c680213
commit 2f821cec7c
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcre.go
View File

@ -158,9 +158,9 @@ func (r *Regexp) FindAll(b []byte, n int) [][]byte {
matches = matches[:n] matches = matches[:n]
} }
var out [][]byte out := make([][]byte, len(matches))
for _, match := range matches { for index, match := range matches {
out = append(out, b[match[0]:match[1]]) out[index] = b[match[0]:match[1]]
} }
return out return out
@ -181,9 +181,9 @@ func (r *Regexp) FindAllIndex(b []byte, n int) [][]int {
matches = matches[:n] matches = matches[:n]
} }
var out [][]int out := make([][]int, len(matches))
for _, match := range matches { for index, match := range matches {
out = append(out, []int{int(match[0]), int(match[1])}) out[index] = []int{int(match[0]), int(match[1])}
} }
return out return out
} }
@ -200,9 +200,9 @@ func (r *Regexp) FindSubmatch(b []byte) [][]byte {
} }
match := matches[0] match := matches[0]
out := make([][]byte, len(match)) out := make([][]byte, 0, len(match)/2)
for i := 0; i < len(match); i += 2 { for i := 0; i < len(match); i += 2 {
out[i] = b[match[i]:match[i+1]] out = append(out, b[match[i]:match[i+1]])
} }
return out return out
} }
@ -244,7 +244,7 @@ func (r *Regexp) FindAllSubmatch(b []byte, n int) [][][]byte {
out := make([][][]byte, len(matches)) out := make([][][]byte, len(matches))
for index, match := range matches { for index, match := range matches {
var outMatch [][]byte outMatch := make([][]byte, 0, len(match)/2)
for i := 0; i < len(match); i += 2 { for i := 0; i < len(match); i += 2 {
outMatch = append(outMatch, b[match[i]:match[i+1]]) outMatch = append(outMatch, b[match[i]:match[i+1]])
@ -298,6 +298,7 @@ func (r *Regexp) FindStringIndex(s string) []int {
// FinAllString is the String version of FindAll // FinAllString is the String version of FindAll
func (r *Regexp) FindAllString(s string, n int) []string { func (r *Regexp) FindAllString(s string, n int) []string {
matches := r.FindAll([]byte(s), n) matches := r.FindAll([]byte(s), n)
out := make([]string, len(matches)) out := make([]string, len(matches))
for index, match := range matches { for index, match := range matches {
out[index] = string(match) out[index] = string(match)