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

Keeping buffer8_ and buffer_ positions in sync.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-29 02:54:39 +02:00
parent 6addaa4cbe
commit ef9053d7f3
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/dyaml/reader.d
View file

@ -216,11 +216,9 @@ final class Reader
for(; length > 0; --length)
{
const c = buffer_[bufferOffset_];
++bufferOffset_;
++charIndex_;
// New line.
if(search.canFind(c) || (c == '\r' && buffer_[bufferOffset_] != '\n'))
const c = decodeAndAdvanceCurrent();
// New line. (can compare with '\n' without decoding since it's ASCII)
if(search.canFind(c) || (c == '\r' && buffer8_[bufferOffset8_] != '\n'))
{
++line_;
column_ = 0;
@ -246,6 +244,27 @@ final class Reader
/// Get encoding of the input buffer.
final Encoding encoding() @safe pure nothrow const @nogc { return encoding_; }
// Decode the character starting at bufferOffset8_ and move to the next
// character.
//
// Used in forward().
dchar decodeAndAdvanceCurrent() @safe pure nothrow @nogc
{
assert(bufferOffset8_ < buffer8_.length,
"Attempted to decode past the end of a string");
const b = buffer8_[bufferOffset8_];
++bufferOffset_;
++charIndex_;
++decodeCount_;
if(b < 0x80)
{
++bufferOffset8_;
return b;
}
return decodeValidUTF8NoGC(buffer8_, bufferOffset8_);
}
}