Merge pull request #556 from fredrikhr/strip-enum-member-type-name

Refactor Enum member type escaping
dotnet · May 24, 2024 · 549da90 · 549da90
2 parents 7e48890 + f3237de
commit 549da90
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
@@ -273,7 +273,6 @@ private void VisitEnumConstantDecl(EnumConstantDecl enumConstantDecl)
 
         var accessSpecifier = AccessSpecifier.None;
         var name = GetRemappedCursorName(enumConstantDecl);
-        var escapedName = EscapeName(name);
         var typeName = GetTargetTypeName(enumConstantDecl, out _);
         var isAnonymousEnum = false;
         var parentName = "";
@@ -295,10 +294,7 @@ private void VisitEnumConstantDecl(EnumConstantDecl enumConstantDecl)
             parentName = _outputBuilder.Name;
         }
 
-        if (Config.StripEnumMemberTypeName)
-        {
-            escapedName = PrefixAndStrip(escapedName, parentName, trimChar: '_');
-        }
+        var escapedName = EscapeAndStripEnumMemberName(name, parentName);
 
         var kind = isAnonymousEnum ? ValueKind.Primitive : ValueKind.Enumerator;
         var flags = ValueFlags.Constant;

diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs
@@ -2332,6 +2332,20 @@ private string EscapeAndStripMethodName(string name)
         return EscapeName(name);
     }
 
+    private string EscapeAndStripEnumMemberName(string name, string enumTypeName)
+    {
+        if (Config.StripEnumMemberTypeName)
+        {
+            var escapedName = PrefixAndStrip(name, enumTypeName, trimChar: '_');
+            if (escapedName.Length > 0 && char.IsAsciiDigit(escapedName[0]))
+            {
+                escapedName = '_' + escapedName;
+            }
+            return escapedName;
+        }
+        return EscapeName(name);
+    }
+
     internal static string EscapeCharacter(char value) => value switch {
         '\0' => @"\0",
         '\\' => @"\\",