admin/wire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

internal/wire: replace keyword list with token api (#203)

Browse Source
This commit is contained in:
Ariel Mashraki
2019-07-16 19:00:00 +03:00
committed by shantuo
parent 2f518a0d93
commit 66f78fc846
1 changed files with 3 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
internal/wire/wire.go
View File

@@ -845,7 +845,7 @@ func typeVariableName(t types.Type, defaultName string, transform func(string) s
// See if there's an unambiguous name; if so, use it. // See if there's an unambiguous name; if so, use it.
for _, name := range names { for _, name := range names {
if !reservedKeyword[name] && !collides(name) { if !token.Lookup(name).IsKeyword() && !collides(name) {
return name return name
} }
} }
@@ -903,40 +903,10 @@ func export(name string) string {
return sbuf.String() return sbuf.String()
} }
// reservedKeyword is a set of Go's reserved keywords:
// https://golang.org/ref/spec#Keywords
var reservedKeyword = map[string]bool{
"break": true,
"case": true,
"chan": true,
"const": true,
"continue": true,
"default": true,
"defer": true,
"else": true,
"fallthrough": true,
"for": true,
"func": true,
"go": true,
"goto": true,
"if": true,
"import": true,
"interface": true,
"map": true,
"package": true,
"range": true,
"return": true,
"select": true,
"struct": true,
"switch": true,
"type": true,
"var": true,
}
// disambiguate picks a unique name, preferring name if it is already unique. // disambiguate picks a unique name, preferring name if it is already unique.
// It also disambiguates against Go's reserved keywords. // It also disambiguates against Go's reserved keywords.
func disambiguate(name string, collides func(string) bool) string { func disambiguate(name string, collides func(string) bool) string {
if !reservedKeyword[name] && !collides(name) { if !token.Lookup(name).IsKeyword() && !collides(name) {
return name return name
} }
buf := []byte(name) buf := []byte(name)
@@ -947,7 +917,7 @@ func disambiguate(name string, collides func(string) bool) string {
for n := 2; ; n++ { for n := 2; ; n++ {
buf = strconv.AppendInt(buf[:base], int64(n), 10) buf = strconv.AppendInt(buf[:base], int64(n), 10)
sbuf := string(buf) sbuf := string(buf)
if !reservedKeyword[sbuf] && !collides(sbuf) { if !token.Lookup(sbuf).IsKeyword() && !collides(sbuf) {
return sbuf return sbuf
} }
} }