Add libstatic configuration support for reading symbols from static libraries

_xtool/llcppsymg/internal/symg/lib_test.go

@@ -165,7 +165,7 @@ func TestGenDylibPaths(t *testing.T) {
 			}
 
 			if err != nil {
-				t.Fatalf("expected no error, got %w", err)
+				t.Fatalf("expected no error, got %v", err)
 			}
 
 			if !reflect.DeepEqual(notFounds, tc.wantNotFound) {
@@ -188,3 +188,85 @@ func TestGenDylibPaths(t *testing.T) {
 
 	}
 }
+
+func TestLibModeConfiguration(t *testing.T) {
+	testCases := []struct {
+		name     string
+		libName  string
+		mode     symbol.Mode
+		expected string // expected file extension
+	}{
+		{
+			name:     "Dynamic library mode",
+			libName:  "test",
+			mode:     symbol.ModeDynamic,
+			expected: getExpectedDynamicExt(),
+		},
+		{
+			name:     "Static library mode",
+			libName:  "test",
+			mode:     symbol.ModeStatic,
+			expected: ".a",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			tempDir, err := os.MkdirTemp("", "libmode_test")
+			if err != nil {
+				t.Fatal(err)
+			}
+			defer os.RemoveAll(tempDir)
+
+			// Create the expected library file
+			expectedFileName := fmt.Sprintf("lib%s%s", tc.libName, tc.expected)
+			expectedPath := filepath.Join(tempDir, expectedFileName)
+
+			file, err := os.Create(expectedPath)
+			if err != nil {
+				t.Fatalf("Failed to create test file %s: %v", expectedPath, err)
+			}
+			file.Close()
+
+			// Test that the library can be found with the correct mode
+			foundPath, err := symbol.FindLibFile(tempDir, tc.libName, tc.mode)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if foundPath != expectedPath {
+				t.Errorf("Expected path %s, got %s", expectedPath, foundPath)
+			}
+
+			// Test that the Libs.Files method respects the mode
+			libs := &symg.Libs{
+				Paths: []string{tempDir},
+				Names: []string{tc.libName},
+			}
+
+			foundPaths, notFound, err := libs.Files([]string{}, tc.mode)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if len(notFound) > 0 {
+				t.Errorf("Expected no missing libraries, but found: %v", notFound)
+			}
+
+			if len(foundPaths) != 1 {
+				t.Errorf("Expected 1 library path, got %d", len(foundPaths))
+			}
+
+			if foundPaths[0] != expectedPath {
+				t.Errorf("Expected path %s, got %s", expectedPath, foundPaths[0])
+			}
+		})
+	}
+}
+
+func getExpectedDynamicExt() string {
+	if runtime.GOOS == "linux" {
+		return ".so"
+	}
+	return ".dylib"
+}

_xtool/llcppsymg/internal/symg/symg.go

@@ -37,11 +37,11 @@ type Config struct {
 	TrimPrefixes []string
 	SymMap       map[string]string
 	IsCpp        bool
-	libMode      LibMode
+	LibMode      LibMode
 }
 
 func Do(conf *Config) (symbolTable []*llcppg.SymbolInfo, err error) {
-	symbols, err := fetchSymbols(conf.Libs, conf.libMode)
+	symbols, err := fetchSymbols(conf.Libs, conf.LibMode)
 	if err != nil {
 		return
 	}

_xtool/llcppsymg/llcppsymg.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/goplus/llcppg/_xtool/internal/symbol"
 	"github.com/goplus/llcppg/_xtool/llcppsymg/internal/symg"
 	llcppg "github.com/goplus/llcppg/config"
 	args "github.com/goplus/llcppg/internal/arg"
@@ -64,6 +65,11 @@ func main() {
 		fmt.Fprintln(os.Stderr, "Failed to parse config file:", ags.CfgFile)
 	}
 
+	libMode := symbol.ModeDynamic
+	if conf.LibStatic {
+		libMode = symbol.ModeStatic
+	}
+
 	symbolTable, err := symg.Do(&symg.Config{
 		Libs:         conf.Libs,
 		CFlags:       conf.CFlags,
@@ -72,6 +78,7 @@ func main() {
 		TrimPrefixes: conf.TrimPrefixes,
 		SymMap:       conf.SymMap,
 		IsCpp:        conf.Cplusplus,
+		LibMode:      libMode,
 	})
 	check(err)
 

config/config.go

@@ -33,6 +33,7 @@ type Config struct {
 	Mix            bool              `json:"mix,omitempty"`
 	SymMap         map[string]string `json:"symMap,omitempty"`
 	TypeMap        map[string]string `json:"typeMap,omitempty"`
+	LibStatic      bool              `json:"libstatic,omitempty"`
 }
 
 func NewDefault() *Config {

config/config_test.go

@@ -120,6 +120,25 @@ func TestGetConfByByte(t *testing.T) {
 			mode: useStdin,
 		},
 
+		{
+			name: "Static library configuration",
+			input: `{
+		  "name": "mylib",
+		  "cflags": "-I/opt/homebrew/include",
+		  "include": ["mylib.h"],
+		  "libs": "-L/opt/homebrew/lib -lmylib",
+		  "libstatic": true
+		}`,
+			expect: llconfig.Config{
+				Name:      "mylib",
+				CFlags:    "-I/opt/homebrew/include",
+				Include:   []string{"mylib.h"},
+				Libs:      "-L/opt/homebrew/lib -lmylib",
+				LibStatic: true,
+			},
+			mode: useFile,
+		},
+
 		{
 			name:      "Invalid JSON",
 			input:     `{invalid json}`,

parser/testdata/func/hfile/forwarddecl.h.i

@@ -0,0 +1,10 @@
+# 1 "/home/runner/work/llcppg/llcppg/parser/testdata/func/hfile/forwarddecl.h"
+# 1 "<built-in>" 1
+# 1 "<built-in>" 3
+# 453 "<built-in>" 3
+# 1 "<command line>" 1
+# 1 "<built-in>" 2
+# 1 "/home/runner/work/llcppg/llcppg/parser/testdata/func/hfile/forwarddecl.h" 2
+void foo0();
+void foo1(int a);
+void foo2(int a,...);