Skip to content

Commit be8570a

Browse files
authored
Merge pull request #2417 from go-wyvern/structLit_name_redeclared
fix(classfile): include source in StructLit initialization for work classes
2 parents 24af2d6 + 7eea715 commit be8570a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

cl/classfile.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,13 +574,14 @@ func genWorkClasses(
574574
embedded := (sp.feats&spriteEmbedded != 0)
575575
sptypes := sp.types
576576
for i, spt := range sptypes {
577+
src := parent.lookupClassNode(spt)
577578
spto := pkg.Ref(spt)
578579
objName := objNamePrefix + strconv.Itoa(iobj+i)
579580
cb.DefineVarStart(token.NoPos, objName).
580-
Val(indexGame).Val(recv).StructLit(spto.Type(), 2, true).
581+
Val(indexGame, src).Val(recv, src).StructLit(spto.Type(), 2, true, src).
581582
UnaryOp(gotoken.AND).EndInit(1)
582583
if embedded {
583-
cb.Val(recv).MemberRef(spt).VarVal(objName).Assign(1)
584+
cb.Val(recv, src).MemberRef(spt, src).VarVal(objName, src).Assign(1)
584585
}
585586
}
586587
if ilst > 0 {

0 commit comments

Comments
 (0)