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

all: simplify and clarify some expressions (google/go-cloud#260)

Browse Source
This commit is contained in:
Oleg Kovalov
2018-08-06 23:49:11 +02:00
committed by Ross Light
parent 105b7fde1c
commit 0559d22dfe
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/wire/parse.go
View File

@@ -716,19 +716,17 @@ func processValue(fset *token.FileSet, info *types.Info, call *ast.CallExpr) (*V
} }
ok := true ok := true
ast.Inspect(call.Args[0], func(node ast.Node) bool { ast.Inspect(call.Args[0], func(node ast.Node) bool {
switch node.(type) { switch expr := node.(type) {
case nil, *ast.ArrayType, *ast.BasicLit, *ast.BinaryExpr, *ast.ChanType, *ast.CompositeLit, *ast.FuncType, *ast.Ident, *ast.IndexExpr, *ast.InterfaceType, *ast.KeyValueExpr, *ast.MapType, *ast.ParenExpr, *ast.SelectorExpr, *ast.SliceExpr, *ast.StarExpr, *ast.StructType, *ast.TypeAssertExpr: case nil, *ast.ArrayType, *ast.BasicLit, *ast.BinaryExpr, *ast.ChanType, *ast.CompositeLit, *ast.FuncType, *ast.Ident, *ast.IndexExpr, *ast.InterfaceType, *ast.KeyValueExpr, *ast.MapType, *ast.ParenExpr, *ast.SelectorExpr, *ast.SliceExpr, *ast.StarExpr, *ast.StructType, *ast.TypeAssertExpr:
// Good! // Good!
case *ast.UnaryExpr: case *ast.UnaryExpr:
expr := node.(*ast.UnaryExpr)
if expr.Op == token.ARROW { if expr.Op == token.ARROW {
ok = false ok = false
return false return false
} }
case *ast.CallExpr: case *ast.CallExpr:
// Only acceptable if it's a type conversion. // Only acceptable if it's a type conversion.
call := node.(*ast.CallExpr) if _, isFunc := info.TypeOf(expr.Fun).(*types.Signature); isFunc {
if _, isFunc := info.TypeOf(call.Fun).(*types.Signature); isFunc {
ok = false ok = false
return false return false
} }

13
internal/wire/wire.go
View File

@@ -366,7 +366,7 @@ func (g *gen) rewritePkgRefs(info *types.Info, node ast.Node) ast.Node {
if len(scopeStack) > 0 { if len(scopeStack) > 0 {
// Avoid picking a name that conflicts with other names in the // Avoid picking a name that conflicts with other names in the
// current scope. // current scope.
_, obj := scopeStack[len(scopeStack)-1].LookupParent(n, 0) _, obj := scopeStack[len(scopeStack)-1].LookupParent(n, token.NoPos)
if obj != nil { if obj != nil {
return true return true
} }
@@ -436,7 +436,7 @@ func (g *gen) nameInFileScope(name string) bool {
return true return true
} }
} }
_, obj := g.prog.Package(g.currPackage).Pkg.Scope().LookupParent(name, 0) _, obj := g.prog.Package(g.currPackage).Pkg.Scope().LookupParent(name, token.NoPos)
return obj != nil return obj != nil
} }
@@ -481,13 +481,14 @@ func injectPass(name string, params *types.Tuple, injectSig outputSignature, cal
ig.p("%s %s", ig.paramNames[i], types.TypeString(pi.Type(), ig.g.qualifyPkg)) ig.p("%s %s", ig.paramNames[i], types.TypeString(pi.Type(), ig.g.qualifyPkg))
} }
outTypeString := types.TypeString(injectSig.out, ig.g.qualifyPkg) outTypeString := types.TypeString(injectSig.out, ig.g.qualifyPkg)
if injectSig.cleanup && injectSig.err { switch {
case injectSig.cleanup && injectSig.err:
ig.p(") (%s, func(), error) {\n", outTypeString) ig.p(") (%s, func(), error) {\n", outTypeString)
} else if injectSig.cleanup { case injectSig.cleanup:
ig.p(") (%s, func()) {\n", outTypeString) ig.p(") (%s, func()) {\n", outTypeString)
} else if injectSig.err { case injectSig.err:
ig.p(") (%s, error) {\n", outTypeString) ig.p(") (%s, error) {\n", outTypeString)
} else { default:
ig.p(") %s {\n", outTypeString) ig.p(") %s {\n", outTypeString)
} }
for i := range calls { for i := range calls {

2
internal/wire/wire_test.go
View File

@@ -513,7 +513,7 @@ type dirInfo struct {
func (d dirInfo) Name() string { return d.name } func (d dirInfo) Name() string { return d.name }
func (d dirInfo) Size() int64 { return 0 } func (d dirInfo) Size() int64 { return 0 }
func (d dirInfo) Mode() os.FileMode { return os.ModeDir | 0777 } func (d dirInfo) Mode() os.FileMode { return os.ModeDir | os.ModePerm }
func (d dirInfo) ModTime() time.Time { return time.Unix(0, 0) } func (d dirInfo) ModTime() time.Time { return time.Unix(0, 0) }
func (d dirInfo) IsDir() bool { return true } func (d dirInfo) IsDir() bool { return true }
func (d dirInfo) Sys() interface{} { return nil } func (d dirInfo) Sys() interface{} { return nil }