Merge pull request #1648 from xushiwei/ov

initBuiltin: echo; call gmxMainFunc only if no main func
goplus · Jan 20, 2024 · d6c099b · d6c099b
2 parents 4a42bdc + 2e3b77e
commit d6c099b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/ast/ast.go b/ast/ast.go
@@ -1135,7 +1135,7 @@ type File struct {
 }
 
 // There is no entrypoint func to indicate the module entry point.
-func (f *File) NoEntrypoint() bool {
+func (f *File) HasShadowEntry() bool {
 	return f.ShadowEntry != nil
 }
 

diff --git a/cl/builtin.go b/cl/builtin.go
@@ -51,6 +51,7 @@ func initBuiltin(pkg *gox.Package, builtin *types.Package, os, fmt, ng, iox, bui
 		scope.Insert(types.NewTypeName(token.NoPos, builtin, "int128", ng.Ref("Int128").Type()))
 	}
 	if fmt != nil {
+		scope.Insert(gox.NewOverloadFunc(token.NoPos, builtin, "echo", fmt.Ref("Println")))
 		initBuiltinFns(builtin, scope, fmt, []string{
 			"print", "println", "printf", "errorf",
 			"fprint", "fprintln", "fprintf",

diff --git a/cl/classfile.go b/cl/classfile.go
@@ -164,14 +164,16 @@ func setBodyHandler(ctx *blockCtx) {
 	}
 }
 
-func gmxMainFunc(p *gox.Package, ctx *pkgCtx) {
+func gmxMainFunc(p *gox.Package, ctx *pkgCtx) bool {
 	if o := p.Types.Scope().Lookup(ctx.gameClass); o != nil && hasMethod(o, "MainEntry") {
 		// new(Game).Main()
 		p.NewFunc(nil, "main", nil, nil, false).BodyStart(p).
 			Val(p.Builtin().Ref("new")).Val(o).Call(1).
 			MemberVal("Main").Call(0).EndStmt().
 			End()
+		return true
 	}
+	return false
 }
 
 // -----------------------------------------------------------------------------
diff --git a/cl/compile.go b/cl/compile.go
@@ -569,10 +569,19 @@ func NewPackage(pkgPath string, pkg *ast.Package, conf *Config) (p *gox.Package,
 		return sfiles[i].path < sfiles[j].path
 	})
 
+	// genMain = true if it is main package and no main func
+	var genMain bool
+	if pkg.Name == "main" {
+		_, hasMain := ctx.syms["main"]
+		genMain = !hasMain
+	}
+
 	for _, f := range sfiles {
 		if f.IsProj {
 			loadFile(ctx, f.File)
-			gmxMainFunc(p, ctx)
+			if genMain { // generate main func if need
+				genMain = !gmxMainFunc(p, ctx)
+			}
 			break
 		}
 	}
@@ -594,12 +603,10 @@ func NewPackage(pkgPath string, pkg *ast.Package, conf *Config) (p *gox.Package,
 	}
 	err = ctx.complete()
 
-	if !conf.NoAutoGenMain && pkg.Name == "main" {
-		if obj := p.Types.Scope().Lookup("main"); obj == nil {
-			old, _ := p.SetCurFile(defaultGoFile, false)
-			p.NewFunc(nil, "main", nil, nil, false).BodyStart(p).End()
-			p.RestoreCurFile(old)
-		}
+	if genMain && !conf.NoAutoGenMain { // generate empty main func
+		old, _ := p.SetCurFile(defaultGoFile, false)
+		p.NewFunc(nil, "main", nil, nil, false).BodyStart(p).End()
+		p.RestoreCurFile(old)
 	}
 	return
 }
@@ -809,7 +816,7 @@ func preloadGopFile(p *gox.Package, ctx *blockCtx, file string, f *ast.File, con
 		}}}
 	}
 	// check class project no MainEntry and auto added
-	if f.IsProj && !conf.NoAutoGenMain && !f.NoEntrypoint() && f.Name.Name == "main" {
+	if f.IsProj && !conf.NoAutoGenMain && !f.HasShadowEntry() && f.Name.Name == "main" {
 		entry := getEntrypoint(f)
 		var hasEntry bool
 		for _, decl := range f.Decls {

diff --git a/cl/compile_test.go b/cl/compile_test.go
@@ -123,7 +123,7 @@ func gopClTestFS(t *testing.T, conf *cl.Config, fs parser.FileSystem, pkgname, e
 }
 
 func TestStringLitBasic(t *testing.T) {
-	gopClTest(t, `println "$$"`, `package main
+	gopClTest(t, `echo "$$"`, `package main
 
 import "fmt"
 

diff --git a/parser/parsertest/parsertest.go b/parser/parsertest/parsertest.go
@@ -111,7 +111,7 @@ func Fprint(w io.Writer, pkg *ast.Package) {
 	for _, fpath := range paths {
 		fmt.Fprintf(w, "\nfile %s\n", filepath.Base(fpath))
 		file := pkg.Files[fpath]
-		if file.NoEntrypoint() {
+		if file.HasShadowEntry() {
 			fmt.Fprintf(w, "noEntrypoint\n")
 		}
 		FprintNode(w, "", file.Decls, "", "  ")