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

Added UTF-8 version of the Reader buffer (for now, side by side with UTF-32)

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-29 02:51:46 +02:00
parent d3846f7970
commit 634418b599
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/dyaml/reader.d
View file

@ -54,8 +54,12 @@ final class Reader
private: private:
// Buffer of currently loaded characters. // Buffer of currently loaded characters.
dchar[] buffer_ = null; dchar[] buffer_ = null;
char[] buffer8_ = 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;
size_t bufferOffset8_ = 0;
// Index of the current character in the buffer. // Index of the current character in the buffer.
size_t charIndex_ = 0; size_t charIndex_ = 0;
@ -109,7 +113,15 @@ final class Reader
enforce(printable(noZeros[]), enforce(printable(noZeros[]),
new ReaderException("Special unicode characters are not allowed")); new ReaderException("Special unicode characters are not allowed"));
//TEMP (UTF-8 will be the default)
buffer8_ = cast(char[])buffer_.to!string;
const validateResult = buffer8_.validateUTF8NoGC;
enforce(validateResult.valid,
new ReaderException(validateResult.msg ~
validateResult.sequence.to!string));
this.sliceBuilder = SliceBuilder(this); this.sliceBuilder = SliceBuilder(this);
this.sliceBuilder8 = SliceBuilder8(this);
} }
/// Get character at specified index relative to current position. /// Get character at specified index relative to current position.