Merge pull request #491 from TarsCloud/fix/lbbniu/tars2go

fix: The first module of the single-file multi-module is generated multiple times

Author: lbbniu

tars/tools/tars2go/gencode/gen_go.go

@@ -96,13 +96,14 @@ func (g *GenGo) W(v ...string) {
 }
 
 func (g *GenGo) genAll() {
-	if _, ok := fileMap.Load(g.filepath); ok {
+	g.module.Rename(g.opt.ModuleUpper)
+	key := g.module.Source + ":" + g.module.Name
+	if _, ok := fileMap.Load(key); ok {
 		// already compiled
 		return
 	}
-	fileMap.Store(g.filepath, struct{}{})
+	fileMap.Store(key, struct{}{})
 
-	g.module.Rename(g.opt.ModuleUpper)
 	g.genInclude(g.module.IncModule)
 
 	g.code.Reset()

tars/tools/tars2go/parse/parse.go

@@ -38,8 +38,9 @@ func NewParse(opt *options.Options, filePath string, incChain []string) *ast.Mod
 		filename := path.Base(filePath)
 		for _, include := range opt.Includes {
 			include = strings.TrimRight(include, "/")
-			filePath = include + "/" + filename
-			if _, err = os.Stat(filePath); err == nil {
+			newFilePath := include + "/" + filename
+			if _, err = os.Stat(newFilePath); err == nil {
+				filePath = newFilePath
 				break
 			}
 		}