Skip to content

std::wstring support for C# #1632

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

std::wstring support for C# #1632

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
587f466
std::wstring support
strentler Aug 30, 2021
f1743e9
Adjustments for std:wstring support for CLI
strentler Sep 14, 2021
6b3c4d0
Adjusted exports for Std-symbols.cpp x86 msvc
strentler Sep 14, 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
Prev Previous commit
Next Next commit
Adjustments for std:wstring support for CLI 
- Adjusted TypeMap for wstring in Stdlib.CLI.cs
- Fixed typo in Common.Test.cs
- Added check in test
- Added wstring exports in Std-symbols.cpp
  • Loading branch information
@strentler
strentler committed Sep 14, 2021
commit f1743e9899a2f47275115e43718b0104241dc422
6 changes: 6 additions & 0 deletions src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std-symbols.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ template __declspec(dllexport) std::basic_string<char, std::char_traits<char>, s
template __declspec(dllexport) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::~basic_string() noexcept;
template __declspec(dllexport) std::basic_string<char, std::char_traits<char>, std::allocator<char>>& std::basic_string<char, std::char_traits<char>, std::allocator<char>>::assign(const char* const);
template __declspec(dllexport) const char* std::basic_string<char, std::char_traits<char>, std::allocator<char>>::data() const noexcept;

template __declspec(dllexport) std::allocator<wchar_t>::allocator() noexcept;
template __declspec(dllexport) std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>::basic_string() noexcept(true);
template __declspec(dllexport) std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>::~basic_string() noexcept;
template __declspec(dllexport) std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>& std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>::assign(const wchar_t* const);
template __declspec(dllexport) const wchar_t* std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>>::data() const noexcept;
2 changes: 1 addition & 1 deletion src/Generator/Types/Std/Stdlib.CLI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public override void CLIMarshalToManaged(MarshalContext ctx)
}
}

[TypeMap("std::wstring", GeneratorKind = GeneratorKind.CLI)]
[TypeMap("basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t>>", GeneratorKind = GeneratorKind.CLI)]
public partial class WString : TypeMap
{
public override Type CLISignatureType(TypePrinterContext ctx)
Expand Down
5 changes: 3 additions & 2 deletions tests/Common/Common.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,15 +1020,16 @@ This is a very long string. This is a very long string. This is a very long stri

using (var hasStdWString = new HasStdWString())
{
Assert.That(hasStdWString.TestStdWStringPassedByValue(t), Is.EqualTo(t + "_test"));
Assert.That(hasStdWString.TestStdWString(t), Is.EqualTo(t + "_test"));
hasStdWString.S = t;
Assert.That(hasStdWString.S, Is.EqualTo(t));
Assert.That(hasStdWString.StdWString, Is.EqualTo(t));
Assert.That(hasStdWString.StdWString, Is.EqualTo(t)
Assert.That(hasStdWString.StdWString, Is.EqualTo(t));
Assert.That(hasStdWString.TestStdWString(unicodeString1), Is.EqualTo(unicodeString1 + "_test"));
hasStdWString.S = unicodeString1;
Assert.That(hasStdWString.S, Is.EqualTo(unicodeString1));
Assert.That(hasStdWString.StdWString, Is.EqualTo(unicodeString1)
Assert.That(hasStdWString.StdWString, Is.EqualTo(unicodeString1));
Assert.That(hasStdWString.TestStdWString(unicodeString2), Is.EqualTo(unicodeString2 + "_test"));
hasStdWString.S = unicodeString2;
Assert.That(hasStdWString.S, Is.EqualTo(unicodeString2));
Expand Down