Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix printing of named floating point types.

Browse source 
Try to avoid infinite recursion if String fails due to
printing a bad type.

Add test for String method with named basic types.

R=r
CC=golang-dev
https://golang.org/cl/207102
This commit is contained in:
Ian Lance Taylor 2010-02-15 22:42:49 -08:00
parent fba50ee5ed
commit 115066fd14
2 changed files with 65 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pkg/fmt/print.go
View file

@ -412,7 +412,7 @@ func getFloat32(a interface{}) (val float32, ok bool) {
}
}
// Must be a renamed floating-point type.
switch f := a.(type) {
switch f := reflect.NewValue(a).(type) {
case *reflect.Float32Value:
return float32(f.Get()), true
case *reflect.FloatValue:
@ -434,7 +434,7 @@ func getFloat64(a interface{}) (val float64, ok bool) {
}
}
// Must be a renamed floating-point type.
switch f := a.(type) {
switch f := reflect.NewValue(a).(type) {
case *reflect.Float64Value:
return float64(f.Get()), true
case *reflect.FloatValue:
@ -476,7 +476,7 @@ func (p *pp) unknownType(v interface{}) {
}
func (p *pp) printField(field interface{}, plus, sharp bool, depth int) (was_string bool) {
if field != nil {
if field != nil && depth >= 0 {
switch {
default:
if stringer, ok := field.(Stringer); ok {
@ -948,7 +948,7 @@ func (p *pp) doprintf(format string, a []interface{}) {
p.buf.WriteString(reflect.Typeof(field).String())
p.buf.WriteByte('=')
}
p.printField(field, false, false, 0)
p.printField(field, false, false, -1)
p.buf.WriteByte(')')
}
}