Skip to content

Fix translation for implicit move constructor invocation #188

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 1 commit into from
Jan 8, 2021
Merged

Fix translation for implicit move constructor invocation #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,9 @@ private void VisitCXXConstCastExpr(CXXConstCastExpr cxxConstCastExpr)

private void VisitCXXConstructExpr(CXXConstructExpr cxxConstructExpr)
{
var isCopyConstructor = cxxConstructExpr.Constructor.IsCopyConstructor;
var isCopyOrMoveConstructor = cxxConstructExpr.Constructor is { IsCopyConstructor: true } or { IsMoveConstructor: true };

if (!isCopyConstructor)
if (!isCopyOrMoveConstructor)
{
_outputBuilder.Write("new ");

Expand All @@ -277,7 +277,7 @@ private void VisitCXXConstructExpr(CXXConstructExpr cxxConstructExpr)
}
}

if (!isCopyConstructor)
if (!isCopyOrMoveConstructor)
{
_outputBuilder.Write(')');
}
Expand Down
43 changes: 43 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,49 @@ public static int MyFunction()
await ValidateGeneratedBindingsAsync(inputContents, expectedOutputContents);
}

[Fact]
public async Task ReturnStructTest()
{
var inputContents = @"struct MyStruct
{
double r;
double g;
double b;
};

MyStruct MyFunction()
{
MyStruct myStruct;
return myStruct;
}
";

var expectedOutputContents = @"namespace ClangSharp.Test
{
public partial struct MyStruct
{
public double r;

public double g;

public double b;
}

public static partial class Methods
{
public static MyStruct MyFunction()
{
MyStruct myStruct = new MyStruct();

return myStruct;
}
}
}
";

await ValidateGeneratedBindingsAsync(inputContents, expectedOutputContents);
}

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