Adding support for specifying a transparent struct kind

dotnet · Oct 31, 2021 · 1467b0b · 1467b0b
1 parent 7dd1e00
commit 1467b0b
Show file tree

Hide file tree

Showing 7 changed files with 343 additions and 56 deletions.
diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
@@ -2743,9 +2743,9 @@ private void VisitVarDecl(VarDecl varDecl)
                     {
                         flags |= ValueFlags.Copy;
                     }
-                    else if (_config.WithTransparentStructs.TryGetValue(typeName, out var transparentValueTypeName))
+                    else if (_config.WithTransparentStructs.TryGetValue(typeName, out var transparentStruct))
                     {
-                        typeName = transparentValueTypeName;
+                        typeName = transparentStruct.Name;
                     }
                 }
                 else if ((varDecl.StorageClass == CX_StorageClass.CX_SC_Static) || openedOutputBuilder)

diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs
@@ -702,9 +702,9 @@ private void VisitExplicitCastExpr(ExplicitCastExpr explicitCastExpr)
             {
                 var cursorName = GetCursorName(varDecl);
 
-                if (cursorName.StartsWith("ClangSharpMacro_") && _config.WithTransparentStructs.TryGetValue(typeName, out var transparentValueTypeName))
+                if (cursorName.StartsWith("ClangSharpMacro_") && _config.WithTransparentStructs.TryGetValue(typeName, out var transparentStruct))
                 {
-                    typeName = transparentValueTypeName;
+                    typeName = transparentStruct.Name;
                 }
             }
 

diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs
diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGeneratorConfiguration.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGeneratorConfiguration.cs
@@ -18,13 +18,13 @@ public sealed class PInvokeGeneratorConfiguration
         private readonly Dictionary<string, IReadOnlyList<string>> _withAttributes;
         private readonly Dictionary<string, string> _withCallConvs;
         private readonly Dictionary<string, string> _withLibraryPaths;
-        private readonly Dictionary<string, string> _withTransparentStructs;
+        private readonly Dictionary<string, (string, PInvokeGeneratorTransparentStructKind)> _withTransparentStructs;
         private readonly Dictionary<string, string> _withTypes;
         private readonly Dictionary<string, IReadOnlyList<string>> _withUsings;
 
         private PInvokeGeneratorConfigurationOptions _options;
 
