Moved a branch outside of aloop in scanPlain() to improve performance.

This commit is contained in:
Ferdinand Majerech 2014-08-05 20:58:05 +02:00
parent 57d936ed0f
commit d505728824

View file

@ -1739,17 +1739,29 @@ final class Scanner
while(reader_.peekByte() != '#')
{
// Scan the entire plain scalar.
uint length = 0;
dchar c;
size_t length = 0;
dchar c = void;
// Moved the if() out of the loop for optimization.
if(flowLevel_ == 0)
{
c = reader_.peek(length);
for(;;)
{
const cNext = reader_.peek(length + 1);
if(search.canFind(c) || (c == ':' && search.canFind(cNext))) { break; }
++length;
c = cNext;
}
}
else
{
for(;;)
{
c = reader_.peek(length);
const bool done = search.canFind(c) || (flowLevel_ == 0 && c == ':' &&
search.canFind(reader_.peek(length + 1))) ||
(flowLevel_ > 0 && ",:?[]{}"d.canFind(c));
if(done) { break; }
if(search.canFind(c) || ",:?[]{}"d.canFind(c)) { break; }
++length;
}
}
// It's not clear what we should do with ':' in the flow context.
if(flowLevel_ > 0 && c == ':' &&