gogensig:linux skip file test

.github/workflows/go.yml

@@ -5,9 +5,9 @@ name: Go
 
 on:
   push:
-    branches: [ "*" ]
+    branches: [ "**" ]
   pull_request:
-    branches: [ "*" ]
+    branches: [ "**" ]
 
 jobs:
 
@@ -45,7 +45,7 @@ jobs:
           echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-${{matrix.llvm}} main" | sudo tee /etc/apt/sources.list.d/llvm.list
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
           sudo apt-get update
-          sudo apt-get install -y llvm-${{matrix.llvm}}-dev clang-${{matrix.llvm}} lld-${{matrix.llvm}} pkg-config libgc-dev libssl-dev zlib1g-dev
+          sudo apt-get install -y llvm-${{matrix.llvm}}-dev clang-${{matrix.llvm}} libclang-${{matrix.llvm}}-dev lld-${{matrix.llvm}} pkg-config libgc-dev libssl-dev zlib1g-dev --fix-missing
           echo "/usr/lib/llvm-${{matrix.llvm}}/bin" >> $GITHUB_PATH
 
           # Install optional deps for demos.
@@ -80,18 +80,22 @@ jobs:
 
       - name: Build
         run: go build -v ./...
-
+
+      - name: Install
+        run: go install ./...
+
+      - name: Install llcppsigfetch
+        run: bash .github/workflows/install_llcppsigfetch.sh
+
       - name: Test
         if: ${{!startsWith(matrix.os, 'macos')}}
         run: go test -v ./...
-
+     
       - name: Test with coverage
         if: startsWith(matrix.os, 'macos')
         run: go test -v -coverprofile="coverage.txt" -covermode=atomic ./...
 
-      - name: Install
-        run: go install ./...
-
+
       - name: LLGO tests
         if: ${{!startsWith(matrix.os, 'ubuntu')}}
         run: |

.github/workflows/install_llcppsigfetch.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+llgo install ./chore/_xtool/llcppsymg
+llgo install ./chore/_xtool/llcppsigfetch
+

chore/gogensig/cmp/cmp.go

@@ -0,0 +1,79 @@
+package cmp
+
+import (
+	"bufio"
+	"bytes"
+	"strings"
+	"unicode"
+
+	"github.com/google/go-cmp/cmp"
+)
+
+func skipSpace(data []byte, from int) int {
+	dataBuf := bytes.NewBuffer(data[from:])
+	index := from
+	for {
+		rn, sz, err := dataBuf.ReadRune()
+		if err != nil {
+			break
+		}
+		if !unicode.IsSpace(rn) {
+			break
+		}
+		index = index + sz
+	}
+	return index
+}
+
+func SplitLineIgnoreSpace(s string) []string {
+	buf := bytes.NewBufferString(s)
+	scan := bufio.NewScanner(buf)
+	results := make([]string, 0)
+	for scan.Scan() {
+		lineText := scan.Text()
+		lineTextBuf := bytes.NewBufferString(lineText)
+		lineTextScan := bufio.NewScanner(lineTextBuf)
+		lineTextScan.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
+			if atEOF && len(data) == 0 {
+				return 0, nil, nil
+			}
+			if i := bytes.IndexAny(data, " \t"); i >= 0 {
+				ii := skipSpace(data, i+1)
+				return ii, data[0:i], nil
+			}
+			if atEOF {
+				return len(data), data, nil
+			}
+			return 0, nil, nil
+		})
+
+		strBuilder := strings.Builder{}
+		writeSpace := false
+		total := 0
+		for lineTextScan.Scan() {
+			word := lineTextScan.Text()
+			if writeSpace {
+				strBuilder.WriteRune(' ')
+			}
+			n, err := strBuilder.WriteString(word)
+			if err != nil {
+				break
+			}
+			total += n
+			writeSpace = total > 0
+		}
+		if total > 0 {
+			results = append(results, strBuilder.String())
+		}
+	}
+	return results
+}
+
+func EqualStringIgnoreSpace(s1 string, s2 string) (bool, string) {
+	arr1 := SplitLineIgnoreSpace(s1)
+	arr2 := SplitLineIgnoreSpace(s2)
+	if !cmp.Equal(arr1, arr2) {
+		return false, cmp.Diff(arr1, arr2)
+	}
+	return true, ""
+}

chore/gogensig/cmptest/test.go

