In-place UTF32->UTF-8 conversion in Reader.
This commit is contained in:
parent
cc1aaf4ac8
commit
492e36d28a
|
@ -18,6 +18,7 @@ import std.exception;
|
|||
import std.stdio;
|
||||
import std.string;
|
||||
import std.system;
|
||||
import std.typecons;
|
||||
import std.utf;
|
||||
|
||||
import tinyendian;
|
||||
|
@ -742,9 +743,40 @@ auto toUTF8(ubyte[] input, const UTFEncoding encoding) @safe pure nothrow
|
|||
static void encode(C)(C[] input, ref Result result) @trusted pure nothrow
|
||||
{
|
||||
try
|
||||
{
|
||||
// We can do UTF-32->UTF-8 in place because all UTF-8 sequences are 4 or
|
||||
// less bytes.
|
||||
static if(is(C == dchar))
|
||||
{
|
||||
char[4] encodeBuf;
|
||||
auto utf8 = cast(char[])input;
|
||||
auto length = 0;
|
||||
foreach(dchar c; input)
|
||||
{
|
||||
// ASCII
|
||||
if(c < 0x80)
|
||||
{
|
||||
utf8[length++] = cast(char)c;
|
||||
continue;
|
||||
}
|
||||
|
||||
const encodeResult = encodeCharNoGC!(No.validated)(encodeBuf, c);
|
||||
if(encodeResult.errorMessage !is null)
|
||||
{
|
||||
result.errorMessage = encodeResult.errorMessage;
|
||||
return;
|
||||
}
|
||||
const bytes = encodeResult.bytes;
|
||||
utf8[length .. length + bytes] = encodeBuf[0 .. bytes];
|
||||
length += bytes;
|
||||
}
|
||||
result.utf8 = utf8[0 .. length];
|
||||
}
|
||||
else
|
||||
{
|
||||
result.utf8 = cast(char[])input.to!string;
|
||||
}
|
||||
}
|
||||
catch(ConvException e) { result.errorMessage = e.msg; }
|
||||
catch(UTFException e) { result.errorMessage = e.msg; }
|
||||
catch(Exception e)
|
||||
|
|
Loading…
Reference in a new issue