Fixing various bugs, analyzer warnings, and adding very basic template support

README.md

@@ -217,6 +217,8 @@ Options:
                                            attributes.
   generate-macro-bindings                  Bindings for macro-definitions should be generated. This currently only
                                            works with value like macros and not function-like ones.
+  generate-template-bindings               Bindings for template-definitions should be generated. This is currently
+                                           experimental.
   generate-native-inheritance-attribute    [NativeInheritance("")] attribute should be generated to document the
                                            encountered C++ base type.
   generate-vtbl-index-attribute            [VtblIndex(#)] attribute should be generated to document the underlying

scripts/azure-windows.yml

@@ -31,6 +31,27 @@ jobs:
       PathtoPublish: artifacts/pkg/${{parameters.configuration}}
       ArtifactName: packages
       publishLocation: Container
+  - task: CopyFiles@2
+    displayName: 'Stage win32metadata bin artifacts'
+    condition: eq(${{parameters.testwin32metadata}}, true)
+    inputs:
+      sourceFolder: artifacts/win32metadata
+      contents: '**/bin/**'
+      targetFolder: $(Build.ArtifactStagingDirectory)
+  - task: CopyFiles@2
+    displayName: 'Stage win32metadata obj artifacts'
+    condition: eq(${{parameters.testwin32metadata}}, true)
+    inputs:
+      sourceFolder: artifacts/win32metadata
+      contents: '**/obj/**'
+      targetFolder: $(Build.ArtifactStagingDirectory)
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish win32metadata Artifacts'
+    condition: eq(${{parameters.testwin32metadata}}, true)
+    inputs:
+      PathtoPublish: $(Build.ArtifactStagingDirectory)
+      ArtifactName: win32metadata
+      publishLocation: Container
   variables:
     EXCLUDE_BUILDNUMBER_FROM_PACKAGE: ${{parameters.EXCLUDE_BUILDNUMBER_FROM_PACKAGE}}
     OVERRIDE_RUNTIME_IDENTIFIER: ${{parameters.OVERRIDE_RUNTIME_IDENTIFIER}}

sources/ClangSharp.PInvokeGenerator/Abstractions/FunctionOrDelegateDesc.cs

@@ -18,98 +18,181 @@ internal struct FunctionOrDelegateDesc<TCustomAttrGeneratorData>
 
         public bool IsVirtual
         {
-            get => (Flags & FunctionOrDelegateFlags.IsVirtual) != 0;
-            set => Flags =
-                value ? Flags | FunctionOrDelegateFlags.IsVirtual : Flags & ~FunctionOrDelegateFlags.IsVirtual;
+            get
+            {
+                return (Flags & FunctionOrDelegateFlags.IsVirtual) != 0;
+            }
+
+            set
+            {
+                Flags = value ? Flags | FunctionOrDelegateFlags.IsVirtual : Flags & ~FunctionOrDelegateFlags.IsVirtual;
+            }
         }
 
         public bool IsDllImport
         {
-            get => (Flags & FunctionOrDelegateFlags.IsDllImport) != 0;
-            set => Flags = value
-                ? Flags | FunctionOrDelegateFlags.IsDllImport
-                : Flags & ~FunctionOrDelegateFlags.IsDllImport;
+            get
+            {
+                return (Flags & FunctionOrDelegateFlags.IsDllImport) != 0;
+            }
+
+            set
+            {
+                Flags = value
+                      ? Flags | FunctionOrDelegateFlags.IsDllImport
+                      : Flags & ~FunctionOrDelegateFlags.IsDllImport;
+            }
         }
 
         public bool HasFnPtrCodeGen
         {
-            get => (Flags & FunctionOrDelegateFlags.HasFnPtrCodeGen) != 0;
-            set => Flags = value
-                ? Flags | FunctionOrDelegateFlags.HasFnPtrCodeGen
-                : Flags & ~FunctionOrDelegateFlags.HasFnPtrCodeGen;
+            get
+            {
+                return (Flags & FunctionOrDelegateFlags.HasFnPtrCodeGen) != 0;
+            }
+
+            set
+            {
+                Flags = value
+                      ? Flags | FunctionOrDelegateFlags.HasFnPtrCodeGen
+                      : Flags & ~FunctionOrDelegateFlags.HasFnPtrCodeGen;
+            }
         }
 
         public bool IsAggressivelyInlined
         {
-            get => (Flags & FunctionOrDelegateFlags.IsAggressivelyInlined) != 0;
-            set => Flags = value
-                ? Flags | FunctionOrDelegateFlags.IsAggressivelyInlined
-                : Flags & ~FunctionOrDelegateFlags.IsAggressivelyInlined;
+            get
+            {
+                return (Flags & FunctionOrDelegateFlags.IsAggressivelyInlined) != 0;
+            }
+
+            set
+            {
+                Flags = value
+                      ? Flags | FunctionOrDelegateFlags.IsAggressivelyInlined
+                      : Flags & ~FunctionOrDelegateFlags.IsAggressivelyInlined;
+            }
         }
 
         public bool SetLastError
         {
-            get => (Flags & FunctionOrDelegateFlags.SetLastError) != 0;
-            set => Flags = value
-                ? Flags | FunctionOrDelegateFlags.SetLastError
-                : Flags & ~FunctionOrDelegateFlags.SetLastError;
+            get
+            {
+                return (Flags & FunctionOrDelegateFlags.SetLastError) != 0;
+            }
+
+            set
+            {
+                Flags = value
+                      ? Flags | FunctionOrDelegateFlags.SetLastError
+                      : Flags & ~FunctionOrDelegateFlags.SetLastError;
+            }
         }
 
         public bool IsCxx
         {
-            get => (Flags & FunctionOrDelegateFlags.IsCxx) != 0;
-            set => Flags = value ? Flags | FunctionOrDelegateFlags.IsCxx : Flags & ~FunctionOrDelegateFlags.IsCxx;
+            get
+            {
+                return (Flags & FunctionOrDelegateFlags.IsCxx) != 0;
+            }
+
+            set
+            {
+                Flags = value ? Flags | FunctionOrDelegateFlags.IsCxx : Flags & ~FunctionOrDelegateFlags.IsCxx;
+            }
         }
 
         public bool NeedsNewKeyword
         {
-            get => (Flags & FunctionOrDelegateFlags.NeedsNewKeyword) != 0;
-            set => Flags = value
-                ? Flags | FunctionOrDelegateFlags.NeedsNewKeyword
-                : Flags & ~FunctionOrDelegateFlags.NeedsNewKeyword;
+            get
+            {
+                return (Flags & FunctionOrDelegateFlags.NeedsNewKeyword) != 0;
+            }
+
+            set
+            {
+                Flags = value
+                      ? Flags | FunctionOrDelegateFlags.NeedsNewKeyword
+                      : Flags & ~FunctionOrDelegateFlags.NeedsNewKeyword;
+            }
         }
 
         public bool IsUnsafe
         {
-            get => (Flags & FunctionOrDelegateFlags.IsUnsafe) != 0;
-            set => Flags = value ? Flags | FunctionOrDelegateFlags.IsUnsafe : Flags & ~FunctionOrDelegateFlags.IsUnsafe;
+            get
+            {
+                return (Flags & FunctionOrDelegateFlags.IsUnsafe) != 0;
+            }
+
+            set
+            {
+                Flags = value ? Flags | FunctionOrDelegateFlags.IsUnsafe : Flags & ~FunctionOrDelegateFlags.IsUnsafe;
+            }
         }
 
         public bool IsCtxCxxRecord
         {
-            get => (Flags & FunctionOrDelegateFlags.IsCtxCxxRecord) != 0;
-            set => Flags = value
-                ? Flags | FunctionOrDelegateFlags.IsCtxCxxRecord
-                : Flags & ~FunctionOrDelegateFlags.IsCtxCxxRecord;
+            get
+            {
+                return (Flags & FunctionOrDelegateFlags.IsCtxCxxRecord) != 0;
+            }
+
+            set
+            {
+                Flags = value
+                      ? Flags | FunctionOrDelegateFlags.IsCtxCxxRecord
+                      : Flags & ~FunctionOrDelegateFlags.IsCtxCxxRecord;
+            }
         }
 
         public bool IsCxxRecordCtxUnsafe
         {
-            get => (Flags & FunctionOrDelegateFlags.IsCxxRecordCtxUnsafe) != 0;
-            set => Flags = value
-                ? Flags | FunctionOrDelegateFlags.IsCxxRecordCtxUnsafe
-                : Flags & ~FunctionOrDelegateFlags.IsCxxRecordCtxUnsafe;
+            get
+            {
+                return (Flags & FunctionOrDelegateFlags.IsCxxRecordCtxUnsafe) != 0;
+            }
+
+            set
+            {
+                Flags = value
+                      ? Flags | FunctionOrDelegateFlags.IsCxxRecordCtxUnsafe
+                      : Flags & ~FunctionOrDelegateFlags.IsCxxRecordCtxUnsafe;
+            }
         }
 
         public bool IsMemberFunction
         {
-            get => (Flags & FunctionOrDelegateFlags.IsMemberFunction) != 0;
-            set => Flags = value
-                ? Flags | FunctionOrDelegateFlags.IsMemberFunction
-                : Flags & ~FunctionOrDelegateFlags.IsMemberFunction;
+            get
+            {
+                return (Flags & FunctionOrDelegateFlags.IsMemberFunction) != 0;
+            }
+
+            set
+            {
+                Flags = value
+                      ? Flags | FunctionOrDelegateFlags.IsMemberFunction
+                      : Flags & ~FunctionOrDelegateFlags.IsMemberFunction;
+            }
         }
 
         public bool? IsStatic
         {
-            get => (Flags & FunctionOrDelegateFlags.IsStatic) != 0 ? true :
-                (Flags & FunctionOrDelegateFlags.IsNotStatic) != 0 ? false : null;
-            set => Flags = value switch
-            {
-                // true - static, false - not static, null - infer
-                true => Flags | FunctionOrDelegateFlags.IsStatic & ~FunctionOrDelegateFlags.IsNotStatic,
-                false => Flags & ~FunctionOrDelegateFlags.IsStatic | FunctionOrDelegateFlags.IsNotStatic,
-                null => Flags & ~FunctionOrDelegateFlags.IsStatic & ~FunctionOrDelegateFlags.IsNotStatic
-            };
+            get
+            {
+                return (Flags & FunctionOrDelegateFlags.IsStatic) != 0
+                     ? true
+                     : (Flags & FunctionOrDelegateFlags.IsNotStatic) != 0 ? false : null;
+            }
+
+            set
+            {
+                Flags = value switch {
+                    // true - static, false - not static, null - infer
+                    true => Flags | (FunctionOrDelegateFlags.IsStatic & ~FunctionOrDelegateFlags.IsNotStatic),
+                    false => (Flags & ~FunctionOrDelegateFlags.IsStatic) | FunctionOrDelegateFlags.IsNotStatic,
+                    null => Flags & ~FunctionOrDelegateFlags.IsStatic & ~FunctionOrDelegateFlags.IsNotStatic
+                };
+            }
         }
 
         public Action<TCustomAttrGeneratorData> WriteCustomAttrs { get; set; }

sources/ClangSharp.PInvokeGenerator/Abstractions/StructDesc.cs

@@ -17,14 +17,28 @@ internal struct StructDesc<TCustomAttrGeneratorData>
 
         public bool IsUnsafe
         {
-            get => (Flags & StructFlags.IsUnsafe) != 0;
-            set => Flags = value ? Flags | StructFlags.IsUnsafe : Flags & ~StructFlags.IsUnsafe;
+            get
+            {
+                return (Flags & StructFlags.IsUnsafe) != 0;
+            }
+
+            set
+            {
+                Flags = value ? Flags | StructFlags.IsUnsafe : Flags & ~StructFlags.IsUnsafe;
+            }
         }
 
         public bool HasVtbl
         {
-            get => (Flags & StructFlags.HasVtbl) != 0;
-            set => Flags = value ? Flags | StructFlags.HasVtbl : Flags & ~StructFlags.HasVtbl;
+            get
+            {
+                return (Flags & StructFlags.HasVtbl) != 0;
+            }
+
+            set
+            {
+                Flags = value ? Flags | StructFlags.HasVtbl : Flags & ~StructFlags.HasVtbl;
+            }
         }
 
         public Action<TCustomAttrGeneratorData> WriteCustomAttrs { get; set; }

sources/ClangSharp.PInvokeGenerator/CSharp/CSharpOutputBuilder.Visit.cs

@@ -47,10 +47,7 @@ public void WriteDivider(bool force = false)
             }
         }
 
-        public void SuppressDivider()
-        {
-            NeedsNewline = false;
-        }
+        public void SuppressDivider() => NeedsNewline = false;
 
         public void WriteIid(string iidName, string iidValue)
         {