mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-01 15:40:36 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix conversion from wchar to wchar_t in LockingTextWriter.put

Browse source 
This fixes issue 18789.
This commit is contained in:
aG0aep6G 2018-04-21 15:39:34 +02:00
parent ece1672ae8
commit 41f78fc1e1
1 changed files with 40 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

63
std/stdio.d
View file

@ -3058,39 +3058,44 @@ is empty, throws an `Exception`. In case of an I/O error throws
} }
else static if (c.sizeof == 2) else static if (c.sizeof == 2)
{ {
import std.utf : encode, decode; import std.utf : decode;
if (orientation_ <= 0) if (c <= 0x7F)
{ {
if (c <= 0x7F) highSurrogateShouldBeEmpty();
if (orientation_ <= 0) trustedFPUTC(c, handle_);
else trustedFPUTWC(c, handle_);
}
else if (0xD800 <= c && c <= 0xDBFF) // high surrogate
{
highSurrogateShouldBeEmpty();
highSurrogate = c;
}
else // standalone or low surrogate
{
dchar d = c;
if (highSurrogate != '\0')
{ {
highSurrogateShouldBeEmpty(); immutable wchar[2] rbuf = [highSurrogate, c];
trustedFPUTC(c, handle_); size_t index = 0;
d = decode(rbuf[], index);
highSurrogate = 0;
} }
else if (0xD800 <= c && c <= 0xDBFF) // high surrogate if (orientation_ <= 0)
{ {
highSurrogateShouldBeEmpty();
highSurrogate = c;
}
else // standalone or low surrogate
{
dchar d = c;
if (highSurrogate != '\0')
{
immutable wchar[2] rbuf = [highSurrogate, c];
size_t index = 0;
d = decode(rbuf[], index);
highSurrogate = 0;
}
char[4] wbuf; char[4] wbuf;
immutable size = encode(wbuf, d); immutable size = encode(wbuf, d);
foreach (i; 0 .. size) foreach (i; 0 .. size)
trustedFPUTC(wbuf[i], handle_); trustedFPUTC(wbuf[i], handle_);
} }
} else
else {
{ wchar_t[4 / wchar_t.sizeof] wbuf;
trustedFPUTWC(c, handle_); immutable size = encode(wbuf, d);
foreach (i; 0 .. size)
trustedFPUTWC(wbuf[i], handle_);
}
rbuf8Filled = 0;
} }
} }
else // 32-bit characters else // 32-bit characters
@ -3674,6 +3679,18 @@ void main()
} }
assert(std.file.readText!wstring(deleteme) == "ö\U0001F608"w); assert(std.file.readText!wstring(deleteme) == "ö\U0001F608"w);
} }
@safe unittest // wchar -> wchar_t
{
static import std.file;
auto deleteme = testFilename();
scope(exit) std.file.remove(deleteme);
{
auto writer = File(deleteme, "w,ccs=UTF-16LE").lockingTextWriter();
writer.put("ö"w);
writer.put("\U0001F608"w);
}
assert(std.file.readText!wstring(deleteme) == "ö\U0001F608"w);
}
@safe unittest @safe unittest
{ {