More style fixes in Scanner.

This commit is contained in:
Ferdinand Majerech 2014-07-23 03:10:25 +02:00
parent 0a7d21f1c6
commit f8c1d0204b

View file

@ -1021,7 +1021,7 @@ final class Scanner
suffix = scanTagURI("tag", startMark); suffix = scanTagURI("tag", startMark);
enforce(reader_.peek() == '>', enforce(reader_.peek() == '>',
new Error("While scanning a tag", startMark, new Error("While scanning a tag", startMark,
"expected '>' but found" ~ to!string(reader_.peek()), "expected '>' but found" ~ reader_.peek().to!string,
reader_.mark)); reader_.mark));
reader_.forward(); reader_.forward();
} }
@ -1046,7 +1046,7 @@ final class Scanner
c = reader_.peek(length); c = reader_.peek(length);
} }
if(useHandle){handle = scanTagHandle("tag", startMark);} if(useHandle) { handle = scanTagHandle("tag", startMark); }
else else
{ {
handle = "!"; handle = "!";
@ -1058,7 +1058,7 @@ final class Scanner
enforce(" \0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek()), enforce(" \0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek()),
new Error("While scanning a tag", startMark, new Error("While scanning a tag", startMark,
"expected ' ' but found" ~ to!string(reader_.peek()), "expected ' ' but found" ~ reader_.peek().to!string,
reader_.mark)); reader_.mark));
return tagToken(startMark, reader_.mark, to!string(handle ~ '\0' ~ suffix)); return tagToken(startMark, reader_.mark, to!string(handle ~ '\0' ~ suffix));
} }
@ -1245,14 +1245,14 @@ final class Scanner
const startMark = reader_.mark; const startMark = reader_.mark;
const quote = reader_.get(); const quote = reader_.get();
//Using appender_, so clear it when we're done. // Using appender_, so clear it when we're done.
scope(exit){appender_.clear();} scope(exit) { appender_.clear(); }
//Puts scanned data to appender_. // Puts scanned data to appender_.
scanFlowScalarNonSpaces(quotes, startMark); scanFlowScalarNonSpaces(quotes, startMark);
while(reader_.peek() != quote) while(reader_.peek() != quote)
{ {
//Puts scanned data to appender_. // Puts scanned data to appender_.
scanFlowScalarSpaces(startMark); scanFlowScalarSpaces(startMark);
scanFlowScalarNonSpaces(quotes, startMark); scanFlowScalarNonSpaces(quotes, startMark);
} }