go/printer: don't forget the .0 in 1.0

(use floating-point rather then integer constant division)

gofmt -w src misc

Fixes #3965.

R=r, bsiegert, 0xjnml
CC=bradfitz, golang-dev
https://golang.org/cl/6610051

diff --git a/src/pkg/go/printer/nodes.go b/src/pkg/go/printer/nodes.go
index 6eee9a9245c19ffed4de0c209dece5a0ba1c007c..e99a2e36d4fd8cb0d56093a98a98589118a3e329 100644 (file)
--- a/src/pkg/go/printer/nodes.go
+++ b/src/pkg/go/printer/nodes.go
@@ -203,7 +203,7 @@ func (p *printer) exprList(prev0 token.Pos, list []ast.Expr, depth int, mode exp
                        } else {
                                const r = 4 // threshold
                                ratio := float64(size) / float64(prevSize)
-                               useFF = ratio <= 1/r || r <= ratio
+                               useFF = ratio <= 1.0/r || r <= ratio
                        }
                }
 

diff --git a/src/pkg/go/printer/testdata/declarations.golden b/src/pkg/go/printer/testdata/declarations.golden
index 71ed32ed145df34bf4e0f3e0c7c80e4cc3143985..21bbf2b2d42d0a8f4b9bc737614fa4cefd13610c 100644 (file)
--- a/src/pkg/go/printer/testdata/declarations.golden
+++ b/src/pkg/go/printer/testdata/declarations.golden
@@ -654,6 +654,35 @@ var _ = map[int]int{
        abcde:  a,      // align with previous line
 }
 
+// alignment of map composite entries: test cases from issue 3965
+// aligned
+var _ = T1{
+       a:                      x,
+       b:                      y,
+       cccccccccccccccccccc:   z,
+}
+
+// not aligned
+var _ = T2{
+       a:      x,
+       b:      y,
+       ccccccccccccccccccccc:  z,
+}
+
+// aligned
+var _ = T3{
+       aaaaaaaaaaaaaaaaaaaa:   x,
+       b:                      y,
+       c:                      z,
+}
+
+// not aligned
+var _ = T4{
+       aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:        x,
+       b:      y,
+       c:      z,
+}
+
 func _() {
        var _ = T{
                a,      // must introduce trailing comma

diff --git a/src/pkg/go/printer/testdata/declarations.input b/src/pkg/go/printer/testdata/declarations.input
index d74cff25d1f4ccf70e14379b3edbbcf13d2f0584..6ac003699261baef1e7867008ef0a7433a1fa6c1 100644 (file)
--- a/src/pkg/go/printer/testdata/declarations.input
+++ b/src/pkg/go/printer/testdata/declarations.input
@@ -667,6 +667,35 @@ var _ = map[int]int{
        abcde: a, // align with previous line
 }
 
+// alignment of map composite entries: test cases from issue 3965
+// aligned
+var _ = T1{
+       a:                    x,
+       b:                    y,
+       cccccccccccccccccccc: z,
+}
+
+// not aligned
+var _ = T2{
+       a: x,
+       b: y,
+       ccccccccccccccccccccc: z,
+}
+
+// aligned
+var _ = T3{
+       aaaaaaaaaaaaaaaaaaaa: x,
+       b:                    y,
+       c:                    z,
+}
+
+// not aligned
+var _ = T4{
+       aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: x,
+       b:                                       y,
+       c:                                       z,
+}
+
 
 func _() {
        var _ = T{