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

UTFDecoder is now pure nothrow and @safer.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-22 03:33:36 +02:00
parent 7affea320a
commit 81aee496ac
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
source/dyaml/reader.d
View file

@ -416,7 +416,7 @@ struct UTFBlockDecoder(size_t bufferSize_) if (bufferSize_ % 2 == 0)
public: public:
/// Construct a UTFBlockDecoder decoding data from a buffer. /// Construct a UTFBlockDecoder decoding data from a buffer.
this(ubyte[] buffer, UTFEncoding encoding) @trusted this(ubyte[] buffer, UTFEncoding encoding) @safe pure nothrow @nogc
{ {
inputAll_ = buffer; inputAll_ = buffer;
input_ = inputAll_[]; input_ = inputAll_[];
@ -436,7 +436,11 @@ struct UTFBlockDecoder(size_t bufferSize_) if (bufferSize_ % 2 == 0)
UTFEncoding encoding() const pure @safe nothrow @nogc { return encoding_; } UTFEncoding encoding() const pure @safe nothrow @nogc { return encoding_; }
/// Get the current position in buffer. /// Get the current position in buffer.
size_t position() @trusted { return inputAll_.length - input_.length; } size_t position() @safe pure nothrow const @nogc
{
return inputAll_.length - input_.length;
}
/// Get the error message and clear it. /// Get the error message and clear it.
/// ///
/// Can only be used in case of an error return from e.g. getDChars(). /// Can only be used in case of an error return from e.g. getDChars().
@ -455,10 +459,12 @@ struct UTFBlockDecoder(size_t bufferSize_) if (bufferSize_ % 2 == 0)
return rawUsed_ == 0 && decoded_.length == 0 && input_.length == 0; return rawUsed_ == 0 && decoded_.length == 0 && input_.length == 0;
} }
/// Get as many characters as possible, but at most maxChars.
/// Get as many characters as possible, but at most maxChars. Slice returned will be invalidated in further calls. ///
const(dchar[]) getDChars(size_t maxChars = size_t.max) /// Returns: A slice with decoded characters or NULL on failure (in that case,
@safe /// check getAndClearErrorMessage(). The slice $(B will) be invalidated
/// in further calls.
const(dchar[]) getDChars(size_t maxChars = size_t.max) @safe pure nothrow
{ {
if(decoded_.length) if(decoded_.length)
{ {
@ -478,7 +484,9 @@ struct UTFBlockDecoder(size_t bufferSize_) if (bufferSize_ % 2 == 0)
private: private:
// Read and decode characters from file and store them in the buffer. // Read and decode characters from file and store them in the buffer.
void updateBuffer() @trusted //
// On error, errorMessage_ will be set.
void updateBuffer() @trusted pure nothrow
{ {
assert(decoded_.length == 0, assert(decoded_.length == 0,
"updateBuffer can only be called when the buffer is empty"); "updateBuffer can only be called when the buffer is empty");
@ -519,7 +527,7 @@ struct UTFBlockDecoder(size_t bufferSize_) if (bufferSize_ % 2 == 0)
// //
// On error, errorMessage_ will be set. // On error, errorMessage_ will be set.
void decodeRawBuffer(C)(C[] buffer, const size_t length) void decodeRawBuffer(C)(C[] buffer, const size_t length)
@safe pure @safe pure nothrow
{ {
// End of part of rawBuffer8_ that contains // End of part of rawBuffer8_ that contains
// complete characters and can be decoded. // complete characters and can be decoded.
@ -574,7 +582,9 @@ struct UTFBlockDecoder(size_t bufferSize_) if (bufferSize_ % 2 == 0)
} }
// Decode a UTF-8 or UTF-16 buffer (with no incomplete sequences at the end). // Decode a UTF-8 or UTF-16 buffer (with no incomplete sequences at the end).
void decodeUTF(C)(const C[] source) @safe pure //
// On error, sets errorMessage_.
void decodeUTF(C)(const C[] source) @safe pure nothrow
{ {
size_t bufpos = 0; size_t bufpos = 0;
const srclength = source.length; const srclength = source.length;