-        public PInvokeGeneratorConfiguration(string libraryPath, string namespaceName, string outputLocation, string testOutputLocation, PInvokeGeneratorOutputMode outputMode = PInvokeGeneratorOutputMode.CSharp, PInvokeGeneratorConfigurationOptions options = PInvokeGeneratorConfigurationOptions.None, string[] excludedNames = null, string headerFile = null, string methodClassName = null, string methodPrefixToStrip = null, IReadOnlyDictionary<string, string> remappedNames = null, string[] traversalNames = null, IReadOnlyDictionary<string, string> withAccessSpecifiers = null, IReadOnlyDictionary<string, IReadOnlyList<string>> withAttributes = null, IReadOnlyDictionary<string, string> withCallConvs = null, IReadOnlyDictionary<string, string> withLibraryPaths = null, string[] withSetLastErrors = null, IReadOnlyDictionary<string, string> withTransparentStructs = null, IReadOnlyDictionary<string, string> withTypes = null, IReadOnlyDictionary<string, IReadOnlyList<string>> withUsings = null)
+        public PInvokeGeneratorConfiguration(string libraryPath, string namespaceName, string outputLocation, string testOutputLocation, PInvokeGeneratorOutputMode outputMode = PInvokeGeneratorOutputMode.CSharp, PInvokeGeneratorConfigurationOptions options = PInvokeGeneratorConfigurationOptions.None, string[] excludedNames = null, string headerFile = null, string methodClassName = null, string methodPrefixToStrip = null, IReadOnlyDictionary<string, string> remappedNames = null, string[] traversalNames = null, IReadOnlyDictionary<string, string> withAccessSpecifiers = null, IReadOnlyDictionary<string, IReadOnlyList<string>> withAttributes = null, IReadOnlyDictionary<string, string> withCallConvs = null, IReadOnlyDictionary<string, string> withLibraryPaths = null, string[] withSetLastErrors = null, IReadOnlyDictionary<string, (string, PInvokeGeneratorTransparentStructKind)> withTransparentStructs = null, IReadOnlyDictionary<string, string> withTypes = null, IReadOnlyDictionary<string, IReadOnlyList<string>> withUsings = null)
         {
             if (excludedNames is null)
             {
@@ -93,7 +93,7 @@ public PInvokeGeneratorConfiguration(string libraryPath, string namespaceName, s
             _withAttributes = new Dictionary<string, IReadOnlyList<string>>();
             _withCallConvs = new Dictionary<string, string>();
             _withLibraryPaths = new Dictionary<string, string>();
-            _withTransparentStructs = new Dictionary<string, string>();
+            _withTransparentStructs = new Dictionary<string, (string, PInvokeGeneratorTransparentStructKind)>();
             _withTypes = new Dictionary<string, string>();
             _withUsings = new Dictionary<string, IReadOnlyList<string>>();
 
@@ -244,7 +244,7 @@ public bool ExcludeFnptrCodegen
 
         public string[] WithSetLastErrors { get; }
 
-        public IReadOnlyDictionary<string, string> WithTransparentStructs => _withTransparentStructs;
+        public IReadOnlyDictionary<string, (string Name, PInvokeGeneratorTransparentStructKind Kind)> WithTransparentStructs => _withTransparentStructs;
 
         public IReadOnlyDictionary<string, string> WithTypes => _withTypes;
 
@@ -324,6 +324,8 @@ private static AccessSpecifier ConvertStringToAccessSpecifier(string input)
 
         private static string RemoveAtPrefix(string value) => ValueStartsWithAt(value) ? value[1..] : value;
 
+        private static (string, PInvokeGeneratorTransparentStructKind) RemoveAtPrefix((string Name, PInvokeGeneratorTransparentStructKind Kind) value) => (ValueStartsWithAt(value.Name) ? value.Name[1..] : value.Name, value.Kind);
+
         private static bool ValueStartsWithAt(string value) => value.StartsWith("@");
     }
 }
diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGeneratorTransparentStructKind.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGeneratorTransparentStructKind.cs
@@ -0,0 +1,10 @@
+namespace ClangSharp
+{
+    public enum PInvokeGeneratorTransparentStructKind
+    {
+        Unknown = 0,
+        Typedef = 1,
+        Handle = 2,
+        Boolean = 3,
+    }
+}
diff --git a/sources/ClangSharpPInvokeGenerator/Program.cs b/sources/ClangSharpPInvokeGenerator/Program.cs
@@ -186,7 +186,7 @@ public static int Run(InvocationContext context)
             ParseKeyValuePairs(withAttributeNameValuePairs, errorList, out Dictionary<string, IReadOnlyList<string>> withAttributes);
             ParseKeyValuePairs(withCallConvNameValuePairs, errorList, out Dictionary<string, string> withCallConvs);
             ParseKeyValuePairs(withLibraryPathNameValuePairs, errorList, out Dictionary<string, string> withLibraryPath);
-            ParseKeyValuePairs(withTransparentStructNameValuePairs, errorList, out Dictionary<string, string> withTransparentStructs);
+            ParseKeyValuePairs(withTransparentStructNameValuePairs, errorList, out Dictionary<string, (string, PInvokeGeneratorTransparentStructKind)> withTransparentStructs);
             ParseKeyValuePairs(withTypeNameValuePairs, errorList, out Dictionary<string, string> withTypes);
             ParseKeyValuePairs(withUsingNameValuePairs, errorList, out Dictionary<string, IReadOnlyList<string>> withUsings);
 
@@ -631,6 +631,46 @@ private static void ParseKeyValuePairs(IEnumerable<string> keyValuePairs, List<s
             }
         }
 
+        private static void ParseKeyValuePairs(IEnumerable<string> keyValuePairs, List<string> errorList, out Dictionary<string, (string, PInvokeGeneratorTransparentStructKind)> result)
+        {
+            result = new Dictionary<string, (string, PInvokeGeneratorTransparentStructKind)>();
+
+            foreach (var keyValuePair in keyValuePairs)
+            {
+                var parts = keyValuePair.Split('=');
+
+                if (parts.Length != 2)
+                {
+                    errorList.Add($"Error: Invalid key/value pair argument: {keyValuePair}. Expected 'name=value' or 'name=value;kind'");
+                    continue;
+                }
+
+                var key = parts[0].TrimEnd();
+
+                if (result.ContainsKey(key))
+                {
+                    errorList.Add($"Error: A key with the given name already exists: {key}. Existing: {result[key]}");
+                    continue;
+                }
+
+                parts = parts[1].Split(';');
+
+                if (parts.Length == 1)
+                {
+                    result.Add(key, (parts[0], PInvokeGeneratorTransparentStructKind.Unknown));
+                }
+                else if ((parts.Length == 2) && Enum.TryParse<PInvokeGeneratorTransparentStructKind>(parts[1], out var transparentStructKind))
+                {
+                    result.Add(key, (parts[0], transparentStructKind));
+                }
+                else
+                {
+                    errorList.Add($"Error: Invalid key/value pair argument: {keyValuePair}. Expected 'name=value' or 'name=value;kind'");
+                    continue;
+                }
+            }
+        }
+
         private static void ParseKeyValuePairs(IEnumerable<string> keyValuePairs, List<string> errorList, out Dictionary<string, IReadOnlyList<string>> result)
         {
             result = new Dictionary<string, IReadOnlyList<string>>();