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

Reader buffer is again dchar[].

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-24 02:40:32 +02:00
parent 36e7954756
commit e493e7299d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/dyaml/reader.d
View file

@ -66,7 +66,7 @@ final class Reader
{ {
private: private:
// Buffer of currently loaded characters. // Buffer of currently loaded characters.
dstring buffer_ = null; dchar[] buffer_ = null;
// Current position within buffer. Only data after this position can be read. // Current position within buffer. Only data after this position can be read.
uint bufferOffset_ = 0; uint bufferOffset_ = 0;
// Index of the current character in the buffer. // Index of the current character in the buffer.
@ -115,7 +115,7 @@ final class Reader
throw new ReaderException("UTF decoding error: " ~ msg); throw new ReaderException("UTF decoding error: " ~ msg);
} }
buffer_ = cast(dstring)decodeResult.decoded; buffer_ = decodeResult.decoded;
// The part of buffer_ excluding trailing zeroes. // The part of buffer_ excluding trailing zeroes.
auto noZeros = buffer_; auto noZeros = buffer_;
while(!noZeros.empty && noZeros.back == '\0') { noZeros.popBack(); } while(!noZeros.empty && noZeros.back == '\0') { noZeros.popBack(); }
@ -136,7 +136,7 @@ final class Reader
{ {
if(buffer_.length <= bufferOffset_ + index) if(buffer_.length <= bufferOffset_ + index)
{ {
// XXX This is risky; revert this and the 'risky' change in UTF decoder // XXX This is risky; revert this and the 'risky' change in UTF decoder
// if any bugs are introduced. We rely on the assumption that Reader // if any bugs are introduced. We rely on the assumption that Reader
// only uses peek() to detect the of buffer. The test suite passes. // only uses peek() to detect the of buffer. The test suite passes.
// throw new ReaderException("Trying to read past the end of the buffer"); // throw new ReaderException("Trying to read past the end of the buffer");
@ -171,12 +171,12 @@ final class Reader
/// slice will be shorter. /// slice will be shorter.
/// ///
/// Returns: Slice into the internal buffer or an empty slice if out of bounds. /// Returns: Slice into the internal buffer or an empty slice if out of bounds.
dstring slice(size_t start, size_t end) @safe pure nothrow const @nogc dstring slice(size_t start, size_t end) @trusted pure nothrow const @nogc
{ {
start += bufferOffset_; start += bufferOffset_;
end = min(buffer_.length, end + bufferOffset_); end = min(buffer_.length, end + bufferOffset_);
return end > start ? buffer_[start .. end] : ""; return end > start ? cast(dstring)buffer_[start .. end] : "";
} }
/// Get the next character, moving buffer position beyond it. /// Get the next character, moving buffer position beyond it.