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

Moved common FastCharSearch instantiations to Scanner body to minimize bloat.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-08-05 21:30:59 +02:00
parent d505728824
commit 755eb4e468
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
source/dyaml/scanner.d
View file

@ -153,6 +153,14 @@ final class Scanner
/// not. /// not.
char[256] msgBuffer_; char[256] msgBuffer_;
/// Used to detect if a character is any whitespace plus '\0'
mixin FastCharSearch!" \t\0\n\r\u0085\u2028\u2029"d searchAllWhitespace;
/// Used to detect if a character is any line break plus '\0'
mixin FastCharSearch!"\0\n\r\u0085\u2028\u2029"d searchAllBreaks;
/// Avoids compiler confusion of std.algorithm.canFind with FastCharSearch.
alias canFind = std.algorithm.canFind;
public: public:
/// Construct a Scanner using specified Reader. /// Construct a Scanner using specified Reader.
this(Reader reader) @safe nothrow this(Reader reader) @safe nothrow
@ -777,8 +785,7 @@ final class Scanner
/// or VALUE(block context): ':' (' '|'\n') /// or VALUE(block context): ':' (' '|'\n')
bool checkValue() @safe pure nothrow @nogc bool checkValue() @safe pure nothrow @nogc
{ {
mixin FastCharSearch!" \t\0\n\r\u0085\u2028\u2029"d search; return flowLevel_ > 0 || searchAllWhitespace.canFind(reader_.peek(1));
return flowLevel_ > 0 || search.canFind(reader_.peek(1));
} }
/// Check if the next token is a plain scalar. /// Check if the next token is a plain scalar.
@ -804,7 +811,6 @@ final class Scanner
{ {
return true; return true;
} }
mixin FastCharSearch!" \t\0\n\r\u0085\u2028\u2029"d searchAllWhitespace;
return !searchAllWhitespace.canFind(reader_.peek(1)) && return !searchAllWhitespace.canFind(reader_.peek(1)) &&
(c == '-' || (flowLevel_ == 0 && (c == '?' || c == ':'))); (c == '-' || (flowLevel_ == 0 && (c == '?' || c == ':')));
} }
@ -842,8 +848,7 @@ final class Scanner
/// Scan and throw away all characters until next line break. /// Scan and throw away all characters until next line break.
void scanToNextBreak() @safe pure nothrow @nogc void scanToNextBreak() @safe pure nothrow @nogc
{ {
mixin FastCharSearch!"\0\n\r\u0085\u2028\u2029"d search; while(!searchAllBreaks.canFind(reader_.peek())) { reader_.forward(); }
while(!search.canFind(reader_.peek())) { reader_.forward(); }
} }
/// Scan all characters until next line break. /// Scan all characters until next line break.
@ -1729,8 +1734,6 @@ final class Scanner
// document separators at the beginning of the line. // document separators at the beginning of the line.
// if(indent == 0) { indent = 1; } // if(indent == 0) { indent = 1; }
mixin FastCharSearch!" \t\0\n\r\u0085\u2028\u2029"d search;
reader_.sliceBuilder.begin(); reader_.sliceBuilder.begin();
alias Transaction = SliceBuilder.Transaction; alias Transaction = SliceBuilder.Transaction;
@ -1748,7 +1751,11 @@ final class Scanner
for(;;) for(;;)
{ {
const cNext = reader_.peek(length + 1); const cNext = reader_.peek(length + 1);
if(search.canFind(c) || (c == ':' && search.canFind(cNext))) { break; } if(searchAllWhitespace.canFind(c) ||
(c == ':' && searchAllWhitespace.canFind(cNext)))
{
break;
}
++length; ++length;
c = cNext; c = cNext;
} }
@ -1758,14 +1765,17 @@ final class Scanner
for(;;) for(;;)
{ {
c = reader_.peek(length); c = reader_.peek(length);
if(search.canFind(c) || ",:?[]{}"d.canFind(c)) { break; } if(searchAllWhitespace.canFind(c) || ",:?[]{}"d.canFind(c))
{
break;
}
++length; ++length;
} }
} }
// It's not clear what we should do with ':' in the flow context. // It's not clear what we should do with ':' in the flow context.
if(flowLevel_ > 0 && c == ':' && if(flowLevel_ > 0 && c == ':' &&
!search.canFind(reader_.peek(length + 1)) && !searchAllWhitespace.canFind(reader_.peek(length + 1)) &&
!",[]{}"d.canFind(reader_.peek(length + 1))) !",[]{}"d.canFind(reader_.peek(length + 1)))
{ {
// This is an error; throw the slice away. // This is an error; throw the slice away.