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

scanDirectiveIgnoredLine is now nothrow @nogc.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-26 13:42:22 +02:00
parent 5133257201
commit 27bccabca4
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/dyaml/scanner.d
View file

@ -950,6 +950,7 @@ final class Scanner
if(!["YAML"d, "TAG"d].canFind(name)) { scanToNextBreak(); } if(!["YAML"d, "TAG"d].canFind(name)) { scanToNextBreak(); }
scanDirectiveIgnoredLine(startMark); scanDirectiveIgnoredLine(startMark);
throwIfError();
//Storing directive name and value in a single string, separated by zero. //Storing directive name and value in a single string, separated by zero.
return directiveToken(startMark, endMark, utf32To8(name ~ '\0' ~ value)); return directiveToken(startMark, endMark, utf32To8(name ~ '\0' ~ value));
@ -1053,15 +1054,17 @@ final class Scanner
} }
/// Scan (and ignore) ignored line after a directive. /// Scan (and ignore) ignored line after a directive.
void scanDirectiveIgnoredLine(const Mark startMark) @safe pure void scanDirectiveIgnoredLine(const Mark startMark) @safe pure nothrow @nogc
{ {
findNextNonSpace(); findNextNonSpace();
if(reader_.peek() == '#') { scanToNextBreak(); } if(reader_.peek() == '#') { scanToNextBreak(); }
enforce("\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek()), if("\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek()))
new Error("While scanning a directive", startMark, {
"expected comment or a line break, but found" scanLineBreak();
~ reader_.peek().to!string, reader_.mark)); return;
scanLineBreak(); }
error("While scanning a directive", startMark,
expected("comment or a line break", reader_.peek()), reader_.mark);
} }