fix: use refcnt check

Author: MeteorsLiu

_cmptest/testdata/libxml2/2.13.6/libxml2/llcppg.cfg

@@ -56,4 +56,4 @@
 	"symMap" :{
 		"attribute": "GetAttribute"
 	}
-}
+}

_xtool/internal/config/config.go

@@ -1,8 +1,11 @@
 package config
 
 import (
+	"maps"
 	"os"
 	"path/filepath"
+	"slices"
+	"sort"
 	"strings"
 
 	"github.com/goplus/lib/c/clang"
@@ -41,8 +44,6 @@ func PkgHfileInfo(includes []string, args []string, mix bool) *PkgHfilesInfo {
 	}
 	defer os.Remove(outfile.Name())
 
-	refMap := make(map[string]int, len(includes))
-
 	clangtool.ComposeIncludes(includes, outfile.Name())
 	index, unit, err := clangutils.CreateTranslationUnit(&clangutils.Config{
 		File: outfile.Name(),
@@ -55,40 +56,49 @@ func PkgHfileInfo(includes []string, args []string, mix bool) *PkgHfilesInfo {
 		panic(err)
 	}
 
+	var headers []string
+	inters := make(map[string]struct{})
+
 	clangutils.GetInclusions(unit, func(inced clang.File, incins []clang.SourceLocation) {
 		// not in the first level include maybe impl or third hfile
 		filename := filepath.Clean(clang.GoString(inced.FileName()))
 
-		if len(incins) == 1 {
-			info.Inters = append(info.Inters, filename)
+		// skip the composed header
+		if filename == outfile.Name() {
+			return
 		}
+		refcnt := len(incins)
 
-		ref, ok := refMap[filename]
-		if !ok {
-			refMap[filename] = len(incins)
-			return
+		for _, inc := range incins {
+			// if current header is included by composed header, can skip
+			if clang.GoString(inc.File().FileName()) == outfile.Name() {
+				refcnt--
+			}
+			// it's included by internal headers, can skip.
+			if _, ok := inters[filename]; ok {
+				refcnt--
+			}
 		}
-		// Handle duplicate references: Retain only the reference with the smallest source location.
-		// Example:
-		//   temp1.h: temp2 tempimpl.h
-		//   temp2.h: temp2
-		// The reference count for temp2.h should be 1 (not 2).
-		// If its count is 2, decrement it to 1.
-		if len(incins) < ref {
-			refMap[filename] = len(incins)
+
+		if refcnt == 0 {
+			inters[filename] = struct{}{}
 		}
+		headers = append(headers, filename)
 	})
 
+	info.Inters = slices.Collect(maps.Keys(inters))
+
+	sort.Strings(info.Inters)
+
 	absLongestPrefix, err := filepath.Abs(CommonParentDir(info.Inters))
 	if err != nil {
 		panic(err)
 	}
 
-	for filename, ref := range refMap {
-		if ref == 1 {
+	for _, filename := range headers {
+		if _, ok := inters[filename]; ok {
 			continue
 		}
-
 		if mix {
 			info.Thirds = append(info.Thirds, filename)
 			continue

_xtool/internal/config/config_test.go

@@ -18,8 +18,9 @@ import (
 
 func TestPkgHfileInfo(t *testing.T) {
 	cases := []struct {
-		conf *llconfig.Config
-		want *config.PkgHfilesInfo
+		conf           *llconfig.Config
+		want           *config.PkgHfilesInfo
+		skipThirdCheck bool
 	}{
 		{
 			conf: &llconfig.Config{
@@ -42,6 +43,18 @@ func TestPkgHfileInfo(t *testing.T) {
 				Impls:  []string{},
 			},
 		},
+		{
+			conf: &llconfig.Config{
+				CFlags:  "-I./testdata/impls",
+				Include: []string{"inter.h"},
+				Mix:     false,
+			},
+			want: &config.PkgHfilesInfo{
+				Inters: []string{"testdata/impls/inter.h"},
+				Impls:  []string{"testdata/impls/impl.h"},
+			},
+			skipThirdCheck: true,
+		},
 	}
 
 	for i, tc := range cases {
@@ -53,6 +66,9 @@ func TestPkgHfileInfo(t *testing.T) {
 			if !reflect.DeepEqual(info.Impls, tc.want.Impls) {
 				t.Fatalf("impl expected %v, but got %v", tc.want.Impls, info.Impls)
 			}
+			if tc.skipThirdCheck {
+				return
+			}
 
 			thirdhfile, err := filepath.Abs("./testdata/thirdhfile/third.h")
 			if err != nil {

_xtool/internal/config/testdata/impls/impl.h

@@ -0,0 +1,3 @@
+struct _foo {
+    long a;
+};

_xtool/internal/config/testdata/impls/inter.h

@@ -0,0 +1,3 @@
+#include "impl.h"
+
+typedef struct _foo foo;