Ensure suffixes are correctly handled for ui32 and ui64

dotnet · Dec 15, 2023 · 9e0b661 · 9e0b661
1 parent efd8c1a
commit 9e0b661
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs
@@ -1902,10 +1902,18 @@ private void VisitIntegerLiteral(IntegerLiteral integerLiteral)
         {
             valueString = valueString[0..^3];
         }
+        else if (valueString.EndsWith("ui32", StringComparison.OrdinalIgnoreCase))
+        {
+            valueString = valueString[0..^4] + "U";
+        }
         else if (valueString.EndsWith("i32", StringComparison.OrdinalIgnoreCase))
         {
             valueString = valueString[0..^3];
         }
+        else if (valueString.EndsWith("ui64", StringComparison.OrdinalIgnoreCase))
+        {
+            valueString = valueString[0..^4] + "UL";
+        }
         else if (valueString.EndsWith("i64", StringComparison.OrdinalIgnoreCase))
         {
             valueString = valueString[0..^3] + "L";

diff --git a/tests/ClangSharp.PInvokeGenerator.UnitTests/CSharpPreviewUnix/StructDeclarationTest.cs b/tests/ClangSharp.PInvokeGenerator.UnitTests/CSharpPreviewUnix/StructDeclarationTest.cs
@@ -50,10 +50,7 @@ public ref {expectedManagedType} this[int index]
 }}
 ";
 
-        var diagnostics = new[] {
-            new Diagnostic(DiagnosticLevel.Warning, "Found variable length array: 'MyStruct::x'. Please specify the length using `--with-length <string>`.", $"Line 3, Column {6 + expectedManagedType.Length} in ClangUnsavedFile.h"),
-        };
-        return ValidateGeneratedCSharpPreviewUnixBindingsAsync(inputContents, expectedOutputContents, expectedDiagnostics: diagnostics);
+        return ValidateGeneratedCSharpPreviewUnixBindingsAsync(inputContents, expectedOutputContents);
     }
 
     protected override Task BasicTestImpl(string nativeType, string expectedManagedType)