Ensure we still do the nativeTypeName == remappedName check in all paths

Author: tannergooding

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs

@@ -635,7 +635,6 @@ private void VisitIndirectFieldDecl(IndirectFieldDecl indirectFieldDecl)
             }
 
             var fieldDecl = indirectFieldDecl.AnonField;
-            var tmpName = GetRemappedCursorName(fieldDecl);
             var anonymousRecordDecl = fieldDecl.Parent;
 
             var rootRecordDecl = anonymousRecordDecl;
@@ -861,7 +860,7 @@ private void VisitIndirectFieldDecl(IndirectFieldDecl indirectFieldDecl)
             _outputBuilder.WriteDivider();
         }
 
-        private void VisitLabelDecl(LabelDecl labelDecl)
+        private static void VisitLabelDecl(LabelDecl labelDecl)
         {
             // This should have already been handled as a statement
         }

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs

@@ -1190,79 +1190,77 @@ private string GetRemappedTypeName(Cursor cursor, Cursor context, Type type, out
             var name = GetTypeName(cursor, context, type, out nativeTypeName);
             var remappedName = GetRemappedName(name, cursor, tryRemapOperatorName: false, out var wasRemapped);
 
-            if (wasRemapped)
+            if (!wasRemapped)
             {
-                return remappedName;
-            }
+                var canonicalType = type.CanonicalType;
 
-            var canonicalType = type.CanonicalType;
-
-            if ((canonicalType is ConstantArrayType constantArrayType) && (constantArrayType.ElementType is RecordType))
-            {
-                canonicalType = constantArrayType.ElementType;
-            }
-
-            if ((canonicalType is RecordType recordType) && remappedName.StartsWith("__AnonymousRecord_"))
-            {
-                var recordDecl = recordType.Decl;
-                remappedName = "_Anonymous";
+                if ((canonicalType is ConstantArrayType constantArrayType) && (constantArrayType.ElementType is RecordType))
+                {
+                    canonicalType = constantArrayType.ElementType;
+                }
 
-                if (recordDecl.Parent is RecordDecl parentRecordDecl)
+                if ((canonicalType is RecordType recordType) && remappedName.StartsWith("__AnonymousRecord_"))
                 {
-                    var matchingField = parentRecordDecl.Fields.Where((fieldDecl) => fieldDecl.Type.CanonicalType == recordType).FirstOrDefault();
+                    var recordDecl = recordType.Decl;
+                    remappedName = "_Anonymous";
 
-                    if (matchingField != null)
+                    if (recordDecl.Parent is RecordDecl parentRecordDecl)
                     {
-                        remappedName = "_";
-                        remappedName += GetRemappedCursorName(matchingField);
-                    }
-                    else
-                    {
-                        var index = 0;
+                        var matchingField = parentRecordDecl.Fields.Where((fieldDecl) => fieldDecl.Type.CanonicalType == recordType).FirstOrDefault();
 
-                        if (parentRecordDecl.AnonymousRecords.Count > 1)
+                        if (matchingField != null)
                         {
-                            index = parentRecordDecl.AnonymousRecords.IndexOf(cursor) + 1;
+                            remappedName = "_";
+                            remappedName += GetRemappedCursorName(matchingField);
                         }
-
-                        while (parentRecordDecl.IsAnonymousStructOrUnion && (parentRecordDecl.IsUnion == recordType.Decl.IsUnion))
+                        else
                         {
-                            index += 1;
+                            var index = 0;
 
-                            if (parentRecordDecl.Parent is RecordDecl parentRecordDeclParent)
+                            if (parentRecordDecl.AnonymousRecords.Count > 1)
                             {
-                                if (parentRecordDeclParent.AnonymousRecords.Count > 0)
+                                index = parentRecordDecl.AnonymousRecords.IndexOf(cursor) + 1;
+                            }
+
+                            while (parentRecordDecl.IsAnonymousStructOrUnion && (parentRecordDecl.IsUnion == recordType.Decl.IsUnion))
+                            {
+                                index += 1;
+
+                                if (parentRecordDecl.Parent is RecordDecl parentRecordDeclParent)
                                 {
-                                    index += parentRecordDeclParent.AnonymousRecords.Count - 1;
+                                    if (parentRecordDeclParent.AnonymousRecords.Count > 0)
+                                    {
+                                        index += parentRecordDeclParent.AnonymousRecords.Count - 1;
+                                    }
+                                    parentRecordDecl = parentRecordDeclParent;
                                 }
-                                parentRecordDecl = parentRecordDeclParent;
                             }
-                        }
 
-                        if (index != 0)
-                        {
-                            remappedName += index.ToString();
+                            if (index != 0)
+                            {
+                                remappedName += index.ToString();
+                            }
                         }
-                    } 
-                }
-
-                remappedName += $"_e__{(recordDecl.IsUnion ? "Union" : "Struct")}";
-            }
-            else if ((canonicalType is EnumType enumType) && remappedName.StartsWith("__AnonymousEnum_"))
-            {
-                remappedName = GetRemappedTypeName(enumType.Decl, context: null, enumType.Decl.IntegerType, out _);
-            }
-            else if (cursor is EnumDecl enumDecl)
-            {
-                var enumDeclName = GetRemappedCursorName(enumDecl);
+                    }
 
-                if (enumDecl.Enumerators.Any((enumConstantDecl) => IsForceDwordOrForceUInt(enumDeclName, enumConstantDecl)))
+                    remappedName += $"_e__{(recordDecl.IsUnion ? "Union" : "Struct")}";
+                }
+                else if ((canonicalType is EnumType enumType) && remappedName.StartsWith("__AnonymousEnum_"))
                 {
-                    remappedName = "uint";
+                    remappedName = GetRemappedTypeName(enumType.Decl, context: null, enumType.Decl.IntegerType, out _);
                 }
+                else if (cursor is EnumDecl enumDecl)
+                {
+                    var enumDeclName = GetRemappedCursorName(enumDecl);
 
-                WithType("*", ref remappedName, ref nativeTypeName);
-                WithType(enumDeclName, ref remappedName, ref nativeTypeName);
+                    if (enumDecl.Enumerators.Any((enumConstantDecl) => IsForceDwordOrForceUInt(enumDeclName, enumConstantDecl)))
+                    {
+                        remappedName = "uint";
+                    }
+
+                    WithType("*", ref remappedName, ref nativeTypeName);
+                    WithType(enumDeclName, ref remappedName, ref nativeTypeName);
+                }
             }
 
             if (nativeTypeName.Equals(remappedName) || nativeTypeName.Replace(" ", "").Equals(remappedName))