Merge pull request goplus#2684 from xushiwei/overload

gogen v1.21.3: overload-conflict

Author: xushiwei

cl/_testgop/overload-conflict/in.xgo

@@ -0,0 +1,7 @@
+import "github.com/goplus/xgo/cl/internal/overload/conflict"
+
+var a, b conflict.Foo
+var c = a.Mul(b)
+var d = a.Mul(100)
+var e = conflict.Mul(a, b)
+var f = conflict.Mul(a, 100)

cl/_testgop/overload-conflict/out.go

@@ -0,0 +1,9 @@
+package main
+
+import "github.com/goplus/xgo/cl/internal/overload/conflict"
+
+var a, b conflict.Foo
+var c = a.Mul(b)
+var d = a.MulInt(100)
+var e = conflict.Mul(a, b)
+var f = conflict.MulInt(a, 100)

cl/_testgop/overload-method1/in.xgo cl/_testgop/overload-method/in.xgocl/_testgop/overload-method1/in.xgo renamed to cl/_testgop/overload-method/in.xgo

@@ -1243,7 +1243,6 @@ func preloadFile(p *gogen.Package, ctx *blockCtx, f *ast.File, goFile string, ge
 			exov := false
 			name := d.Name
 		LoopFunc:
-
 			for idx, fn := range d.Funcs {
 				switch expr := fn.(type) {
 				case *ast.Ident:

cl/_testgop/overload-method1/out.go cl/_testgop/overload-method/out.gocl/_testgop/overload-method1/out.go renamed to cl/_testgop/overload-method/out.go

@@ -0,0 +1,26 @@
+package conflict
+
+const XGoPackage = true
+
+type Foo struct {
+}
+
+const XGoo_Foo_Mul = ".Mul,.MulInt"
+
+func (a Foo) MulInt(b int) Foo {
+	return a
+}
+
+func (a Foo) Mul(b Foo) Foo {
+	return a
+}
+
+const XGoo_Mul = "Mul,MulInt"
+
+func Mul(a, b Foo) Foo {
+	return a
+}
+
+func MulInt(a Foo, b int) Foo {
+	return a
+}

cl/compile.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.13 //xgo:class
-	github.com/goplus/gogen v1.21.2
+	github.com/goplus/gogen v1.21.3
 	github.com/goplus/lib v0.3.1
 	github.com/goplus/mod v0.20.0
 	github.com/qiniu/x v1.16.5

cl/internal/overload/conflict/overload.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.13 h1:onu/65rXILVMc7RBvdY1mGdOIZ/F4C/6o7DWgglwFaw=
 github.com/goplus/cobra v1.9.13/go.mod h1:p4LhfNJDKEpiGjGiNn0crUXL5dUPA5DX2ztYpEJR34E=
-github.com/goplus/gogen v1.21.2 h1:xbXPgZOZiQx/WBM0nZxVSxFbtdCMZCRB+lguDnh8pfs=
-github.com/goplus/gogen v1.21.2/go.mod h1:Y7ulYW3wonQ3d9er00b0uGFEV/IUZa6okWJZh892ACQ=
+github.com/goplus/gogen v1.21.3 h1:0f6MWmAieymEVuhGPl5h9MSb4FmwbTsOpyVKPL54e3U=
+github.com/goplus/gogen v1.21.3/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=