preorder child list -> postorder traversal

Author: luoliwoshang

_xtool/internal/parser/parser.go

@@ -245,39 +245,18 @@ func (ct *Converter) visitTop(cursor, parent clang.Cursor) clang.ChildVisitResul
 
 	case clang.CursorClassDecl:
 		classDecl := ct.ProcessClassDecl(cursor)
+		// todo(zzy):class need consider nested struct situation
 		ct.file.Decls = append(ct.file.Decls, classDecl)
 		// class havent anonymous situation
 		ct.logln("visitTop: ProcessClassDecl END", classDecl.Name.Name)
 	case clang.CursorStructDecl:
-		structDecl := ct.ProcessStructDecl(cursor)
-
-		// Add extracted nested struct declarations first
-		for _, extractedDecl := range ct.extractedDecls {
-			ct.file.Decls = append(ct.file.Decls, extractedDecl)
-		}
-
-		ct.file.Decls = append(ct.file.Decls, structDecl)
+		decls := ct.ProcessStructDecl(cursor)
+		ct.file.Decls = append(ct.file.Decls, decls...)
 		ct.logf("visitTop: ProcessStructDecl END")
-		if structDecl.Name != nil {
-			ct.logln(structDecl.Name.Name)
-		} else {
-			ct.logln("ANONY")
-		}
 	case clang.CursorUnionDecl:
-		unionDecl := ct.ProcessUnionDecl(cursor)
-
-		// Add extracted nested struct declarations first
-		for _, extractedDecl := range ct.extractedDecls {
-			ct.file.Decls = append(ct.file.Decls, extractedDecl)
-		}
-
-		ct.file.Decls = append(ct.file.Decls, unionDecl)
+		decls := ct.ProcessUnionDecl(cursor)
+		ct.file.Decls = append(ct.file.Decls, decls...)
 		ct.logf("visitTop: ProcessUnionDecl END")
-		if unionDecl.Name != nil {
-			ct.logln(unionDecl.Name.Name)
-		} else {
-			ct.logln("ANONY")
-		}
 	case clang.CursorFunctionDecl, clang.CursorCXXMethod, clang.CursorConstructor, clang.CursorDestructor:
 		// Handle functions and class methods (including out-of-class method)
 		// Example: void MyClass::myMethod() { ... } out-of-class method
@@ -803,17 +782,32 @@ func (ct *Converter) extractNestedStructs(cursor clang.Cursor) {
 	})
 }
 
-func (ct *Converter) ProcessRecordDecl(cursor clang.Cursor) *ast.TypeDecl {
+func (ct *Converter) ProcessRecordDecl(cursor clang.Cursor) []ast.Decl {
+	var decls []ast.Decl
 	ct.incIndent()
 	defer ct.decIndent()
 	cursorName, cursorKind := getCursorDesc(cursor)
 	ct.logln("ProcessRecordDecl: CursorName:", cursorName, "CursorKind:", cursorKind)
 
-	// Clear extracted decls before processing this record
-	ct.extractedDecls = ct.extractedDecls[:0]
+	childs := GetChilds(cursor, func(child, parent clang.Cursor) bool {
+		return (child.Kind == clang.CursorStructDecl || child.Kind == clang.CursorUnionDecl) && child.IsAnonymous() == 0
+	})
 
-	// Extract nested struct declarations first
-	ct.extractNestedStructs(cursor)
+	for _, child := range childs {
+
+		// Check if this is a named nested struct/union
+		typ := ct.ProcessRecordType(child)
+		// note(zzy):use len(typ.Fields.List) to ensure it has fields not a forward declaration
+		// but maybe make the forward decl in to AST is also good.
+		if child.IsAnonymous() == 0 && len(typ.Fields.List) > 0 {
+			childName := clang.GoString(child.String())
+			ct.logln("Found named nested struct:", childName, child.Type().Kind)
+			decls = append(decls, &ast.TypeDecl{
+				Object: ct.CreateObject(child, &ast.Ident{Name: childName}),
+				Type:   ct.ProcessRecordType(child),
+			})
+		}
+	}
 
 	decl := &ast.TypeDecl{
 		Object: ct.CreateObject(cursor, nil),
@@ -828,14 +822,16 @@ func (ct *Converter) ProcessRecordDecl(cursor clang.Cursor) *ast.TypeDecl {
 		ct.logln("ProcessRecordDecl: is anonymous")
 	}
 
-	return decl
+	decls = append(decls, decl)
+
+	return decls
 }
 
-func (ct *Converter) ProcessStructDecl(cursor clang.Cursor) *ast.TypeDecl {
+func (ct *Converter) ProcessStructDecl(cursor clang.Cursor) []ast.Decl {
 	return ct.ProcessRecordDecl(cursor)
 }
 
-func (ct *Converter) ProcessUnionDecl(cursor clang.Cursor) *ast.TypeDecl {
+func (ct *Converter) ProcessUnionDecl(cursor clang.Cursor) []ast.Decl {
 	return ct.ProcessRecordDecl(cursor)
 }
 

_xtool/internal/parser/parser_test.go

@@ -19,19 +19,19 @@ import (
 	"github.com/goplus/llgo/xtool/clang/preprocessor"
 )
 
-func TestParser(t *testing.T) {
+func TestParserCppMode(t *testing.T) {
 	cases := []string{"class", "comment", "enum", "func", "scope", "struct", "typedef", "union", "macro", "forwarddecl1", "forwarddecl2", "include", "typeof"}
 	// https://github.com/goplus/llgo/issues/1114
 	// todo(zzy):use os.ReadDir
 	for _, folder := range cases {
 		t.Run(folder, func(t *testing.T) {
-			testFrom(t, filepath.Join("testdata", folder), "temp.h", true, true)
+			testFrom(t, filepath.Join("testdata", folder), "temp.h", true, false)
 		})
 	}
 }
 
-func TestParserC(t *testing.T) {
-	cases := []string{"tt"}
+func TestParserCMode(t *testing.T) {
+	cases := []string{"named_nested_struct"}
 	for _, folder := range cases {
 		t.Run(folder, func(t *testing.T) {
 			testFrom(t, filepath.Join("testdata", folder), "temp.h", false, false)
@@ -628,7 +628,7 @@ func compareOutput(t *testing.T, expected, actual string) {
 	}
 }
 
-func TestNest(t *testing.T) {
+func TestGetChilds(t *testing.T) {
 	config := &clangutils.Config{
 		File:  "./testdata/named_nested_struct/temp.h",
 		Temp:  false,