qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 18:14:43 -07:00
Code Releases Activity

cmd/vet: Fix handling of non-Stringer arguments.

Browse Source 
First, %v and %T accept any arguments, so they should never warn.
Second, pointer types were not handled in matchArgType.
Third, the default response for matchArgType should be false.

R=r
CC=adonovan, golang-dev
https://golang.org/cl/12038050
This commit is contained in:
David Symonds 2013-07-30 13:15:31 +10:00
parent 0ba53b54bd
commit 573374c476
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/vet/testdata/print.go vendored
View File

@ -80,6 +80,8 @@ func PrintfTests() {
fmt.Printf("%.*s %d %g", 3, "hi", 23, 2.3) fmt.Printf("%.*s %d %g", 3, "hi", 23, 2.3)
fmt.Printf("%s", &stringerv) fmt.Printf("%s", &stringerv)
fmt.Printf("%T", &stringerv) fmt.Printf("%T", &stringerv)
fmt.Printf("%v", notstringerv)
fmt.Printf("%T", notstringerv)
fmt.Printf("%*%", 2) // Ridiculous but allowed. fmt.Printf("%*%", 2) // Ridiculous but allowed.
fmt.Printf("%g", 1+2i) fmt.Printf("%g", 1+2i)
@ -107,6 +109,8 @@ func PrintfTests() {
fmt.Printf("%X", 2.3) // ERROR "arg 2.3 for printf verb %X of wrong type" fmt.Printf("%X", 2.3) // ERROR "arg 2.3 for printf verb %X of wrong type"
fmt.Printf("%s", stringerv) // ERROR "arg stringerv for printf verb %s of wrong type" fmt.Printf("%s", stringerv) // ERROR "arg stringerv for printf verb %s of wrong type"
fmt.Printf("%t", stringerv) // ERROR "arg stringerv for printf verb %t of wrong type" fmt.Printf("%t", stringerv) // ERROR "arg stringerv for printf verb %t of wrong type"
fmt.Printf("%q", notstringerv) // ERROR "arg notstringerv for printf verb %q of wrong type"
fmt.Printf("%t", notstringerv) // ERROR "arg notstringerv for printf verb %t of wrong type"
fmt.Printf("%.*s %d %g", 3, "hi", 23, 'x') // ERROR "arg 'x' for printf verb %g of wrong type" fmt.Printf("%.*s %d %g", 3, "hi", 23, 'x') // ERROR "arg 'x' for printf verb %g of wrong type"
fmt.Println() // not an error fmt.Println() // not an error
fmt.Println("%s", "hi") // ERROR "possible formatting directive in Println call" fmt.Println("%s", "hi") // ERROR "possible formatting directive in Println call"
@ -198,3 +202,7 @@ func (*stringer) Warn(int, ...interface{}) string {
func (*stringer) Warnf(int, string, ...interface{}) string { func (*stringer) Warnf(int, string, ...interface{}) string {
return "warnf" return "warnf"
} }
type notstringer struct{}
var notstringerv notstringer

10
cmd/vet/types.go
View File

@ -75,6 +75,10 @@ var (
// may be printed with %d etc. if that is appropriate for their element // may be printed with %d etc. if that is appropriate for their element
// types.) // types.)
func (f *File) matchArgType(t printfArgType, typ types.Type, arg ast.Expr) bool { func (f *File) matchArgType(t printfArgType, typ types.Type, arg ast.Expr) bool {
// %v, %T accept any argument type.
if t == anyType {
return true
}
if typ == nil { if typ == nil {
// external call // external call
typ = f.pkg.types[arg] typ = f.pkg.types[arg]
@ -108,6 +112,9 @@ func (f *File) matchArgType(t printfArgType, typ types.Type, arg ast.Expr) bool
// Recurse: []int matches %d. // Recurse: []int matches %d.
return t&argPointer != 0 || f.matchArgType(t, typ.Elem(), arg) return t&argPointer != 0 || f.matchArgType(t, typ.Elem(), arg)
case *types.Pointer:
return t&argPointer != 0
case *types.Basic: case *types.Basic:
switch typ.Kind() { switch typ.Kind() {
case types.UntypedBool, case types.UntypedBool,
@ -158,9 +165,6 @@ func (f *File) matchArgType(t printfArgType, typ types.Type, arg ast.Expr) bool
return true // Probably a type check problem. return true // Probably a type check problem.
} }
panic("unreachable") panic("unreachable")
default:
return true
} }
return false return false