From 685d3e21f3435f9f0ac9b7647fc31f32e49e4f63 Mon Sep 17 00:00:00 2001
From: Jonathan Thom <jonathan.thom1990@gmail.com>
Date: Wed, 20 Nov 2019 20:01:45 -0800
Subject: [PATCH] Makes regex constant & moves single quote replace logic to
 parseOneOfParam2

---
 baked_in.go | 10 +++++-----
 regexes.go  |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/baked_in.go b/baked_in.go
index 8fad9c2..ff4da23 100644
--- a/baked_in.go
+++ b/baked_in.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
 		}
 	}
diff --git a/regexes.go b/regexes.go
index 0253d70..fac2545 100644
--- a/regexes.go
+++ b/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)
 )