Fix forward typedef declaration

Author: xoofx

src/CppAst.Tests/TestFunctions.cs

@@ -160,6 +160,39 @@ typedef struct struct0 {
         }
 
 
+        [Test]
+        public void TestFunctionTypedefFields()
+        {
+            ParseAssert(@"
+typedef struct struct0 struct0;
+typedef void (*function0_t)(int a, float b);
+typedef void (*function1_t)(char, int);
+struct struct0
+{
+    function0_t function0;
+    function1_t function1;
+};
+",
+                compilation =>
+                {
+                    Assert.False(compilation.HasErrors);
+
+                    var cls = compilation.Classes[0];
+                    Assert.AreEqual(2, cls.Fields.Count);
+
+                    {
+                        var cppType = cls.Fields[0].Type;
+                        Assert.AreEqual(CppTypeKind.Typedef, cppType.TypeKind);
+                    }
+
+                    {
+                        var cppType = cls.Fields[1].Type;
+                        Assert.AreEqual(CppTypeKind.Typedef, cppType.TypeKind);
+                    }
+                }
+            );
+        }
+
         [Test]
         public void TestFunctionExport()
         {

src/CppAst/CppModelBuilder.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Alexandre Mutel. All rights reserved.
+// Copyright (c) Alexandre Mutel. All rights reserved.
 // Licensed under the BSD-Clause 2 license.
 // See license.txt file in the project root for full license information.
 
@@ -84,7 +84,7 @@ private CppType TryToCreateTemplateParameters(CXCursor cursor, void* data)
             return null;
         }
 
-        private CppContainerContext GetOrCreateDeclarationContainer(CXCursor cursor, void* data)
+        private bool TryGetDeclarationContainer(CXCursor cursor, void* data, out string typeKey, out CppContainerContext containerContext)
         {
             while (cursor.Kind == CXCursorKind.CXCursor_LinkageSpec)
             {
@@ -97,8 +97,13 @@ private CppContainerContext GetOrCreateDeclarationContainer(CXCursor cursor, voi
                 typeAsCString = CXUtil.GetCursorDisplayName(cursor);
             }
             // Try to workaround anonymous types
-            var typeKey = $"{cursor.Kind}:{typeAsCString}{(cursor.IsAnonymous ? "/" + cursor.Hash : string.Empty)}";
-            if (_containers.TryGetValue(typeKey, out var containerContext))
+            typeKey = $"{cursor.Kind}:{typeAsCString}{(cursor.IsAnonymous ? "/" + cursor.Hash : string.Empty)}";
+            return _containers.TryGetValue(typeKey, out containerContext);
+        }
+
+        private CppContainerContext GetOrCreateDeclarationContainer(CXCursor cursor, void* data)
+        {
+            if (TryGetDeclarationContainer(cursor, data, out string typeKey, out var containerContext))
             {
                 return containerContext;
             }
@@ -127,7 +132,6 @@ private CppContainerContext GetOrCreateDeclarationContainer(CXCursor cursor, voi
                     break;
 
                 case CXCursorKind.CXCursor_EnumDecl:
-                    Debug.Assert(parent != null);
                     var cppEnum = new CppEnum(CXUtil.GetCursorSpelling(cursor))
                     {
                         IsAnonymous = cursor.IsAnonymous,
@@ -142,7 +146,6 @@ private CppContainerContext GetOrCreateDeclarationContainer(CXCursor cursor, voi
                 case CXCursorKind.CXCursor_ClassDecl:
                 case CXCursorKind.CXCursor_StructDecl:
                 case CXCursorKind.CXCursor_UnionDecl:
-                    Debug.Assert(parent != null);
                     var cppClass = new CppClass(CXUtil.GetCursorSpelling(cursor));
                     parentDeclarationContainer.Classes.Add(cppClass);
                     symbol = cppClass;
@@ -243,10 +246,15 @@ private CppContainerContext GetOrCreateDeclarationContainer(CXCursor cursor, voi
                 case CXCursorKind.CXCursor_TranslationUnit:
                 case CXCursorKind.CXCursor_UnexposedDecl:
                 case CXCursorKind.CXCursor_FirstInvalid:
+                    if (!_containers.ContainsKey(typeKey))
+                    {
+                        _containers.Add(typeKey, _rootContainerContext);
+                    }
                     return _rootContainerContext;
                 default:
                     Unhandled(cursor);
-                    break;
+                    // TODO: Workaround for now, as the container below would have an empty symbol
+                    goto case CXCursorKind.CXCursor_TranslationUnit;
             }
 
             containerContext = new CppContainerContext(symbol) { CurrentVisibility = defaultContainerVisibility };
@@ -1772,6 +1780,13 @@ private CppType VisitElaboratedDecl(CXCursor cursor, CXType type, CXCursor paren
                 return typeRef;
             }
 
+            // If the type has been already declared, return it immediately.
+            if (TryGetDeclarationContainer(cursor, data, out _, out var containerContext))
+            {
+                return (CppType)containerContext.Container;
+            }
+
+            // TODO: Pseudo fix, we are not supposed to land here, as the TryGet before should resolve an existing type already declared (but not necessarily defined)
             return GetCppType(type.CanonicalType.Declaration, type.CanonicalType, parent, data);
         }