Skip to content

Fix translation for constant string literals #189

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 constant string literals #189

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
5 changes: 4 additions & 1 deletion sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2607,6 +2607,7 @@ private void VisitVarDecl(VarDecl varDecl)
_outputBuilder.Write(' ');

var isProperty = false;
var isStringLiteral = false;

if (IsStmtAsWritten<StringLiteral>(varDecl.Init, out var stringLiteral, removeParens: true))
{
Expand All @@ -2620,6 +2621,7 @@ private void VisitVarDecl(VarDecl varDecl)

typeName = "ReadOnlySpan<byte>";
isProperty = true;
isStringLiteral = true;
break;
}

Expand All @@ -2638,6 +2640,7 @@ private void VisitVarDecl(VarDecl varDecl)
_outputBuilder.Write("const ");

typeName = "string";
isStringLiteral = true;
break;
}

Expand All @@ -2664,7 +2667,7 @@ private void VisitVarDecl(VarDecl varDecl)

_outputBuilder.Write(typeName);

if (type is ArrayType)
if (!isStringLiteral && type is ArrayType)
{
_outputBuilder.Write("[]");
}
Expand Down
38 changes: 38 additions & 0 deletions tests/ClangSharp.PInvokeGenerator.UnitTests/VarDeclarationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,44 @@ public static partial class Methods
await ValidateGeneratedBindingsAsync(inputContents, expectedOutputContents);
}

[Fact]
public async Task WideStringLiteralConstTest()
{
var inputContents = $@"const wchar_t MyConst1[] = L""Test"";";

var expectedOutputContents = $@"namespace ClangSharp.Test
{{
public static partial class Methods
{{
[NativeTypeName(""const wchar_t [5]"")]
public const string MyConst1 = ""Test"";
}}
}}
";

await ValidateGeneratedBindingsAsync(inputContents, expectedOutputContents);
}

[Fact]
public async Task StringLiteralConstTest()
{
var inputContents = $@"const char MyConst1[] = ""Test"";";

var expectedOutputContents = $@"using System;

namespace ClangSharp.Test
{{
public static partial class Methods
{{
[NativeTypeName(""const char [5]"")]
public static ReadOnlySpan<byte> MyConst1 => new byte[] {{ 0x54, 0x65, 0x73, 0x74, 0x00 }};
}}
}}
";

await ValidateGeneratedBindingsAsync(inputContents, expectedOutputContents);
}

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