Skip to content

Recognize LLU and LU integer suffixes #513

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
merged 1 commit into from
Dec 15, 2023
Merged

Recognize LLU and LU integer suffixes #513

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
29 changes: 18 additions & 11 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1703,11 +1703,7 @@ private void VisitIntegerLiteral(IntegerLiteral integerLiteral)
{
var valueString = integerLiteral.ValueString;

if (valueString.EndsWith('l') || valueString.EndsWith('L'))
{
valueString = valueString[0..^1];
}
else if (valueString.EndsWith("ui8", StringComparison.OrdinalIgnoreCase))
if (valueString.EndsWith("ui8", StringComparison.OrdinalIgnoreCase))
{
valueString = valueString[0..^3];
}
Expand All @@ -1731,20 +1727,31 @@ private void VisitIntegerLiteral(IntegerLiteral integerLiteral)
{
valueString = valueString[0..^3] + "L";
}

if (valueString.EndsWith("ul", StringComparison.OrdinalIgnoreCase))
else if (
valueString.EndsWith("ull", StringComparison.OrdinalIgnoreCase) ||
valueString.EndsWith("llu", StringComparison.OrdinalIgnoreCase))
{
valueString = valueString[0..^2] + "UL";
valueString = valueString[0..^3] + "UL";
}
else if (valueString.EndsWith('l') || valueString.EndsWith('L'))
else if (valueString.EndsWith("ll", StringComparison.OrdinalIgnoreCase))
{
valueString = valueString[0..^2] + "L";
}
else if (
valueString.EndsWith("ul", StringComparison.OrdinalIgnoreCase) ||
valueString.EndsWith("lu", StringComparison.OrdinalIgnoreCase))
{
valueString = valueString[0..^1] + "L";
valueString = valueString[0..^2] + "U";
}
else if (valueString.EndsWith('u') || valueString.EndsWith('U'))
{
valueString = valueString[0..^1] + "U";
}

else if (valueString.EndsWith('l') || valueString.EndsWith('L'))
{
valueString = valueString[0..^1];
}

var outputBuilder = StartCSharpCode();
outputBuilder.Write(valueString);
StopCSharpCode();
Expand Down
1 change: 1 addition & 0 deletions tests/ClangSharp.PInvokeGenerator.UnitTests/Base/VarDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public abstract class VarDeclarationTest : PInvokeGeneratorTest
[TestCase("0U", "uint", "0U")]
[TestCase("0LL", "long", "0L")]
[TestCase("0ULL", "ulong", "0UL")]
[TestCase("0LLU", "ulong", "0UL")]
[TestCase("0.0", "double", "0.0")]
[TestCase("0.f", "float", "0.0f")]
public Task MacroTest(string nativeValue, string expectedManagedType, string expectedManagedValue) => MacroTestImpl(nativeValue, expectedManagedType, expectedManagedValue);
Expand Down