diff options
Diffstat (limited to 'libgo/go/fmt/print.go')
| -rw-r--r-- | libgo/go/fmt/print.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libgo/go/fmt/print.go b/libgo/go/fmt/print.go index 8b15a82e773..9f157daaee0 100644 --- a/libgo/go/fmt/print.go +++ b/libgo/go/fmt/print.go @@ -74,6 +74,7 @@ type GoStringer interface { type pp struct { n int panicking bool + erroring bool // printing an error condition buf bytes.Buffer // field holds the current item, as an interface{}. field interface{} @@ -124,6 +125,7 @@ var ppFree = newCache(func() interface{} { return new(pp) }) func newPrinter() *pp { p := ppFree.get().(*pp) p.panicking = false + p.erroring = false p.fmt.init(&p.buf) return p } @@ -299,6 +301,7 @@ func (p *pp) unknownType(v interface{}) { } func (p *pp) badVerb(verb rune) { + p.erroring = true p.add('%') p.add('!') p.add(verb) @@ -316,6 +319,7 @@ func (p *pp) badVerb(verb rune) { p.buf.Write(nilAngleBytes) } p.add(')') + p.erroring = false } func (p *pp) fmtBool(v bool, verb rune) { @@ -606,6 +610,9 @@ func (p *pp) catchPanic(field interface{}, verb rune) { } func (p *pp) handleMethods(verb rune, plus, goSyntax bool, depth int) (wasString, handled bool) { + if p.erroring { + return + } // Is it a Formatter? if formatter, ok := p.field.(Formatter); ok { handled = true |