Commit 1f3c0eef authored by Rowan Marshall's avatar Rowan Marshall Committed by Robert Griesemer

ast: refer to "embedded" rather than "anonymous" fields in

documentation.

Fixes #25684.

Change-Id: I9d0e47dff2446c27a3df88fb9ccfefef7419470b
Reviewed-on: https://go-review.googlesource.com/120556Reviewed-by: default avatarRobert Griesemer <gri@golang.org>
parent cd016af6
...@@ -153,10 +153,12 @@ func (g *CommentGroup) Text() string { ...@@ -153,10 +153,12 @@ func (g *CommentGroup) Text() string {
// A Field represents a Field declaration list in a struct type, // A Field represents a Field declaration list in a struct type,
// a method list in an interface type, or a parameter/result declaration // a method list in an interface type, or a parameter/result declaration
// in a signature. // in a signature.
// Field.Names is nil for unnamed parameters (parameter lists which only contain types)
// and embedded struct fields. In the latter case, the field name is the type name.
// //
type Field struct { type Field struct {
Doc *CommentGroup // associated documentation; or nil Doc *CommentGroup // associated documentation; or nil
Names []*Ident // field/method/parameter names; or nil if anonymous field Names []*Ident // field/method/parameter names; or nil
Type Expr // field/method/parameter type Type Expr // field/method/parameter type
Tag *BasicLit // field tag; or nil Tag *BasicLit // field tag; or nil
Comment *CommentGroup // line comments; or nil Comment *CommentGroup // line comments; or nil
...@@ -207,14 +209,14 @@ func (f *FieldList) End() token.Pos { ...@@ -207,14 +209,14 @@ func (f *FieldList) End() token.Pos {
return token.NoPos return token.NoPos
} }
// NumFields returns the number of (named and anonymous fields) in a FieldList. // NumFields returns the number of parameters or struct fields represented by a FieldList.
func (f *FieldList) NumFields() int { func (f *FieldList) NumFields() int {
n := 0 n := 0
if f != nil { if f != nil {
for _, g := range f.List { for _, g := range f.List {
m := len(g.Names) m := len(g.Names)
if m == 0 { if m == 0 {
m = 1 // anonymous field m = 1
} }
n += m n += m
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment