Merge pull request #345 from xushiwei/q

cl.ConvConfig: add PkgPath

Author: xushiwei

cl/convert.go

@@ -17,6 +17,7 @@ func ModInit(deps []string, outputDir string, modulePath string) error {
 }
 
 type ConvConfig struct {
+	PkgPath   string
 	PkgName   string
 	ConvSym   func(name *ast.Object, mangleName string) (goName string, err error)
 	OutputDir string
@@ -33,6 +34,7 @@ type ConvConfig struct {
 
 func Convert(config *ConvConfig) (pkg Package, err error) {
 	cvt, err := convert.NewConverter(&convert.Config{
+		PkgPath:   config.PkgPath,
 		PkgName:   config.PkgName,
 		ConvSym:   config.ConvSym,
 		OutputDir: config.OutputDir,

cl/internal/convert/convert.go

@@ -23,6 +23,7 @@ func SetDebug(dbgFlags dbgFlags) {
 }
 
 type Config struct {
+	PkgPath   string
 	PkgName   string
 	ConvSym   func(name *ast.Object, mangleName string) (goName string, err error)
 	OutputDir string
@@ -73,7 +74,7 @@ type Converter struct {
 func NewConverter(config *Config) (*Converter, error) {
 	pkg, err := NewPackage(&PackageConfig{
 		PkgBase: PkgBase{
-			PkgPath: ".",
+			PkgPath: config.PkgPath,
 			Deps:    config.Deps,
 			Pubs:    config.TypeMap,
 		},

cl/internal/convert/convert_builtin_test.go

@@ -26,6 +26,7 @@ func basicConverter() *Converter {
 		Libs: "${pkg-config --libs xxx}",
 	}
 	converter, err := NewConverter(&Config{
+		PkgPath:   ".",
 		PkgName:   "test",
 		ConvSym:   cltest.NewConvSym(),
 		OutputDir: tempDir,

cl/internal/convert/convert_test.go

@@ -221,6 +221,7 @@ func testFrom(t *testing.T, dir string, gen bool, validateFunc func(t *testing.T
 	}
 
 	cvt, err := convert.NewConverter(&convert.Config{
+		PkgPath:   ".",
 		PkgName:   cfg.Name,
 		ConvSym:   cltest.GetConvSym(symbPath),
 		OutputDir: outputDir,
@@ -314,6 +315,7 @@ func TestNewConvert(t *testing.T) {
 	}
 
 	_, err := convert.NewConverter(&convert.Config{
+		PkgPath: ".",
 		PkgName: "test",
 		ConvSym: cltest.NewConvSym(),