go/doc: set Type.Name field

R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/5569043

diff --git a/src/pkg/go/doc/reader.go b/src/pkg/go/doc/reader.go
index 1a2fad559a63cf29e276a85d5e2eb4d6ed38d1a6..926cf537eb70b791951acee443be70c84d004724 100644 (file)
--- a/src/pkg/go/doc/reader.go
+++ b/src/pkg/go/doc/reader.go
@@ -483,7 +483,7 @@ func (p sortType) Less(i, j int) bool {
        // sort by name
        // pull blocks (name = "") up to top
        // in original order
-       if ni, nj := p[i].Type.Name.Name, p[j].Type.Name.Name; ni != nj {
+       if ni, nj := p[i].Name, p[j].Name; ni != nj {
                return ni < nj
        }
        return p[i].order < p[j].order
@@ -509,6 +509,7 @@ func (doc *docReader) makeTypes(m map[string]*typeInfo) []*Type {
                        // process the type even if not exported so that we have
                        // its methods in case they are embedded somewhere
                        t := new(Type)
+                       t.Name = old.name
                        if decl != nil {
                                typespec := decl.Specs[0].(*ast.TypeSpec)
                                doc := typespec.Doc