qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 21:54:40 -07:00
Code Releases Activity

fmt: clean up after reflect.Interface change.

Browse Source 
Store the reflect.Value in the internal print state. Code is simpler, cleaner,
and a little faster - back to what it was before the change.

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/5299046
This commit is contained in:
Rob Pike 2011-10-18 16:23:07 -07:00
parent 4c56c30b78
commit 811d334a65
1 changed files with 68 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
src/pkg/fmt/print.go
View File

@ -74,8 +74,11 @@ type pp struct {
n int n int
panicking bool panicking bool
buf bytes.Buffer buf bytes.Buffer
runeBuf [utf8.UTFMax]byte // value holds the current item, as a reflect.Value, and will be
fmt fmt // the zero Value if the item has not been reflected.
value reflect.Value
runeBuf [utf8.UTFMax]byte
fmt fmt
} }
// A cache holds a set of reusable objects. // A cache holds a set of reusable objects.
@ -129,6 +132,7 @@ func (p *pp) free() {
return return
} }
p.buf.Reset() p.buf.Reset()
p.value = reflect.Value{}
ppFree.put(p) ppFree.put(p)
} }
@ -290,7 +294,7 @@ func (p *pp) unknownType(v interface{}) {
p.buf.WriteByte('?') p.buf.WriteByte('?')
} }
func (p *pp) badVerb(verb int, val interface{}, val1 reflect.Value) { func (p *pp) badVerb(verb int, val interface{}) {
p.add('%') p.add('%')
p.add('!') p.add('!')
p.add(verb) p.add(verb)
@ -300,22 +304,22 @@ func (p *pp) badVerb(verb int, val interface{}, val1 reflect.Value) {
p.buf.WriteString(reflect.TypeOf(val).String()) p.buf.WriteString(reflect.TypeOf(val).String())
p.add('=') p.add('=')
p.printField(val, 'v', false, false, 0) p.printField(val, 'v', false, false, 0)
case val1.IsValid(): case p.value.IsValid():
p.buf.WriteString(val1.Type().String()) p.buf.WriteString(p.value.Type().String())
p.add('=') p.add('=')
p.printValue(val1, 'v', false, false, 0) p.printValue(p.value, 'v', false, false, 0)
default: default:
p.buf.Write(nilAngleBytes) p.buf.Write(nilAngleBytes)
} }
p.add(')') p.add(')')
} }
func (p *pp) fmtBool(v bool, verb int, value interface{}, value1 reflect.Value) { func (p *pp) fmtBool(v bool, verb int, value interface{}) {
switch verb { switch verb {
case 't', 'v': case 't', 'v':
p.fmt.fmt_boolean(v) p.fmt.fmt_boolean(v)
default: default:
p.badVerb(verb, value, value1) p.badVerb(verb, value)
} }
} }
@ -329,7 +333,7 @@ func (p *pp) fmtC(c int64) {
p.fmt.pad(p.runeBuf[0:w]) p.fmt.pad(p.runeBuf[0:w])
} }
func (p *pp) fmtInt64(v int64, verb int, value interface{}, value1 reflect.Value) { func (p *pp) fmtInt64(v int64, verb int, value interface{}) {
switch verb { switch verb {
case 'b': case 'b':
p.fmt.integer(v, 2, signed, ldigits) p.fmt.integer(v, 2, signed, ldigits)
@ -343,7 +347,7 @@ func (p *pp) fmtInt64(v int64, verb int, value interface{}, value1 reflect.Value
if 0 <= v && v <= unicode.MaxRune { if 0 <= v && v <= unicode.MaxRune {
p.fmt.fmt_qc(v) p.fmt.fmt_qc(v)
} else { } else {
p.badVerb(verb, value, value1) p.badVerb(verb, value)
} }
case 'x': case 'x':
p.fmt.integer(v, 16, signed, ldigits) p.fmt.integer(v, 16, signed, ldigits)
@ -352,7 +356,7 @@ func (p *pp) fmtInt64(v int64, verb int, value interface{}, value1 reflect.Value
case 'X': case 'X':
p.fmt.integer(v, 16, signed, udigits) p.fmt.integer(v, 16, signed, udigits)
default: default:
p.badVerb(verb, value, value1) p.badVerb(verb, value)
} }
} }
@ -387,7 +391,7 @@ func (p *pp) fmtUnicode(v int64) {
p.fmt.sharp = sharp p.fmt.sharp = sharp
} }
func (p *pp) fmtUint64(v uint64, verb int, goSyntax bool, value interface{}, value1 reflect.Value) { func (p *pp) fmtUint64(v uint64, verb int, goSyntax bool, value interface{}) {
switch verb { switch verb {
case 'b': case 'b':
p.fmt.integer(int64(v), 2, unsigned, ldigits) p.fmt.integer(int64(v), 2, unsigned, ldigits)
@ -407,7 +411,7 @@ func (p *pp) fmtUint64(v uint64, verb int, goSyntax bool, value interface{}, val
if 0 <= v && v <= unicode.MaxRune { if 0 <= v && v <= unicode.MaxRune {
p.fmt.fmt_qc(int64(v)) p.fmt.fmt_qc(int64(v))
} else { } else {
p.badVerb(verb, value, value1) p.badVerb(verb, value)
} }
case 'x': case 'x':
p.fmt.integer(int64(v), 16, unsigned, ldigits) p.fmt.integer(int64(v), 16, unsigned, ldigits)
@ -416,11 +420,11 @@ func (p *pp) fmtUint64(v uint64, verb int, goSyntax bool, value interface{}, val
case 'U': case 'U':
p.fmtUnicode(int64(v)) p.fmtUnicode(int64(v))
default: default:
p.badVerb(verb, value, value1) p.badVerb(verb, value)
} }
} }
func (p *pp) fmtFloat32(v float32, verb int, value interface{}, value1 reflect.Value) { func (p *pp) fmtFloat32(v float32, verb int, value interface{}) {
switch verb { switch verb {
case 'b': case 'b':
p.fmt.fmt_fb32(v) p.fmt.fmt_fb32(v)
@ -435,11 +439,11 @@ func (p *pp) fmtFloat32(v float32, verb int, value interface{}, value1 reflect.V
case 'G': case 'G':
p.fmt.fmt_G32(v) p.fmt.fmt_G32(v)
default: default:
p.badVerb(verb, value, value1) p.badVerb(verb, value)
} }
} }
func (p *pp) fmtFloat64(v float64, verb int, value interface{}, value1 reflect.Value) { func (p *pp) fmtFloat64(v float64, verb int, value interface{}) {
switch verb { switch verb {
case 'b': case 'b':
p.fmt.fmt_fb64(v) p.fmt.fmt_fb64(v)
@ -454,33 +458,33 @@ func (p *pp) fmtFloat64(v float64, verb int, value interface{}, value1 reflect.V
case 'G': case 'G':
p.fmt.fmt_G64(v) p.fmt.fmt_G64(v)
default: default:
p.badVerb(verb, value, value1) p.badVerb(verb, value)
} }
} }
func (p *pp) fmtComplex64(v complex64, verb int, value interface{}, value1 reflect.Value) { func (p *pp) fmtComplex64(v complex64, verb int, value interface{}) {
switch verb { switch verb {
case 'e', 'E', 'f', 'F', 'g', 'G': case 'e', 'E', 'f', 'F', 'g', 'G':
p.fmt.fmt_c64(v, verb) p.fmt.fmt_c64(v, verb)
case 'v': case 'v':
p.fmt.fmt_c64(v, 'g') p.fmt.fmt_c64(v, 'g')
default: default:
p.badVerb(verb, value, value1) p.badVerb(verb, value)
} }
} }
func (p *pp) fmtComplex128(v complex128, verb int, value interface{}, value1 reflect.Value) { func (p *pp) fmtComplex128(v complex128, verb int, value interface{}) {
switch verb { switch verb {
case 'e', 'E', 'f', 'F', 'g', 'G': case 'e', 'E', 'f', 'F', 'g', 'G':
p.fmt.fmt_c128(v, verb) p.fmt.fmt_c128(v, verb)
case 'v': case 'v':
p.fmt.fmt_c128(v, 'g') p.fmt.fmt_c128(v, 'g')
default: default:
p.badVerb(verb, value, value1) p.badVerb(verb, value)
} }
} }
func (p *pp) fmtString(v string, verb int, goSyntax bool, value interface{}, value1 reflect.Value) { func (p *pp) fmtString(v string, verb int, goSyntax bool, value interface{}) {
switch verb { switch verb {
case 'v': case 'v':
if goSyntax { if goSyntax {
@ -497,11 +501,11 @@ func (p *pp) fmtString(v string, verb int, goSyntax bool, value interface{}, val
case 'q': case 'q':
p.fmt.fmt_q(v) p.fmt.fmt_q(v)
default: default:
p.badVerb(verb, value, value1) p.badVerb(verb, value)
} }
} }
func (p *pp) fmtBytes(v []byte, verb int, goSyntax bool, depth int, value interface{}, value1 reflect.Value) { func (p *pp) fmtBytes(v []byte, verb int, goSyntax bool, depth int, value interface{}) {
if verb == 'v' || verb == 'd' { if verb == 'v' || verb == 'd' {
if goSyntax { if goSyntax {
p.buf.Write(bytesBytes) p.buf.Write(bytesBytes)
@ -536,7 +540,7 @@ func (p *pp) fmtBytes(v []byte, verb int, goSyntax bool, depth int, value interf
case 'q': case 'q':
p.fmt.fmt_q(s) p.fmt.fmt_q(s)
default: default:
p.badVerb(verb, value, value1) p.badVerb(verb, value)
} }
} }
@ -546,7 +550,7 @@ func (p *pp) fmtPointer(field interface{}, value reflect.Value, verb int, goSynt
case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.Slice, reflect.UnsafePointer: case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.Slice, reflect.UnsafePointer:
u = value.Pointer() u = value.Pointer()
default: default:
p.badVerb(verb, field, value) p.badVerb(verb, field)
return return
} }
if goSyntax { if goSyntax {
@ -619,7 +623,7 @@ func (p *pp) handleMethods(field interface{}, verb int, plus, goSyntax bool, dep
handled = true handled = true
defer p.catchPanic(field, verb) defer p.catchPanic(field, verb)
// Print the result of GoString unadorned. // Print the result of GoString unadorned.
p.fmtString(stringer.GoString(), 's', false, field, reflect.Value{}) p.fmtString(stringer.GoString(), 's', false, field)
return return
} }
} else { } else {
@ -641,7 +645,7 @@ func (p *pp) printField(field interface{}, verb int, plus, goSyntax bool, depth
if verb == 'T' || verb == 'v' { if verb == 'T' || verb == 'v' {
p.buf.Write(nilAngleBytes) p.buf.Write(nilAngleBytes)
} else { } else {
p.badVerb(verb, field, reflect.Value{}) p.badVerb(verb, field)
} }
return false return false
} }
@ -664,58 +668,58 @@ func (p *pp) printField(field interface{}, verb int, plus, goSyntax bool, depth
// Some types can be done without reflection. // Some types can be done without reflection.
switch f := field.(type) { switch f := field.(type) {
case bool: case bool:
p.fmtBool(f, verb, field, reflect.Value{}) p.fmtBool(f, verb, field)
return false return false
case float32: case float32:
p.fmtFloat32(f, verb, field, reflect.Value{}) p.fmtFloat32(f, verb, field)
return false return false
case float64: case float64:
p.fmtFloat64(f, verb, field, reflect.Value{}) p.fmtFloat64(f, verb, field)
return false return false
case complex64: case complex64:
p.fmtComplex64(complex64(f), verb, field, reflect.Value{}) p.fmtComplex64(complex64(f), verb, field)
return false return false
case complex128: case complex128:
p.fmtComplex128(f, verb, field, reflect.Value{}) p.fmtComplex128(f, verb, field)
return false return false
case int: case int:
p.fmtInt64(int64(f), verb, field, reflect.Value{}) p.fmtInt64(int64(f), verb, field)
return false return false
case int8: case int8:
p.fmtInt64(int64(f), verb, field, reflect.Value{}) p.fmtInt64(int64(f), verb, field)
return false return false
case int16: case int16:
p.fmtInt64(int64(f), verb, field, reflect.Value{}) p.fmtInt64(int64(f), verb, field)
return false return false
case int32: case int32:
p.fmtInt64(int64(f), verb, field, reflect.Value{}) p.fmtInt64(int64(f), verb, field)
return false return false
case int64: case int64:
p.fmtInt64(f, verb, field, reflect.Value{}) p.fmtInt64(f, verb, field)
return false return false
case uint: case uint:
p.fmtUint64(uint64(f), verb, goSyntax, field, reflect.Value{}) p.fmtUint64(uint64(f), verb, goSyntax, field)
return false return false
case uint8: case uint8:
p.fmtUint64(uint64(f), verb, goSyntax, field, reflect.Value{}) p.fmtUint64(uint64(f), verb, goSyntax, field)
return false return false
case uint16: case uint16:
p.fmtUint64(uint64(f), verb, goSyntax, field, reflect.Value{}) p.fmtUint64(uint64(f), verb, goSyntax, field)
return false return false
case uint32: case uint32:
p.fmtUint64(uint64(f), verb, goSyntax, field, reflect.Value{}) p.fmtUint64(uint64(f), verb, goSyntax, field)
return false return false
case uint64: case uint64:
p.fmtUint64(f, verb, goSyntax, field, reflect.Value{}) p.fmtUint64(f, verb, goSyntax, field)
return false return false
case uintptr: case uintptr:
p.fmtUint64(uint64(f), verb, goSyntax, field, reflect.Value{}) p.fmtUint64(uint64(f), verb, goSyntax, field)
return false return false
case string: case string:
p.fmtString(f, verb, goSyntax, field, reflect.Value{}) p.fmtString(f, verb, goSyntax, field)
return verb == 's' || verb == 'v' return verb == 's' || verb == 'v'
case []byte: case []byte:
p.fmtBytes(f, verb, goSyntax, depth, field, reflect.Value{}) p.fmtBytes(f, verb, goSyntax, depth, field)
return verb == 's' return verb == 's'
} }
@ -729,7 +733,7 @@ func (p *pp) printValue(value reflect.Value, verb int, plus, goSyntax bool, dept
if verb == 'T' || verb == 'v' { if verb == 'T' || verb == 'v' {
p.buf.Write(nilAngleBytes) p.buf.Write(nilAngleBytes)
} else { } else {
p.badVerb(verb, nil, value) p.badVerb(verb, nil)
} }
return false return false
} }
@ -761,28 +765,30 @@ func (p *pp) printValue(value reflect.Value, verb int, plus, goSyntax bool, dept
// printReflectValue is the fallback for both printField and printValue. // printReflectValue is the fallback for both printField and printValue.
// It uses reflect to print the value. // It uses reflect to print the value.
func (p *pp) printReflectValue(value reflect.Value, verb int, plus, goSyntax bool, depth int) (wasString bool) { func (p *pp) printReflectValue(value reflect.Value, verb int, plus, goSyntax bool, depth int) (wasString bool) {
oldValue := p.value
p.value = value
BigSwitch: BigSwitch:
switch f := value; f.Kind() { switch f := value; f.Kind() {
case reflect.Bool: case reflect.Bool:
p.fmtBool(f.Bool(), verb, nil, value) p.fmtBool(f.Bool(), verb, nil)
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
p.fmtInt64(f.Int(), verb, nil, value) p.fmtInt64(f.Int(), verb, nil)
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
p.fmtUint64(uint64(f.Uint()), verb, goSyntax, nil, value) p.fmtUint64(uint64(f.Uint()), verb, goSyntax, nil)
case reflect.Float32, reflect.Float64: case reflect.Float32, reflect.Float64:
if f.Type().Size() == 4 { if f.Type().Size() == 4 {
p.fmtFloat32(float32(f.Float()), verb, nil, value) p.fmtFloat32(float32(f.Float()), verb, nil)
} else { } else {
p.fmtFloat64(float64(f.Float()), verb, nil, value) p.fmtFloat64(float64(f.Float()), verb, nil)
} }
case reflect.Complex64, reflect.Complex128: case reflect.Complex64, reflect.Complex128:
if f.Type().Size() == 8 { if f.Type().Size() == 8 {
p.fmtComplex64(complex64(f.Complex()), verb, nil, value) p.fmtComplex64(complex64(f.Complex()), verb, nil)
} else { } else {
p.fmtComplex128(complex128(f.Complex()), verb, nil, value) p.fmtComplex128(complex128(f.Complex()), verb, nil)
} }
case reflect.String: case reflect.String:
p.fmtString(f.String(), verb, goSyntax, nil, value) p.fmtString(f.String(), verb, goSyntax, nil)
case reflect.Map: case reflect.Map:
if goSyntax { if goSyntax {
p.buf.WriteString(f.Type().String()) p.buf.WriteString(f.Type().String())
@ -842,7 +848,7 @@ BigSwitch:
p.buf.Write(nilAngleBytes) p.buf.Write(nilAngleBytes)
} }
} else { } else {
return p.printValue(value, verb, plus, goSyntax, depth+1) wasString = p.printValue(value, verb, plus, goSyntax, depth+1)
} }
case reflect.Array, reflect.Slice: case reflect.Array, reflect.Slice:
// Byte slices are special. // Byte slices are special.
@ -858,8 +864,9 @@ BigSwitch:
for i := range bytes { for i := range bytes {
bytes[i] = byte(f.Index(i).Uint()) bytes[i] = byte(f.Index(i).Uint())
} }
p.fmtBytes(bytes, verb, goSyntax, depth, nil, value) p.fmtBytes(bytes, verb, goSyntax, depth, nil)
return verb == 's' wasString = verb == 's'
break
} }
if goSyntax { if goSyntax {
p.buf.WriteString(value.Type().String()) p.buf.WriteString(value.Type().String())
@ -921,7 +928,8 @@ BigSwitch:
default: default:
p.unknownType(f) p.unknownType(f)
} }
return false p.value = oldValue
return wasString
} }
// intFromArg gets the fieldnumth element of a. On return, isInt reports whether the argument has type int. // intFromArg gets the fieldnumth element of a. On return, isInt reports whether the argument has type int.