Makes regex constant & moves single quote replace logic to parseOneOfParam2

pull/541/head
Jonathan Thom 5 years ago
parent 432c17028a
commit 685d3e21f3
No known key found for this signature in database
GPG Key ID: B6E703AC3AD25FFE
  1. 10
      baked_in.go
  2. 2
      regexes.go

@ -9,7 +9,6 @@ import (
"net/url"
"os"
"reflect"
"regexp"
"strconv"
"strings"
"sync"
@ -178,8 +177,10 @@ func parseOneOfParam2(s string) []string {
oneofValsCacheRWLock.RUnlock()
if !ok {
oneofValsCacheRWLock.Lock()
re := regexp.MustCompile(`'[^']*'|\S+`)
vals = re.FindAllString(s, -1)
vals = splitParamsRegex.FindAllString(s, -1)
for i := 0; i < len(vals); i++ {
vals[i] = strings.Replace(vals[i], "'", "", -1)
}
oneofValsCache[s] = vals
oneofValsCacheRWLock.Unlock()
}
@ -215,8 +216,7 @@ func isOneOf(fl FieldLevel) bool {
panic(fmt.Sprintf("Bad field type %T", field.Interface()))
}
for i := 0; i < len(vals); i++ {
val := strings.Replace(vals[i], "'", "", -1)
if val == v {
if vals[i] == v {
return true
}
}

@ -46,6 +46,7 @@ const (
uRLEncodedRegexString = `(%[A-Fa-f0-9]{2})`
hTMLEncodedRegexString = `&#[x]?([0-9a-fA-F]{2})|(&gt)|(&lt)|(&quot)|(&amp)+[;]?`
hTMLRegexString = `<[/]?([a-zA-Z]+).*?>`
splitParamsRegexString = `'[^']*'|\S+`
)
var (
@ -92,4 +93,5 @@ var (
uRLEncodedRegex = regexp.MustCompile(uRLEncodedRegexString)
hTMLEncodedRegex = regexp.MustCompile(hTMLEncodedRegexString)
hTMLRegex = regexp.MustCompile(hTMLRegexString)
splitParamsRegex = regexp.MustCompile(splitParamsRegexString)
)

Loading…
Cancel
Save