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

Removed the UTF-32 buffer from Reader.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-29 23:23:45 +02:00
parent 736de8beb9
commit 33b2a7ef68
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/dyaml/reader.d
View file

@ -54,7 +54,6 @@ final class Reader
{ {
private: private:
// Buffer of currently loaded characters. // Buffer of currently loaded characters.
dchar[] buffer_ = null;
char[] buffer8_ = 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.
@ -121,16 +120,16 @@ final class Reader
throw new ReaderException("UTF decoding error: " ~ msg); throw new ReaderException("UTF decoding error: " ~ msg);
} }
buffer_ = decodeResult.decoded; auto buffer = decodeResult.decoded;
// Check that excluding any trailing zeroes, all character in buffer are // Check that excluding any trailing zeroes, all character in buffer are
// printable. // printable.
auto noZeros = buffer_; auto noZeros = buffer;
while(!noZeros.empty && noZeros.back == '\0') { noZeros.popBack(); } while(!noZeros.empty && noZeros.back == '\0') { noZeros.popBack(); }
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) //TEMP (UTF-8 will be the default)
buffer8_ = cast(char[])buffer_.to!string; buffer8_ = cast(char[])buffer.to!string;
const validateResult = buffer8_.validateUTF8NoGC; const validateResult = buffer8_.validateUTF8NoGC;
enforce(validateResult.valid, enforce(validateResult.valid,
new ReaderException(validateResult.msg ~ new ReaderException(validateResult.msg ~