roypur/envconf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove regex lookaround

Browse Source
This commit is contained in:
Roy Olav Purser 2022-01-15 19:57:38 +01:00
parent 0f1586393b
commit 09acd79fe8
Signed by: roypur
GPG Key ID: E14D26A036F21656
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
envconf.go
View File

@ -259,7 +259,7 @@ func (c *Config) Status() (ok bool) {
} }
func cleanKey(key string) string { func cleanKey(key string) string {
expr := regexp.MustCompile("(?:^_+)|(?:_+(?=_))|(?:_$)") expr := regexp.MustCompile("__+")
fn := func(r rune) rune { fn := func(r rune) rune {
if (r >= '0' && r <= '9') || (r >= 'A' && r <= 'Z') || r == '_' { if (r >= '0' && r <= '9') || (r >= 'A' && r <= 'Z') || r == '_' {
return r return r
@ -267,8 +267,8 @@ func cleanKey(key string) string {
return -1 return -1
} }
key = strings.Map(fn, strings.ToUpper(key)) key = strings.Trim(strings.Map(fn, strings.ToUpper(key)), "_")
return expr.ReplaceAllString(key, "") return expr.ReplaceAllString(key, "_")
} }
func keySplit(key string) (left string, right string, ok bool) { func keySplit(key string) (left string, right string, ok bool) {