@@ -0,0 +1,111 @@
+package cmptest
+
+import (
+	"encoding/json"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/goplus/llgo/chore/gogensig/config"
+	"github.com/goplus/llgo/chore/gogensig/convert"
+	"github.com/goplus/llgo/chore/gogensig/processor"
+	"github.com/goplus/llgo/chore/gogensig/unmarshal"
+	"github.com/goplus/llgo/chore/gogensig/visitor"
+	cppgtypes "github.com/goplus/llgo/chore/llcppg/types"
+)
+
+// 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")
+	if err != nil {
+		t.Fatal("failed to create temp dir")
+	}
+	defer os.RemoveAll(tempDir)
+
+	symbolpath, err := CreateAndWriteTempSymbFile(symbolEntries)
+	if err != nil {
+		t.Fatal(err)
+	}
+	cfgPath, err := CreateCppgConfFile(cppgConf)
+	if err != nil {
+		t.Fatal(err)
+	}
+	astConvert, err := convert.NewAstConvert(&convert.AstConvertConfig{
+		PkgName:   pkgName,
+		SymbFile:  symbolpath,
+		CfgFile:   cfgPath,
+		OutputDir: tempDir,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// The result file will be generated in a directory based on the package name.
+	// For example, if the package name is "typeref", the result file will be generated in a directory named "typeref".
+	rootDir := filepath.Join(tempDir, pkgName)
+	files, err := os.ReadDir(rootDir)
+	if err != nil {
+		t.Fatalf("Fail to read temp dir: %v", err)
+	}
+
+	for _, file := range files {
+		log.Println("Generated file:", file.Name())
+	}
+
+	p := processor.NewDocFileSetProcessor([]visitor.DocVisitor{astConvert})
+
+	// Fetch the signature file
+	// The signature file is generated by llcppsigfetch
+	bytes, err := config.Sigfetch(originalCode, true, isCpp)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	inputdata, err := unmarshal.UnmarshalFileSet(bytes)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	p.ProcessFileSet(inputdata)
+
+	// Note: The converted file path for llcppsigfetch's temp header file is temp.h,
+	genFilePath := filepath.Join(rootDir, "temp.go")
+	content, err := os.ReadFile(genFilePath)
+	if err != nil {
+		t.Fatalf("Fail to read generated file: %v", err)
+	}
+
+	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) {
+	return CreateJSONFile("llcppg.symb.json", entries)
+}
+
+func CreateCppgConfFile(config *cppgtypes.Config) (string, error) {
+	return CreateJSONFile("llcppg.cfg", config)
+}
+
+func CreateJSONFile(filename string, data interface{}) (string, error) {
+	filePath := filepath.Join(os.TempDir(), filename)
+
+	file, err := os.Create(filePath)
+	if err != nil {
+		return "", err
+	}
+	defer file.Close()
+
+	encoder := json.NewEncoder(file)
+	encoder.SetIndent("", "  ")
+	return filePath, encoder.Encode(data)
+}

chore/gogensig/config/_testinput/llcppg.symb.json

@@ -0,0 +1,61 @@
+[{
+		"mangle":	"_ZN9INIReader12ValueHandlerEPvPKcS2_S2_",
+		"c++":	"INIReader::ValueHandler(void*, char const*, char const*, char const*)",
+		"go":	"(*Reader).ValueHandler"
+	}, {
+		"mangle":	"_ZN9INIReader7MakeKeyERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_",
+		"c++":	"INIReader::MakeKey(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&)",
+		"go":	"(*Reader).MakeKey"
+	}, {
+		"mangle":	"_ZN9INIReaderC1EPKcm",
+		"c++":	"INIReader::INIReader(char const*, unsigned long)",
+		"go":	"(*Reader).Init__1"
+	}, {
+		"mangle":	"_ZN9INIReaderC1ERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE",
+		"c++":	"INIReader::INIReader(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&)",
+		"go":	"(*Reader).Init"
+	}, {
+		"mangle":	"_ZNK9INIReader10GetBooleanERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_b",
+		"c++":	"INIReader::GetBoolean(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, bool) const",
+		"go":	"(*Reader).GetBoolean"
+	}, {
+		"mangle":	"_ZNK9INIReader10GetIntegerERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_l",
+		"c++":	"INIReader::GetInteger(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, long) const",
+		"go":	"(*Reader).GetInteger"
+	}, {
+		"mangle":	"_ZNK9INIReader10HasSectionERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE",
+		"c++":	"INIReader::HasSection(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&) const",
+		"go":	"(*Reader).HasSection"
+	}, {
+		"mangle":	"_ZNK9INIReader10ParseErrorEv",
+		"c++":	"INIReader::ParseError() const",
+		"go":	"(*Reader).ParseError"
+	}, {
+		"mangle":	"_ZNK9INIReader11GetUnsignedERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_m",
+		"c++":	"INIReader::GetUnsigned(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, unsigned long) const",
+		"go":	"(*Reader).GetUnsigned"
+	}, {
+		"mangle":	"_ZNK9INIReader12GetInteger64ERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_x",
+		"c++":	"INIReader::GetInteger64(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, long long) const",
+		"go":	"(*Reader).GetInteger64"
+	}, {
+		"mangle":	"_ZNK9INIReader13GetUnsigned64ERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_y",
+		"c++":	"INIReader::GetUnsigned64(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, unsigned long long) const",
+		"go":	"(*Reader).GetUnsigned64"
+	}, {
+		"mangle":	"_ZNK9INIReader3GetERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_S8_",
+		"c++":	"INIReader::Get(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&) const",
+		"go":	"(*Reader).Get"
+	}, {
+		"mangle":	"_ZNK9INIReader7GetRealERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_d",
+		"c++":	"INIReader::GetReal(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, double) const",
+		"go":	"(*Reader).GetReal"
+	}, {
+		"mangle":	"_ZNK9INIReader8HasValueERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_",
+		"c++":	"INIReader::HasValue(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&) const",
+		"go":	"(*Reader).HasValue"
+	}, {
+		"mangle":	"_ZNK9INIReader9GetStringERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_S8_",
+		"c++":	"INIReader::GetString(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&) const",
+		"go":	"(*Reader).GetString"
+	}]

chore/gogensig/config/_testinput/llcppg.symb.txt

@@ -0,0 +1,61 @@
+[{
+		:	"_ZN9INIReader12ValueHandlerEPvPKcS2_S2_",
+		"c++":	"INIReader::ValueHandler(void*, char const*, char const*, char const*)",
+		"go":	"(*Reader).ValueHandler"
+	}, {
+		"mangle":	"_ZN9INIReader7MakeKeyERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_",
+		"c++":	"INIReader::MakeKey(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&)",
+		"go":	"(*Reader).MakeKey"
+	}, {
+		"mangle":	"_ZN9INIReaderC1EPKcm",
+		"c++":	"INIReader::INIReader(char const*, unsigned long)",
+		"go":	"(*Reader).Init__1"
+	}, {
+		"mangle":	"_ZN9INIReaderC1ERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE",
+		"c++":	"INIReader::INIReader(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&)",
+		"go":	"(*Reader).Init"
+	}, {
+		"mangle":	"_ZNK9INIReader10GetBooleanERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_b",
+		"c++":	"INIReader::GetBoolean(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, bool) const",
+		"go":	"(*Reader).GetBoolean"
+	}, {
+		"mangle":	"_ZNK9INIReader10GetIntegerERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_l",
+		"c++":	"INIReader::GetInteger(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, long) const",
+		"go":	"(*Reader).GetInteger"
+	}, {
+		"mangle":	"_ZNK9INIReader10HasSectionERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE",
+		"c++":	"INIReader::HasSection(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&) const",
+		"go":	"(*Reader).HasSection"
+	}, {
+		"mangle":	"_ZNK9INIReader10ParseErrorEv",
+		"c++":	"INIReader::ParseError() const",
+		"go":	"(*Reader).ParseError"
+	}, {
+		"mangle":	"_ZNK9INIReader11GetUnsignedERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_m",
+		"c++":	"INIReader::GetUnsigned(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, unsigned long) const",
+		"go":	"(*Reader).GetUnsigned"
+	}, {
+		"mangle":	"_ZNK9INIReader12GetInteger64ERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_x",
+		"c++":	"INIReader::GetInteger64(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, long long) const",
+		"go":	"(*Reader).GetInteger64"
+	}, {
+		"mangle":	"_ZNK9INIReader13GetUnsigned64ERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_y",
+		"c++":	"INIReader::GetUnsigned64(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, unsigned long long) const",
+		"go":	"(*Reader).GetUnsigned64"
+	}, {
+		"mangle":	"_ZNK9INIReader3GetERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_S8_",
+		"c++":	"INIReader::Get(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&) const",
+		"go":	"(*Reader).Get"
+	}, {
+		"mangle":	"_ZNK9INIReader7GetRealERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_d",
+		"c++":	"INIReader::GetReal(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, double) const",
+		"go":	"(*Reader).GetReal"
+	}, {
+		"mangle":	"_ZNK9INIReader8HasValueERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_",
+		"c++":	"INIReader::HasValue(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&) const",
+		"go":	"(*Reader).HasValue"
+	}, {
+		"mangle":	"_ZNK9INIReader9GetStringERKNSt3__112basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEES8_S8_",
+		"c++":	"INIReader::GetString(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&) const",
+		"go":	"(*Reader).GetString"
+	}]