Fix inlined union with field name (#67)

xoofx · Dec 1, 2022 · 0095344 · 0095344
1 parent d0e90c7
commit 0095344
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/CppAst.Tests/TestStructs.cs b/src/CppAst.Tests/TestStructs.cs
@@ -191,7 +191,7 @@ struct HelloWorld
                         Assert.AreEqual(2, cppStruct.Fields.Count);
 
                         // Check the union
-                        Assert.AreEqual(string.Empty, cppStruct.Fields[1].Name);
+                        Assert.AreEqual("e", cppStruct.Fields[1].Name);
                         Assert.IsInstanceOf<CppClass>(cppStruct.Fields[1].Type);
                         var cppUnion = ((CppClass)cppStruct.Fields[1].Type);
                         Assert.AreEqual(CppClassKind.Union, ((CppClass)cppStruct.Fields[1].Type).ClassKind);

diff --git a/src/CppAst/CppModelBuilder.cs b/src/CppAst/CppModelBuilder.cs
@@ -769,6 +769,7 @@ private CppField VisitFieldOrVariable(CppContainerContext containerContext, CXCu
             if (previousField != null && previousField.IsAnonymous && ReferenceEquals(previousField.Type, type))
             {
                 cppField = previousField;
+                cppField.Name = fieldName;
                 cppField.Offset = cursor.OffsetOfField / 8;
             }
             else