Merge pull request #77 from luoliwoshang/gogensig/testskip

gogensig:skip headerfile gen test

chore/gogensig/cmptest/test.go

@@ -16,7 +16,8 @@ import (
 	cppgtypes "github.com/goplus/llgo/chore/llcppg/types"
 )
 
-func RunTest(t *testing.T, pkgName string, isCpp bool, symbolEntries []config.SymbolEntry, cppgConf *cppgtypes.Config, originalCode, expectedOutput string) {
+// The validateFunc is used to validate the generated file,
+func RunTest(t *testing.T, pkgName string, isCpp bool, symbolEntries []config.SymbolEntry, cppgConf *cppgtypes.Config, originalCode, expectedOutput string, validateFunc func(t *testing.T, pkg *convert.Package)) {
 	t.Helper()
 
 	tempDir, err := os.MkdirTemp("", "gogensig-test")
@@ -81,6 +82,10 @@ func RunTest(t *testing.T, pkgName string, isCpp bool, symbolEntries []config.Sy
 	if strings.TrimSpace(expectedOutput) != strings.TrimSpace(string(content)) {
 		t.Errorf("does not match expected.\nExpected:\n%s\nGot:\n%s", expectedOutput, string(content))
 	}
+
+	if validateFunc != nil {
+		validateFunc(t, astConvert.GetPackage())
+	}
 }
 
 func CreateAndWriteTempSymbFile(entries []config.SymbolEntry) (string, error) {

chore/gogensig/config/conf.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"os"
 	"os/exec"
+	"strings"
 
 	"github.com/goplus/llgo/chore/gogensig/unmarshal"
 	cppgtypes "github.com/goplus/llgo/chore/llcppg/types"
@@ -53,7 +54,7 @@ func Sigfetch(file string, isTemp bool, isCPP bool) ([]byte, error) {
 
 	err := cmd.Run()
 	if err != nil {
-		return nil, fmt.Errorf("error running llcppsigfetch: %v\nStderr: %s", err, stderr.String())
+		return nil, fmt.Errorf("error running llcppsigfetch: %v\nStderr: %s\nArgs: %s", err, stderr.String(), strings.Join(args, " "))
 	}
 
 	return out.Bytes(), nil

chore/gogensig/convert/builtin.go

@@ -66,6 +66,10 @@ func (p *BuiltinTypeMap) FindTypeAlias(name string) (types.Type, error) {
 	return nil, fmt.Errorf("%s", "not found in type alias map")
 }
 
+func (p *BuiltinTypeMap) GetTypeAliases() map[string]typeAliasInfo {
+	return p.typeAliases
+}
+
 func (p *BuiltinTypeMap) initBuiltinTypeMap() {
 	// todo(zzy): int128/uint128  half(float16),long double,float 128
 	p.builtinTypeMap = map[ast.BuiltinType]types.Type{

chore/gogensig/convert/convert.go

@@ -42,6 +42,10 @@ func (p *AstConvert) SetVisitDone(fn func(pkg *Package, docPath string)) {
 	p.visitDone = fn
 }
 
+func (p *AstConvert) GetPackage() *Package {
+	return p.pkg
+}
+
 func (p *AstConvert) setupSymbolTableFile(filePath string) error {
 	symbTable, err := config.NewSymbolTable(filePath)
 	if err != nil {

chore/gogensig/convert/package.go

@@ -74,7 +74,7 @@ func (p *Package) SetCurFile(file string, isHeaderFile bool) error {
 	var fileName string
 	if isHeaderFile {
 		// headerfile to go filename
-		fileName = p.processHeaderFileName(file)
+		fileName = HeaderFileToGo(file)
 	} else {
 		// package name as the default file
 		fileName = file + ".go"
@@ -108,6 +108,14 @@ func (p *Package) GetGenPackage() *gogen.Package {
 	return p.p
 }
 
+func (p *Package) GetOutputDir() string {
+	return p.outputDir
+}
+
+func (p *Package) GetTypeCvt() *TypeConv {
+	return p.cvt
+}
+
 func (p *Package) Name() string {
 	return p.name
 }
@@ -226,7 +234,7 @@ func (p *Package) Write(headerFile string) error {
 		return nil
 	}
 
-	fileName := p.processHeaderFileName(headerFile)
+	fileName := HeaderFileToGo(headerFile)
 
 	if debug {
 		log.Printf("Write HeaderFile [%s] from  gogen:[%s] to [%s]\n", headerFile, fileName, filepath.Join(p.outputDir, fileName))
@@ -242,7 +250,7 @@ func (p *Package) Write(headerFile string) error {
 // WriteToBuffer writes the Go file to a buffer.
 // Include the aliased file for debug
 func (p *Package) WriteToBuffer(headerFile string) (*bytes.Buffer, error) {
-	goFileName := p.processHeaderFileName(headerFile)
+	goFileName := HeaderFileToGo(headerFile)
 	buf := new(bytes.Buffer)
 	err := p.p.WriteTo(buf, goFileName)
 	if err != nil {
@@ -271,7 +279,7 @@ func (p *Package) prepareOutputDir(outputDir string) (string, error) {
 
 // /path/to/foo.h
 // foo.go
-func (p *Package) processHeaderFileName(headerFile string) string {
+func HeaderFileToGo(headerFile string) string {
 	_, fileName := filepath.Split(headerFile)
 	ext := filepath.Ext(fileName)
 	if len(ext) > 0 {