Skip to content

conversion from utf8 to utf16 #273

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

Closed
wants to merge 2 commits into from
Closed

conversion from utf8 to utf16 #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20ee760
conversion from utf8 to utf16
Oct 27, 2016
2fe891d
Using new version of the functions to convert utf8 to utf16 that make…
Oct 27, 2016
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
33 changes: 33 additions & 0 deletions src/util/unicode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Author: Daniel Kroening, [email protected]
\*******************************************************************/

#include <cstring>
#include <locale>
#include <codecvt>

#include "unicode.h"

Expand Down Expand Up @@ -253,3 +255,34 @@ const char **narrow_argv(int argc, const wchar_t **argv_wide)

return argv_narrow;
}

std::wstring utf8_to_utf16be(const std::string& in)
{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Careful: wstring is platform dependent, and it's sometimes 16 bits and sometimes 32 bits. If you explicitly need 16 bits, it's probably better to use std::basic_string<uint16_t>.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the string solver we don't explicitly need 16 bits as the character are then converted to an expression with the right character width.
Another issue is that the function return big endian while we ultimately need little endian, and Chris wrote a new version of unicode.cpp that makes the endianness explicit, so it may be better to integrate his version directly.

std::wstring_convert<std::codecvt_utf8_utf16<wchar_t> > converter;
return converter.from_bytes(in);
}

std::wstring utf8_to_utf16le(const std::string& in)
{
std::wstring_convert<std::codecvt_utf8_utf16<wchar_t,0x10ffffUL,std::codecvt_mode::little_endian> > converter;
return converter.from_bytes(in);
}

std::string utf16le_to_ascii(const std::wstring& in)
{
std::string result;
std::locale loc;
for(const auto c : in)
{
if(c <= 255 && isprint(c,loc))
result+=(unsigned char)c;
else
{
result+="\\u";
char hex[5];
sprintf(hex,"%04x",(wchar_t)c);
result+=hex;
}
}
return result;
}
4 changes: 4 additions & 0 deletions src/util/unicode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ std::wstring widen(const std::string &s);

std::string utf32_to_utf8(const std::basic_string<unsigned int> &s);
std::string utf16_to_utf8(const std::basic_string<unsigned short int> &s);
std::string utf16le_to_ascii(const std::wstring&);

std::wstring utf8_to_utf16be(const std::string&);
std::wstring utf8_to_utf16le(const std::string&);

const char **narrow_argv(int argc, const wchar_t **argv_wide);

Expand Down