Merge pull request dop251#143 from MStoykov/fix/142

Use strings.Trim instead of regex to trim unicodeString
lebronyang1 · Apr 9, 2020 · 0cd29d8 · 0cd29d8
2 parents 2de61b1 + 7bb4acf
commit 0cd29d8
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/string_unicode.go b/string_unicode.go
@@ -9,7 +9,6 @@ import (
 	"io"
 	"math"
 	"reflect"
-	"regexp"
 	"strings"
 	"unicode/utf16"
 	"unicode/utf8"
@@ -30,10 +29,6 @@ var (
 	InvalidRuneError = errors.New("Invalid rune")
 )
 
-var (
-	unicodeTrimRegexp = regexp.MustCompile("^[" + parser.WhitespaceChars + "]*(.*?)[" + parser.WhitespaceChars + "]*$")
-)
-
 func (rr runeReaderReplace) ReadRune() (r rune, size int, err error) {
 	r, size, err = rr.wrapped.ReadRune()
 	if err == InvalidRuneError {
@@ -96,7 +91,7 @@ func (s unicodeString) toTrimmedUTF8() string {
 	if len(s) == 0 {
 		return ""
 	}
-	return unicodeTrimRegexp.FindStringSubmatch(s.String())[1]
+	return strings.Trim(s.String(), parser.WhitespaceChars)
 }
 
 func (s unicodeString) ToNumber() Value {