Skip to content

Insert cast to enum underlying type when casting to enum type in enum initializer #197

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
Jan 30, 2021
Merged

Insert cast to enum underlying type when casting to enum type in enum initializer #197

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
7640550
Remove casts to enum types in enum initializers
reflectronic Jan 30, 2021
f4e3b3f
Try to fix test
reflectronic Jan 30, 2021
9eead27
Rework
reflectronic Jan 30, 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
9 changes: 9 additions & 0 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,16 @@ private void VisitDoStmt(DoStmt doStmt)

private void VisitExplicitCastExpr(ExplicitCastExpr explicitCastExpr)
{
if (IsPrevContextDecl<EnumConstantDecl>(out var _) && explicitCastExpr.Type is EnumType enumType)
{
_outputBuilder.Write('(');
var enumUnderlyingTypeName = GetRemappedTypeName(explicitCastExpr, context: null, enumType.Decl.IntegerType, out _);
_outputBuilder.Write(enumUnderlyingTypeName);
_outputBuilder.Write(')');
}

var type = explicitCastExpr.Type;

var typeName = GetRemappedTypeName(explicitCastExpr, context: null, type, out var nativeTypeName);

_outputBuilder.Write('(');
Expand Down
61 changes: 61 additions & 0 deletions tests/ClangSharp.PInvokeGenerator.UnitTests/EnumDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,67 @@ public enum MyEnum2
await ValidateGeneratedBindingsAsync(inputContents, expectedOutputContents, withUsings: withNamespaces);
}

[Fact]
public async Task WithCastToEnumType()
{
var inputContents = @"enum MyEnum : int
{
MyEnum_Value0 = (MyEnum) 10,
MyEnum_Value1 = (MyEnum) MyEnum_Value0,
MyEnum_Value2 = ((MyEnum) 10) + MyEnum_Value1,
};
";

var expectedOutputContents = @"namespace ClangSharp.Test
{
public enum MyEnum
{
MyEnum_Value0 = (int)(MyEnum)(10),
MyEnum_Value1 = (int)(MyEnum)(MyEnum_Value0),
MyEnum_Value2 = ((int)(MyEnum)(10)) + MyEnum_Value1,
}
}
";

await ValidateGeneratedBindingsAsync(inputContents, expectedOutputContents);
}


[Fact]
public async Task WithMultipleEnumsTest()
{
var inputContents = @"enum MyEnum1 : int
{
MyEnum1_Value0 = 10,
};

enum MyEnum2 : int
{
MyEnum2_Value0 = MyEnum1_Value0,
MyEnum2_Value1 = MyEnum1_Value0 + (MyEnum1) 10,
};
";

var expectedOutputContents = @"using static ClangSharp.Test.MyEnum1;

namespace ClangSharp.Test
{
public enum MyEnum1
{
MyEnum1_Value0 = 10,
}

public enum MyEnum2
{
MyEnum2_Value0 = MyEnum1_Value0,
MyEnum2_Value1 = MyEnum1_Value0 + (int)(MyEnum1)(10),
}
}
";

await ValidateGeneratedBindingsAsync(inputContents, expectedOutputContents);
}

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