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

Import tinyendian and use UTFEncoding instead of Encoding in the UTF decoder

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-22 00:23:15 +02:00
parent de0af4899b
commit 7af0292fd4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/dyaml/reader.d
View file

@ -20,6 +20,8 @@ import std.string;
import std.system; import std.system;
import std.utf; import std.utf;
import tinyendian;
import dyaml.fastcharsearch; import dyaml.fastcharsearch;
import dyaml.encoding; import dyaml.encoding;
import dyaml.exception; import dyaml.exception;
@ -386,7 +388,7 @@ struct UTFBlockDecoder(size_t bufferSize_) if (bufferSize_ % 2 == 0)
]; ];
//Encoding of the input stream. //Encoding of the input stream.
Encoding encoding_; UTFEncoding encoding_;
//Maximum number of characters that might be in the stream. //Maximum number of characters that might be in the stream.
size_t maxChars_; size_t maxChars_;
//Bytes available in the stream. //Bytes available in the stream.
@ -518,7 +520,7 @@ struct UTFBlockDecoder(size_t bufferSize_) if (bufferSize_ % 2 == 0)
"updateBuffer can only be called when the buffer is empty"); "updateBuffer can only be called when the buffer is empty");
final switch(encoding_) final switch(encoding_)
{ {
case Encoding.UTF_8: case UTFEncoding.UTF_8:
const bytes = min(bufferSize_ - rawUsed_, available_); const bytes = min(bufferSize_ - rawUsed_, available_);
//Current length of valid data in rawBuffer8_. //Current length of valid data in rawBuffer8_.
const rawLength = rawUsed_ + bytes; const rawLength = rawUsed_ + bytes;
@ -526,7 +528,7 @@ struct UTFBlockDecoder(size_t bufferSize_) if (bufferSize_ % 2 == 0)
available_ -= bytes; available_ -= bytes;
decodeRawBuffer(rawBuffer8_, rawLength); decodeRawBuffer(rawBuffer8_, rawLength);
break; break;
case Encoding.UTF_16: case UTFEncoding.UTF_16:
const words = min((bufferSize_ / 2) - rawUsed_, available_ / 2); const words = min((bufferSize_ / 2) - rawUsed_, available_ / 2);
//Current length of valid data in rawBuffer16_. //Current length of valid data in rawBuffer16_.
const rawLength = rawUsed_ + words; const rawLength = rawUsed_ + words;
@ -537,7 +539,7 @@ struct UTFBlockDecoder(size_t bufferSize_) if (bufferSize_ % 2 == 0)
} }
decodeRawBuffer(rawBuffer16_, rawLength); decodeRawBuffer(rawBuffer16_, rawLength);
break; break;
case Encoding.UTF_32: case UTFEncoding.UTF_32:
const chars = min(bufferSize_ / 4, available_ / 4); const chars = min(bufferSize_ / 4, available_ / 4);
foreach(c; 0 .. chars) foreach(c; 0 .. chars)
{ {