Merge pull request #449 from visualfc/embed

CodeBuilder.Member: fix find embed field

codebuild.go

@@ -1474,6 +1474,7 @@ func (p *CodeBuilder) refMember(typ types.Type, name string, argVal ast.Expr, sr
 }
 
 func (p *CodeBuilder) fieldRef(x ast.Expr, o *types.Struct, name string, src ast.Node) bool {
+	var embed []*types.Var
 	for i, n := 0, o.NumFields(); i < n; i++ {
 		fld := o.Field(i)
 		if fld.Name() == name {
@@ -1486,16 +1487,19 @@ func (p *CodeBuilder) fieldRef(x ast.Expr, o *types.Struct, name string, src ast
 			})
 			return true
 		} else if fld.Embedded() {
-			fldt := fld.Type()
-			if o, ok := fldt.(*types.Pointer); ok {
-				fldt = o.Elem()
-			}
-			if t, ok := fldt.(*types.Named); ok {
-				u := p.getUnderlying(t)
-				if struc, ok := u.(*types.Struct); ok {
-					if p.fieldRef(x, struc, name, src) {
-						return true
-					}
+			embed = append(embed, fld)
+		}
+	}
+	for _, fld := range embed {
+		fldt := fld.Type()
+		if o, ok := fldt.(*types.Pointer); ok {
+			fldt = o.Elem()
+		}
+		if t, ok := fldt.(*types.Named); ok {
+			u := p.getUnderlying(t)
+			if struc, ok := u.(*types.Struct); ok {
+				if p.fieldRef(x, struc, name, src) {
+					return true
 				}
 			}
 		}

internal/bar/bar.go

@@ -37,4 +37,8 @@ func Gops_Game_New() *Game {
 	return nil
 }
 
+type Info struct {
+	id int
+}
+
 // -----------------------------------------------------------------------------

package_test.go

@@ -2896,6 +2896,32 @@ func foo(t *testing.T) {
 `)
 }
 
+func TestEmbbedField(t *testing.T) {
+	pkg := newMainPackage()
+	bar := pkg.Import("github.com/goplus/gogen/internal/bar")
+	fields := []*types.Var{
+		types.NewField(token.NoPos, pkg.Types, "", bar.Ref("Info").Type(), true),
+		types.NewField(token.NoPos, pkg.Types, "id", types.Typ[types.String], false),
+	}
+	st := types.NewStruct(fields, nil)
+	typ := pkg.NewParam(token.NoPos, "t", types.NewPointer(st))
+	pkg.NewFunc(nil, "foo", types.NewTuple(typ), nil, false).BodyStart(pkg).
+		Val(ctxRef(pkg, "t")).
+		MemberRef("id").Val("0").Assign(1).
+		End()
+	domTest(t, pkg, `package main
+
+import "github.com/goplus/gogen/internal/bar"
+
+func foo(t *struct {
+	bar.Info
+	id string
+}) {
+	t.id = "0"
+}
+`)
+}
+
 func TestMemberAutoProperty(t *testing.T) {
 	pkg := newMainPackage()
 	test := pkg.Import("testing")