this.Sprite.Main(...) or this.Game.MainEntry(...)

Author: xushiwei

cl/classfile.go

@@ -298,16 +298,38 @@ func gmxMainNarg(sig *types.Signature) int {
 }
 
 func hasMethod(o types.Object, name string) bool {
+	return findMethod(o, name) != nil
+}
+
+func findMethod(o types.Object, name string) *types.Func {
 	if obj, ok := o.(*types.TypeName); ok {
 		if t, ok := obj.Type().(*types.Named); ok {
 			for i, n := 0, t.NumMethods(); i < n; i++ {
-				if t.Method(i).Name() == name {
-					return true
+				f := t.Method(i)
+				if f.Name() == name {
+					return f
 				}
 			}
 		}
 	}
-	return false
+	return nil
+}
+
+func makeMainSig(recv *types.Var, f *types.Func) *types.Signature {
+	const (
+		paramNameTempl = "_gop_arg0"
+	)
+	sig := f.Type().(*types.Signature)
+	in := sig.Params()
+	nin := in.Len()
+	pkg := recv.Pkg()
+	params := make([]*types.Var, nin)
+	paramName := []byte(paramNameTempl)
+	for i := 0; i < nin; i++ {
+		paramName[len(paramNameTempl)-1] = byte('0' + i)
+		params[i] = types.NewParam(token.NoPos, pkg, string(paramName), in.At(i).Type())
+	}
+	return types.NewSignatureType(recv, nil, nil, types.NewTuple(params...), nil, false)
 }
 
 // -----------------------------------------------------------------------------

cl/compile.go

@@ -369,9 +369,12 @@ type blockCtx struct {
 	tlookup    *typeParamLookup
 	c2goBase   string // default is `github.com/goplus/`
 	relBaseDir string
-	classRecv  *ast.FieldList // available when gmxSettings != nil
-	fileScope  *types.Scope   // only valid when isGopFile
-	rec        *goxRecorder
+
+	classRecv *ast.FieldList // available when isClass
+	baseClass types.Object   // available when isClass
+
+	fileScope *types.Scope // available when isGopFile
+	rec       *goxRecorder
 
 	fileLine  bool
 	isClass   bool
@@ -742,12 +745,14 @@ func preloadGopFile(p *gox.Package, ctx *blockCtx, file string, f *ast.File, con
 			}
 			if f.IsProj {
 				o := proj.game
+				ctx.baseClass = o
 				baseTypeName, baseType = o.Name(), o.Type()
 				if proj.gameIsPtr {
 					baseType = types.NewPointer(baseType)
 				}
 			} else {
 				o := proj.sprite[c.ext]
+				ctx.baseClass = o
 				baseTypeName, baseType, spxClass = o.Name(), o.Type(), true
 			}
 		}
@@ -1215,8 +1220,17 @@ func loadFunc(ctx *blockCtx, recv *types.Var, d *ast.FuncDecl, genBody bool) {
 			log.Printf("==> Load method %v.%s\n", recv.Type(), name)
 		}
 	}
-	pkg := ctx.pkg
-	if d.Operator {
+	var pkg = ctx.pkg
+	var sigBase *types.Signature
+	if d.Shadow {
+		if recv != nil {
+			if base := ctx.baseClass; base != nil {
+				if f := findMethod(base, name); f != nil {
+					sigBase = makeMainSig(recv, f)
+				}
+			}
+		}
+	} else if d.Operator {
 		if recv != nil { // binary op
 			if v, ok := binaryGopNames[name]; ok {
 				name = v
@@ -1232,7 +1246,10 @@ func loadFunc(ctx *blockCtx, recv *types.Var, d *ast.FuncDecl, genBody bool) {
 			}
 		}
 	}
-	sig := toFuncType(ctx, d.Type, recv, d)
+	sig := sigBase
+	if sig == nil {
+		sig = toFuncType(ctx, d.Type, recv, d)
+	}
 	fn, err := pkg.NewFuncWith(d.Name.Pos(), name, sig, func() token.Pos {
 		return d.Recv.List[0].Type.Pos()
 	})
@@ -1253,11 +1270,11 @@ func loadFunc(ctx *blockCtx, recv *types.Var, d *ast.FuncDecl, genBody bool) {
 				file := pkg.CurFile()
 				ctx.inits = append(ctx.inits, func() { // interface issue: #795
 					old := pkg.RestoreCurFile(file)
-					loadFuncBody(ctx, fn, body, d)
+					loadFuncBody(ctx, fn, body, sigBase, d)
 					pkg.RestoreCurFile(old)
 				})
 			} else {
-				loadFuncBody(ctx, fn, body, d)
+				loadFuncBody(ctx, fn, body, nil, d)
 			}
 		}
 	}
@@ -1316,8 +1333,18 @@ var unaryGopNames = map[string]string{
 	"<-": "Gop_Recv",
 }
 
-func loadFuncBody(ctx *blockCtx, fn *gox.Func, body *ast.BlockStmt, src ast.Node) {
+func loadFuncBody(ctx *blockCtx, fn *gox.Func, body *ast.BlockStmt, sigBase *types.Signature, src ast.Node) {
 	cb := fn.BodyStart(ctx.pkg, body)
+	if sigBase != nil {
+		// this.Sprite.Main(...) or this.Game.MainEntry(...)
+		cb.VarVal("this").MemberVal(ctx.baseClass.Name()).MemberVal(fn.Name())
+		params := sigBase.Params()
+		n := params.Len()
+		for i := 0; i < n; i++ {
+			cb.Val(params.At(i))
+		}
+		cb.Call(n).EndStmt()
+	}
 	compileStmts(ctx, body.List)
 	if rec := ctx.recorder(); rec != nil {
 		switch fn := src.(type) {

cl/compile_spx_test.go

@@ -486,7 +486,8 @@ func (this *Game) MainEntry() {
 func main() {
 	spx3.Gopt_Game_Main(new(Game), new(Kai))
 }
-func (this *Kai) Main() {
+func (this *Kai) Main(_gop_arg0 string) {
+	this.Sprite.Main(_gop_arg0)
 	fmt.Println(jwt.Token("Hi"))
 }
 `, "main_spx.gox", "Kai_spx.gox")

cl/expr.go

@@ -904,7 +904,7 @@ func compileFuncLit(ctx *blockCtx, v *ast.FuncLit) {
 	}
 	fn := cb.NewClosureWith(sig)
 	if body := v.Body; body != nil {
-		loadFuncBody(ctx, fn, body, v)
+		loadFuncBody(ctx, fn, body, nil, v)
 		cb.SetComments(comments, once)
 	}
 }

cl/internal/spx3/spx3.go

@@ -38,7 +38,7 @@ func (p *Sprite) Name() string {
 	return "sprite"
 }
 
-func (p *Sprite) initSprite(name string) {}
+func (p *Sprite) Main(name string) {}
 
-func Gopt_Game_Main(game interface{ initGame() }, workers ...interface{ initSprite(name string) }) {
+func Gopt_Game_Main(game interface{ initGame() }, workers ...interface{ Main(name string) }) {
 }