- some fine-tuning of godoc templates per r's suggestion

- removed gratuitous newline in go/printer

R=r
DELTA=15  (2 added, 13 deleted, 0 changed)
OCL=30358
CL=30358

diff --git a/lib/godoc/package.txt b/lib/godoc/package.txt
index cd8501337e437044d25c7f399235634597d9c07b..e0cab52bde2a680df3ecfc0b148f3a6fc7e6f645 100644 (file)
--- a/lib/godoc/package.txt
+++ b/lib/godoc/package.txt
@@ -19,9 +19,7 @@ import "{ImportPath}"
 CONSTANTS
 {.repeated section @}
 {# the .repeated section, .section idiom skips over nils in the array}
-
 {Decl}
-
 {Doc}
 {.end}
 {.end}
@@ -29,9 +27,7 @@ CONSTANTS
 
 VARIABLES
 {.repeated section @}
-
 {Decl}
-
 {Doc}
 {.end}
 {.end}
@@ -39,9 +35,7 @@ VARIABLES
 
 FUNCTIONS
 {.repeated section @}
-
 {Decl}
-
 {Doc}
 {.end}
 {.end}
@@ -49,20 +43,14 @@ FUNCTIONS
 
 TYPES
 {.repeated section @}
-
 {Decl}
-
 {Doc}
 {.repeated section Factories}
-
 {Decl}
-
 {Doc}
 {.end}
 {.repeated section Methods}
-
 {Decl}
-
 {Doc}
 {.end}
 {.end}

diff --git a/src/pkg/go/printer/printer.go b/src/pkg/go/printer/printer.go
index 74318b0cd0adc156dcea43e0c49d207e031e4c3a..d34c084acd52a8bbcde55b7c1d765a51ea3efae2 100644 (file)
--- a/src/pkg/go/printer/printer.go
+++ b/src/pkg/go/printer/printer.go
@@ -981,6 +981,8 @@ func (p *printer) program(prog *ast.Program) {
                        }
                }
        }
+
+       p.print(newline);
 }
 
 
@@ -1010,7 +1012,6 @@ func Fprint(output io.Writer, node interface{}, mode uint) (int, os.Error) {
                default:
                        p.errors <- os.NewError("unsupported node type");
                }
-               p.print(newline);
                p.errors <- nil;  // no errors
        }();
        err := <-p.errors;  // wait for completion of goroutine