Update ClangSharp to 16.0.0 (#83)

* Update ClangSharp to 16.0.0

* FIX tests to handle squash in new way.

Author: amerkoleci

src/CppAst.Tests/InlineTestBase.cs

@@ -10,7 +10,7 @@ public void ParseAssert(string text, Action<CppCompilation> assertCompilation, C
         {
             if (assertCompilation == null) throw new ArgumentNullException(nameof(assertCompilation));
 
-            options = options ?? new CppParserOptions();
+            options ??= new CppParserOptions();
             var currentDirectory = Environment.CurrentDirectory;
             var headerFilename = $"{TestContext.CurrentContext.Test.FullName}-{TestContext.CurrentContext.Test.ID}.h";
             var headerFile = Path.Combine(currentDirectory, headerFilename);

src/CppAst.Tests/TestTypeAliases.cs

@@ -102,7 +102,7 @@ public void TestSquash()
 
                     Assert.AreEqual(1, compilation.Classes.Count);
                     Assert.AreEqual(1, compilation.Typedefs.Count);
-                    Assert.AreEqual("", compilation.Classes[0].Name);
+                    Assert.AreEqual("MyStruct", compilation.Classes[0].Name);
                     Assert.AreEqual("MyStruct", compilation.Typedefs[0].Name);
                 },
                 new CppParserOptions() { AutoSquashTypedef = false }

src/CppAst.Tests/TestTypedefs.cs

@@ -102,7 +102,7 @@ typedef struct {
 
                     Assert.AreEqual(1, compilation.Classes.Count);
                     Assert.AreEqual(1, compilation.Typedefs.Count);
-                    Assert.AreEqual("", compilation.Classes[0].Name);
+                    Assert.AreEqual("MyStruct", compilation.Classes[0].Name);
                     Assert.AreEqual("MyStruct", compilation.Typedefs[0].Name);
                 },
                 new CppParserOptions() { AutoSquashTypedef = false }

src/CppAst/CppAst.csproj

@@ -27,11 +27,11 @@
     <None Include="../../img/cppast.png" Pack="true" PackagePath="/logo.png" />
     <None Include="../../readme.md" Pack="true" PackagePath="/" />
 
-    <PackageReference Include="ClangSharp" Version="15.0.2" />
+    <PackageReference Include="ClangSharp" Version="16.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="4.2.0">
+    <PackageReference Include="MinVer" Version="4.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

src/CppAst/CppModelBuilder.cs

@@ -182,7 +182,7 @@ private CppContainerContext GetOrCreateDeclarationContainer(CXCursor cursor, voi
                         {
                             cppClass.TemplateKind = CppTemplateKind.TemplateSpecializedClass;
                         }
-                       
+
 
                         //Just use low level api to call ClangSharp 
                         var tempArgsCount = cursor.NumTemplateArguments;
@@ -194,11 +194,11 @@ private CppContainerContext GetOrCreateDeclarationContainer(CXCursor cursor, voi
                             cppClass.TemplateParameters.Add(param);
                         }
 
-                        if(cppClass.TemplateKind == CppTemplateKind.TemplateSpecializedClass)
+                        if (cppClass.TemplateKind == CppTemplateKind.TemplateSpecializedClass)
                         {
                             Debug.Assert(cppClass.SpecializedTemplate.TemplateParameters.Count == tempArgsCount);
                         }
-                        
+
 
                         for (uint i = 0; i < tempArgsCount; i++)
                         {
@@ -323,44 +323,45 @@ private CXChildVisitResult VisitMember(CXCursor cursor, CXCursor parent, void* d
                 case CXCursorKind.CXCursor_ClassDecl:
                 case CXCursorKind.CXCursor_StructDecl:
                 case CXCursorKind.CXCursor_UnionDecl:
-                {
-                    bool isAnonymous = cursor.IsAnonymous;
-                    var cppClass = VisitClassDecl(cursor, data);
-                    // Empty struct/class/union declaration are considered as fields
-                    if (isAnonymous)
                     {
-                        Debug.Assert(string.IsNullOrEmpty(cppClass.Name));
-                        var containerContext = GetOrCreateDeclarationContainer(parent, data);
-
-                        // We try to recover the offset from the previous field
-                        // Might not be always correct (with alignment rules),
-                        // but not sure how to recover the offset without recalculating the entire offsets
-                        var offset = 0;
-                        var cppClassContainer = containerContext.Container as CppClass;
-                        if (cppClassContainer is object && cppClassContainer.Fields.Count > 0)
+                        bool isAnonymous = cursor.IsAnonymous;
+                        var cppClass = VisitClassDecl(cursor, data);
+                        // Empty struct/class/union declaration are considered as fields
+                        if (isAnonymous)
                         {
-                            var lastField = cppClassContainer.Fields[cppClassContainer.Fields.Count - 1];
-                            offset = (int)lastField.Offset + lastField.Type.SizeOf;
-                        }
+                            cppClass.Name = string.Empty;
+                            Debug.Assert(string.IsNullOrEmpty(cppClass.Name));
+                            var containerContext = GetOrCreateDeclarationContainer(parent, data);
+
+                            // We try to recover the offset from the previous field
+                            // Might not be always correct (with alignment rules),
+                            // but not sure how to recover the offset without recalculating the entire offsets
+                            var offset = 0;
+                            var cppClassContainer = containerContext.Container as CppClass;
+                            if (cppClassContainer is object && cppClassContainer.Fields.Count > 0)
+                            {
+                                var lastField = cppClassContainer.Fields[cppClassContainer.Fields.Count - 1];
+                                offset = (int)lastField.Offset + lastField.Type.SizeOf;
+                            }
 
-                        // Create an anonymous field for the type
-                        var cppField = new CppField(cppClass, string.Empty)
+                            // Create an anonymous field for the type
+                            var cppField = new CppField(cppClass, string.Empty)
+                            {
+                                Visibility = containerContext.CurrentVisibility,
+                                StorageQualifier = GetStorageQualifier(cursor),
+                                IsAnonymous = true,
+                                Offset = offset,
+                            };
+                            ParseAttributes(cursor, cppField, true);
+                            containerContext.DeclarationContainer.Fields.Add(cppField);
+                            element = cppField;
+                        }
+                        else
                         {
-                            Visibility = containerContext.CurrentVisibility,
-                            StorageQualifier = GetStorageQualifier(cursor),
-                            IsAnonymous = true,
-                            Offset = offset,
-                        };
-                        ParseAttributes(cursor, cppField, true);
-                        containerContext.DeclarationContainer.Fields.Add(cppField);
-                        element = cppField;
-                    }
-                    else
-                    {
-                        element = cppClass;
+                            element = cppClass;
+                        }
+                        break;
                     }
-                    break;
-                }
 
                 case CXCursorKind.CXCursor_EnumDecl:
                     element = VisitEnumDecl(cursor, data);
@@ -372,7 +373,7 @@ private CXChildVisitResult VisitMember(CXCursor cursor, CXCursor parent, void* d
 
                 case CXCursorKind.CXCursor_TypeAliasDecl:
                 case CXCursorKind.CXCursor_TypeAliasTemplateDecl:
-                    
+
                     element = VisitTypeAliasDecl(cursor, data);
                     break;
 
@@ -440,7 +441,7 @@ private CXChildVisitResult VisitMember(CXCursor cursor, CXCursor parent, void* d
 
                 var attrContainer = cppDeclaration as ICppAttributeContainer;
                 //Only handle commnet attribute when we need
-                if(attrContainer != null && ParseCommentAttributeEnabled)
+                if (attrContainer != null && ParseCommentAttributeEnabled)
                 {
                     TryToParseAttributesFromComment(cppDeclaration.Comment, attrContainer);
                 }
@@ -706,7 +707,7 @@ private CppMacro ParseMacro(CXCursor cursor)
             var tokens = tu.Tokenize(range);
 
             var name = GetCursorSpelling(cursor);
-            if(name.StartsWith("__cppast"))
+            if (name.StartsWith("__cppast"))
             {
                 //cppast system macros, just ignore here
                 return null;
@@ -1453,10 +1454,10 @@ private List<CppAttribute> ParseSystemAndAnnotateAttributeInCursor(CXCursor curs
                         }
                         break;
                     case CXCursorKind.CXCursor_FirstAttr:
-                        { 
+                        {
                             var attrKind = argCursor.AttrKind;
                             var attrKindSpelling = argCursor.AttrKindSpelling.ToLower();
-          
+
                             var attribute = new CppAttribute(attrKindSpelling, AttributeKind.CxxSystemAttribute)
                             {
                                 Span = sourceSpan,
@@ -1485,7 +1486,7 @@ private List<CppAttribute> ParseSystemAndAnnotateAttributeInCursor(CXCursor curs
                             collectAttributes.Add(attribute);
                         }
                         break;
-                
+
                     // Don't generate a warning for unsupported cursor
                     default:
                         break;
@@ -1501,17 +1502,17 @@ private void TryToParseAttributesFromComment(CppComment comment, ICppAttributeCo
         {
             if (comment == null) return;
 
-            if(comment is CppCommentText ctxt)
+            if (comment is CppCommentText ctxt)
             {
                 var txt = ctxt.Text.Trim();
-                if(txt.StartsWith("[[") && txt.EndsWith("]]"))
+                if (txt.StartsWith("[[") && txt.EndsWith("]]"))
                 {
                     attrContainer.Attributes.Add(new CppAttribute("comment", AttributeKind.CommentAttribute)
                     {
                         Arguments = txt,
                         Scope = "",
                         IsVariadic = false,
-                    }) ;
+                    });
                 }
             }
 
@@ -1545,16 +1546,16 @@ private void ParseAttributes(CXCursor cursor, ICppAttributeContainer attrContain
             }
 
             //Parse attributes contains in cursor
-            if(attrContainer is CppFunction)
+            if (attrContainer is CppFunction)
             {
                 var func = attrContainer as CppFunction;
                 CppTokenUtil.ParseFunctionAttributes(cursor, func.Name, ref tokenAttributes);
-            }   
+            }
             else
             {
                 CppTokenUtil.ParseCursorAttributs(cursor, ref tokenAttributes);
             }
-            
+
             attrContainer.TokenAttributes.AddRange(tokenAttributes);
         }
 
@@ -1572,7 +1573,7 @@ private CppType VisitTypeAliasDecl(CXCursor cursor, void* data)
             var kind = cursor.Kind;
 
             CXCursor usedCursor = cursor;
-            if(kind == CXCursorKind.CXCursor_TypeAliasTemplateDecl)
+            if (kind == CXCursorKind.CXCursor_TypeAliasTemplateDecl)
             {
                 usedCursor = cursor.TemplatedDecl;
             }
@@ -1644,7 +1645,8 @@ private CppType VisitTypeDefDecl(CXCursor cursor, void* data)
         private CppType VisitElaboratedDecl(CXCursor cursor, CXType type, CXCursor parent, void* data)
         {
             var fulltypeDefName = clang.getCursorUSR(cursor).CString;
-            if (_typedefs.TryGetValue(fulltypeDefName, out var typeRef)) {
+            if (_typedefs.TryGetValue(fulltypeDefName, out var typeRef))
+            {
                 return typeRef;
             }
 
@@ -1724,7 +1726,7 @@ private CppType GetCppTypeInternal(CXCursor cursor, CXType type, CXCursor parent
                     return CppPrimitiveType.UnsignedInt;
 
                 case CXTypeKind.CXType_ULong:
-                    return CppPrimitiveType.UnsignedInt;
+                    return type.SizeOf == 8 ? CppPrimitiveType.UnsignedLongLong : CppPrimitiveType.UnsignedInt;
 
                 case CXTypeKind.CXType_ULongLong:
                     return CppPrimitiveType.UnsignedLongLong;
@@ -1895,7 +1897,7 @@ private List<CppType> ParseTemplateSpecializedArguments(CXCursor cursor, CXType
             for (var templateIndex = 0; templateIndex < numTemplateArguments; ++templateIndex)
             {
                 var templateArg = type.GetTemplateArgument((uint)templateIndex);
-                
+
                 switch (templateArg.kind)
                 {
                     case CXTemplateArgumentKind.CXTemplateArgumentKind_Type: