Merge pull request #2699 from xushiwei/q

gogen v1.22.0: revert overload-conflict

Author: xushiwei

cl/_testgop/overload-conflict/in.xgo

@@ -1229,9 +1229,10 @@ func preloadFile(p *gogen.Package, ctx *blockCtx, f *ast.File, goFile string, ge
 			}
 			if d.Recv != nil {
 				var ok bool
-				recv, ok = d.Recv.List[0].Type.(*ast.Ident)
+				var recvType = d.Recv.List[0].Type
+				recv, ok = recvType.(*ast.Ident)
 				if !ok {
-					ctx.handleErrorf(d.Recv.List[0].Type.Pos(), d.Recv.List[0].Type.End(), "invalid recv type %v", ctx.LoadExpr(d.Recv.List[0].Type))
+					ctx.handleErrorf(recvType.Pos(), recvType.End(), "invalid recv type %v", ctx.LoadExpr(recvType))
 					break
 				}
 				ctx.lbinames = append(ctx.lbinames, recv)

cl/_testgop/overload-conflict/out.go

@@ -8,7 +8,7 @@ require (
 	github.com/fsnotify/fsnotify v1.9.0
 	github.com/goccy/go-yaml v1.19.2
 	github.com/goplus/cobra v1.9.15 //xgo:class
-	github.com/goplus/gogen v1.21.5
+	github.com/goplus/gogen v1.22.0
 	github.com/goplus/lib v0.3.1
 	github.com/goplus/mod v0.20.0
 	github.com/qiniu/x v1.16.5

cl/compile.go

@@ -4,8 +4,8 @@ github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
 github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/goplus/cobra v1.9.15 h1:KoR19rR22R6Z/P3acdT7lCJLX+k09HV0Qt50U/Kse2c=
 github.com/goplus/cobra v1.9.15/go.mod h1:p4LhfNJDKEpiGjGiNn0crUXL5dUPA5DX2ztYpEJR34E=
-github.com/goplus/gogen v1.21.5 h1:RRgdN1NV2dw/PRAYMmN9N9r3B999h763pyHJ/7O3D8A=
-github.com/goplus/gogen v1.21.5/go.mod h1:Y7ulYW3wonQ3d9er00b0uGFEV/IUZa6okWJZh892ACQ=
+github.com/goplus/gogen v1.22.0 h1:clM2eMVWQZz7tYUU/u9xwKFCBLcyVbcstzdiZrgRdfA=
+github.com/goplus/gogen v1.22.0/go.mod h1:Y7ulYW3wonQ3d9er00b0uGFEV/IUZa6okWJZh892ACQ=
 github.com/goplus/lib v0.3.1 h1:Xws4DBVvgOMu58awqB972wtvTacDbk3nqcbHjdx9KSg=
 github.com/goplus/lib v0.3.1/go.mod h1:SgJv3oPqLLHCu0gcL46ejOP3x7/2ry2Jtxu7ta32kp0=
 github.com/goplus/mod v0.20.0 h1:vCONoomlfNLwfv5BDxqQTzaat3hHNaHLAovtkhJPwgw=