Makes regex constant & moves single quote replace logic to parseOneOf…

…Param2

baked_in.go

@@ -9,7 +9,6 @@ import (
 	"net/url"
 	"os"
 	"reflect"
-	"regexp"
 	"strconv"
 	"strings"
 	"sync"
@@ -178,8 +177,11 @@ 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++ {
+			val := strings.Replace(vals[i], "'", "", -1)
+			vals[i] = val
+		}
 		oneofValsCache[s] = vals
 		oneofValsCacheRWLock.Unlock()
 	}
@@ -200,7 +202,6 @@ func isHTML(fl FieldLevel) bool {
 
 func isOneOf(fl FieldLevel) bool {
 	vals := parseOneOfParam2(fl.Param())
-
 	field := fl.Field()
 
 	var v string
@@ -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
 		}
 	}

regexes.go

@@ -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)
 )