Skip to content

Fix remapping for union field names #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tannergooding merged 2 commits into from
Jan 8, 2021
Merged

Fix remapping for union field names #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c889d3f
Fix remapping for union field names
reflectronic Jan 8, 2021
3b8a0d0
Remove dead logic
reflectronic Jan 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,7 @@ private string GetRemappedCursorName(NamedDecl namedDecl)
return remappedName;
}

if ((namedDecl is FieldDecl fieldDecl) && name.StartsWith("__AnonymousField_"))
if ((namedDecl is FieldDecl fieldDecl) && name.StartsWith("__AnonymousFieldDecl_"))
{
remappedName = "Anonymous";

Expand Down
55 changes: 55 additions & 0 deletions tests/ClangSharp.PInvokeGenerator.UnitTests/FunctionDeclarationBodyImportTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,6 +1508,61 @@ public static int MyFunction()
await ValidateGeneratedBindingsAsync(inputContents, expectedOutputContents);
}

[Fact]
public async Task AccessUnionMemberTest()
{
var inputContents = @"union MyUnion
{
struct { int a; };
};

void MyFunction()
{
MyUnion myUnion;
myUnion.a = 10;
}
";

var expectedOutputContents = @"using System.Runtime.InteropServices;

namespace ClangSharp.Test
{
[StructLayout(LayoutKind.Explicit)]
public partial struct MyUnion
{
[FieldOffset(0)]
[NativeTypeName(""MyUnion::(anonymous struct at ClangUnsavedFile.h:3:5)"")]
public _Anonymous_e__Struct Anonymous;

public ref int a
{
get
{
return ref MemoryMarshal.GetReference(MemoryMarshal.CreateSpan(ref Anonymous.a, 1));
}
}

public partial struct _Anonymous_e__Struct
{
public int a;
}
}

public static partial class Methods
{
public static void MyFunction()
{
MyUnion myUnion = new MyUnion();

myUnion.Anonymous.a = 10;
}
}
}
";

await ValidateGeneratedBindingsAsync(inputContents, expectedOutputContents);
}

[Fact]
public async Task ReturnStructTest()
{
Expand Down