cl/convert:mod instead Dir in Package

Author: luoliwoshang

cl/internal/convert/convert.go

@@ -1,12 +1,14 @@
 package convert
 
 import (
+	"fmt"
 	"log"
 	"strings"
 
 	"github.com/goplus/llcppg/ast"
 	cfg "github.com/goplus/llcppg/cmd/gogensig/config"
 	llconfig "github.com/goplus/llcppg/config"
+	"github.com/goplus/mod/gopmod"
 )
 
 type dbgFlags = int
@@ -72,18 +74,22 @@ type Converter struct {
 }
 
 func NewConverter(config *Config) (*Converter, error) {
+	mod, err := gopmod.Load(config.OutputDir)
+	if err != nil {
+		return nil, fmt.Errorf("failed to load mod: %w", err)
+	}
 	pkg, err := NewPackage(&PackageConfig{
 		PkgBase: PkgBase{
 			PkgPath: config.PkgPath,
 			Deps:    config.Deps,
 			Pubs:    config.TypeMap,
 		},
 		Name:           config.PkgName,
-		OutputDir:      config.OutputDir,
 		ConvSym:        config.ConvSym,
 		LibCommand:     config.Libs,
 		TrimPrefixes:   config.TrimPrefixes,
 		KeepUnderScore: config.KeepUnderScore,
+		Mod:            mod,
 	})
 	if err != nil {
 		return nil, err

cl/internal/convert/package.go

@@ -50,7 +50,7 @@ type Package struct {
 type PackageConfig struct {
 	PkgBase
 	Name           string // current package name
-	OutputDir      string
+	Mod            *gopmod.Module
 	ConvSym        func(name *ast.Object, mangleName string) (goName string, err error)
 	GenConf        *gogen.Config
 	TrimPrefixes   []string
@@ -87,15 +87,10 @@ func NewPackage(config *PackageConfig) (*Package, error) {
 		config.Deps = append([]string{"c"}, config.Deps...)
 	}
 
-	mod, err := gopmod.Load(config.OutputDir)
-	if err != nil {
-		return nil, fmt.Errorf("failed to load mod: %w", err)
-	}
-
 	p.PkgInfo = NewPkgInfo(config.PkgPath, config.Deps, config.Pubs)
 
-	pkgManager := NewPkgDepLoader(mod, p.p)
-	err = pkgManager.InitDeps(p.PkgInfo)
+	pkgManager := NewPkgDepLoader(config.Mod, p.p)
+	err := pkgManager.InitDeps(p.PkgInfo)
 	if err != nil {
 		return nil, fmt.Errorf("failed to init deps: %w", err)
 	}