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

nothrow and some @nogc in tag directive scanning.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-26 17:48:50 +02:00
parent d190b9d839
commit e055506b29
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/dyaml/scanner.d
View file

@ -1034,12 +1034,15 @@ final class Scanner
/// ///
/// Assumes that the caller is building a slice in Reader, and puts the scanned /// Assumes that the caller is building a slice in Reader, and puts the scanned
/// characters into that slice. /// characters into that slice.
///
/// In case of an error, error_ is set. Use throwIfError() to handle this.
void scanTagDirectiveValueToSlice(const Mark startMark, ref uint handleLength) void scanTagDirectiveValueToSlice(const Mark startMark, ref uint handleLength)
@trusted pure @system pure nothrow
{ {
findNextNonSpace(); findNextNonSpace();
const startLength = reader_.sliceBuilder.length; const startLength = reader_.sliceBuilder.length;
scanTagDirectiveHandleToSlice(startMark); scanTagDirectiveHandleToSlice(startMark);
if(error_) { return; }
handleLength = cast(uint)(reader_.sliceBuilder.length - startLength); handleLength = cast(uint)(reader_.sliceBuilder.length - startLength);
findNextNonSpace(); findNextNonSpace();
scanTagDirectivePrefixToSlice(startMark); scanTagDirectivePrefixToSlice(startMark);
@ -1049,28 +1052,35 @@ final class Scanner
/// ///
/// Assumes that the caller is building a slice in Reader, and puts the scanned /// Assumes that the caller is building a slice in Reader, and puts the scanned
/// characters into that slice. /// characters into that slice.
void scanTagDirectiveHandleToSlice(const Mark startMark) @trusted pure ///
/// In case of an error, error_ is set. Use throwIfError() to handle this.
void scanTagDirectiveHandleToSlice(const Mark startMark)
@system pure nothrow @nogc
{ {
scanTagHandleToSlice!"directive"(startMark); scanTagHandleToSlice!"directive"(startMark);
enforce(reader_.peek() == ' ', if(error_) { return; }
new Error("While scanning a directive handle", startMark, if(reader_.peek() == ' ') { return; }
"expected ' ', but found: " ~ to!string(reader_.peek()), error("While scanning a directive handle", startMark,
reader_.mark)); expected("' '", reader_.peek()), reader_.mark);
} }
/// Scan prefix of a tag directive. /// Scan prefix of a tag directive.
/// ///
/// Assumes that the caller is building a slice in Reader, and puts the scanned /// Assumes that the caller is building a slice in Reader, and puts the scanned
/// characters into that slice. /// characters into that slice.
void scanTagDirectivePrefixToSlice(const Mark startMark) @trusted pure ///
/// In case of an error, error_ is set. Use throwIfError() to handle this.
void scanTagDirectivePrefixToSlice(const Mark startMark) @system pure nothrow
{ {
enforce(" \0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek()), scanTagURIToSlice!"directive"(startMark);
new Error("While scanning a directive prefix", startMark, if(" \0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek())) { return; }
"expected ' ', but found" ~ reader_.peek().to!string, error("While scanning a directive prefix", startMark,
reader_.mark)); expected("' '", reader_.peek()), reader_.mark);
} }
/// Scan (and ignore) ignored line after a directive. /// Scan (and ignore) ignored line after a directive.
///
/// In case of an error, error_ is set. Use throwIfError() to handle this.
void scanDirectiveIgnoredLine(const Mark startMark) @safe pure nothrow @nogc void scanDirectiveIgnoredLine(const Mark startMark) @safe pure nothrow @nogc
{ {
findNextNonSpace(); findNextNonSpace();