Fix lint warning, more clearly regexp rules.

mozillazg · Dec 4, 2019 · 2f301c2 · 2f301c2
1 parent b48c4a0
commit 2f301c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/paragraph.go b/paragraph.go
@@ -7,9 +7,9 @@ import (
 )
 
 var (
-	splacesRegexp    = regexp.MustCompile("[ ]+")
-	allowCharsRegexp = regexp.MustCompile("[a-zA-Z0-9\\.,\\?\\!;\\(\\)\\[\\]\\&\\=\\-_@ ]")
-	hansMarks        = map[string]string{
+	splacesRegexp    = regexp.MustCompile(`[\s]+`)
+	allowCharsRegexp = regexp.MustCompile(`[a-zA-Z0-9\.,\?\!;\(\)\[\]\&\=\-_@\s]`)
+	hansSymbols      = map[string]string{
 		"？": "?",
 		"！": "!",
 		"：": ":",
@@ -40,8 +40,8 @@ func ParagraphPinyin(p string) (s string) {
 			if allowCharsRegexp.MatchString(char) {
 				s += char
 			} else {
-				if hansMarks[char] != "" {
-					s += hansMarks[char]
+				if hansSymbols[char] != "" {
+					s += hansSymbols[char]
 				}
 			}
 		}

diff --git a/pinyin.go b/pinyin.go
@@ -94,8 +94,8 @@ var finalExceptionsMap = map[string]string{
 	"ǔ": "ǚ",
 	"ù": "ǜ",
 }
-var reFinalExceptions = regexp.MustCompile("^(j|q|x)(ū|ú|ǔ|ù)$")
-var reFinal2Exceptions = regexp.MustCompile("^(j|q|x)u(\\d?)$")
+var reFinalExceptions = regexp.MustCompile(`^(j|q|x)(ū|ú|ǔ|ù)$`)
+var reFinal2Exceptions = regexp.MustCompile(`^(j|q|x)u(\d?)$`)
 
 // NewArgs 返回包含默认配置的 `Args`
 func NewArgs() Args {