diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-07-27 22:27:54 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-08-01 11:21:40 -0700 |
| commit | f75af8c1464e948b5e166cf5ab09ebf0d82fc253 (patch) | |
| tree | 3ba3299859b504bdeb477727471216bd094a0191 /libgo/go/fmt/format.go | |
| parent | 75a23e59031fe673fc3b2e60fd1fe5f4c70ecb85 (diff) | |
| download | gcc-f75af8c1464e948b5e166cf5ab09ebf0d82fc253.zip gcc-f75af8c1464e948b5e166cf5ab09ebf0d82fc253.tar.gz gcc-f75af8c1464e948b5e166cf5ab09ebf0d82fc253.tar.bz2 | |
libgo: update to go1.15rc1
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/245157
Diffstat (limited to 'libgo/go/fmt/format.go')
| -rw-r--r-- | libgo/go/fmt/format.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libgo/go/fmt/format.go b/libgo/go/fmt/format.go index 74e600c..4d12f82 100644 --- a/libgo/go/fmt/format.go +++ b/libgo/go/fmt/format.go @@ -536,6 +536,7 @@ func (f *fmt) fmtFloat(v float64, size int, verb rune, prec int) { tail := tailBuf[:0] hasDecimalPoint := false + sawNonzeroDigit := false // Starting from i = 1 to skip sign at num[0]. for i := 1; i < len(num); i++ { switch num[i] { @@ -552,10 +553,20 @@ func (f *fmt) fmtFloat(v float64, size int, verb rune, prec int) { } fallthrough default: - digits-- + if num[i] != '0' { + sawNonzeroDigit = true + } + // Count significant digits after the first non-zero digit. + if sawNonzeroDigit { + digits-- + } } } if !hasDecimalPoint { + // Leading digit 0 should contribute once to digits. + if len(num) == 2 && num[1] == '0' { + digits-- + } num = append(num, '.') } for digits > 0 { |