Skip to content

Adding support for specifying a transparent struct kind #285

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 3 commits into from
Oct 31, 2021
Merged

Adding support for specifying a transparent struct kind #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5fb352
Adding support for specifying a transparent struct kind
tannergooding Oct 31, 2021
508d89f
Cover a `NULL` property for win32 handles
tannergooding Oct 31, 2021
6537e4b
Ensure handles treat conversion to `int`/`uint` as explicit
tannergooding Oct 31, 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
18 changes: 16 additions & 2 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1589,10 +1589,12 @@ void OutputVtblHelperMethod(CXXRecordDecl cxxRecordDecl, CXXMethodDecl cxxMethod
var remappedName = FixupNameForMultipleHits(cxxMethodDecl);
var name = GetRemappedCursorName(cxxMethodDecl);
var needsReturnFixup = false;
var needsCastToTransparentStruct = false;

if (returnType.Kind != CXTypeKind.CXType_Void)
{
needsReturnFixup = NeedsReturnFixup(cxxMethodDecl);
needsCastToTransparentStruct = _config.WithTransparentStructs.TryGetValue(returnTypeName, out var transparentStruct) && IsTransparentStructHandle(transparentStruct.Kind);
}

var desc = new FunctionOrDelegateDesc<(string Name, PInvokeGenerator This)>
Expand Down Expand Up @@ -1652,6 +1654,13 @@ void OutputVtblHelperMethod(CXXRecordDecl cxxRecordDecl, CXXMethodDecl cxxMethod
body.Write("return ");
}

if (needsCastToTransparentStruct)
{
body.Write("((");
body.Write(returnTypeName);
body.Write(")(");
}

if (needsReturnFixup)
{
body.Write('*');
Expand Down Expand Up @@ -1748,6 +1757,11 @@ void OutputVtblHelperMethod(CXXRecordDecl cxxRecordDecl, CXXMethodDecl cxxMethod
body.Write(" != 0");
}

if (needsCastToTransparentStruct)
{
body.Write("))");
}

body.WriteSemicolon();
body.WriteNewline();

Expand Down Expand Up @@ -2743,9 +2757,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)
Expand Down
4 changes: 2 additions & 2 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
Loading