debian-packages/dyaml
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Optimized updateBuffer() for UTF-16/UTF-32

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-22 03:41:46 +02:00
parent 3b6891dbe1
commit 4ff3f8dc51
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/dyaml/reader.d
View file

@ -494,30 +494,26 @@ struct UTFBlockDecoder(size_t bufferSize_) if (bufferSize_ % 2 == 0)
{ {
case UTFEncoding.UTF_8: case UTFEncoding.UTF_8:
const bytes = min(bufferSize_ - rawUsed_, input_.length); const bytes = min(bufferSize_ - rawUsed_, input_.length);
// Current length of valid data in rawBuffer8_.
const rawLength = rawUsed_ + bytes;
rawBuffer8_[rawUsed_ .. rawUsed_ + bytes] = cast(char[])input_[0 .. bytes]; rawBuffer8_[rawUsed_ .. rawUsed_ + bytes] = cast(char[])input_[0 .. bytes];
input_ = input_[bytes .. $]; input_ = input_[bytes .. $];
// Current length of valid data in rawBuffer8_.
const rawLength = rawUsed_ + bytes;
decodeRawBuffer(rawBuffer8_, rawLength); decodeRawBuffer(rawBuffer8_, rawLength);
break; break;
case UTFEncoding.UTF_16: case UTFEncoding.UTF_16:
const words = min((bufferSize_ / 2) - rawUsed_, input_.length / 2); const words = min((bufferSize_ / 2) - rawUsed_, input_.length / 2);
const bytes = 2 * words;
rawBuffer16_[rawUsed_ .. rawUsed_ + words] = cast(wchar[])input_[0 .. bytes];
input_ = input_[bytes .. $];
// Current length of valid data in rawBuffer16_. // Current length of valid data in rawBuffer16_.
const rawLength = rawUsed_ + words; const rawLength = rawUsed_ + words;
foreach(c; rawUsed_ .. rawLength)
{
rawBuffer16_[c] = *cast(wchar*)input_.ptr;
input_ = input_[2 .. $];
}
decodeRawBuffer(rawBuffer16_, rawLength); decodeRawBuffer(rawBuffer16_, rawLength);
break; break;
case UTFEncoding.UTF_32: case UTFEncoding.UTF_32:
const chars = min(bufferSize_ / 4, input_.length / 4); const chars = min(bufferSize_ / 4, input_.length / 4);
foreach(c; 0 .. chars) const bytes = 4 * chars;
{ decodedSpace_[0 .. chars] = cast(dchar[])input_[0 .. bytes];
decodedSpace_[c] = *cast(dchar*)input_.ptr; input_ = input_[bytes .. $];
input_ = input_[4 .. $];
}
decoded_ = decodedSpace_[0 .. chars]; decoded_ = decodedSpace_[0 .. chars];
break; break;
} }