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

Using the Scanner FastCharSearches wherever they apply.

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

21
source/dyaml/scanner.d
View file

@ -752,7 +752,7 @@ final class Scanner
return reader_.column == 0 && return reader_.column == 0 &&
reader_.peekByte() == '-' && reader_.peekByte() == '-' &&
reader_.prefix(3) == "---" && reader_.prefix(3) == "---" &&
" \t\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek(3)); searchAllWhitespace.canFind(reader_.peek(3));
} }
/// Check if the next token is DOCUMENT-END: ^ '...' (' '|'\n') /// Check if the next token is DOCUMENT-END: ^ '...' (' '|'\n')
@ -762,13 +762,13 @@ final class Scanner
return reader_.column == 0 && return reader_.column == 0 &&
reader_.peekByte() == '.' && reader_.peekByte() == '.' &&
reader_.prefix(3) == "..." && reader_.prefix(3) == "..." &&
" \t\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek(3)); searchAllWhitespace.canFind(reader_.peek(3));
} }
/// Check if the next token is BLOCK-ENTRY: '-' (' '|'\n') /// Check if the next token is BLOCK-ENTRY: '-' (' '|'\n')
bool checkBlockEntry() @safe pure nothrow @nogc bool checkBlockEntry() @safe pure nothrow @nogc
{ {
return " \t\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek(1)); return searchAllWhitespace.canFind(reader_.peek(1));
} }
/// Check if the next token is KEY(flow context): '?' /// Check if the next token is KEY(flow context): '?'
@ -776,8 +776,7 @@ final class Scanner
/// or KEY(block context): '?' (' '|'\n') /// or KEY(block context): '?' (' '|'\n')
bool checkKey() @safe pure nothrow @nogc bool checkKey() @safe pure nothrow @nogc
{ {
return (flowLevel_ > 0 || return (flowLevel_ > 0 || searchAllWhitespace.canFind(reader_.peek(1)));
" \t\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek(1)));
} }
/// Check if the next token is VALUE(flow context): ':' /// Check if the next token is VALUE(flow context): ':'
@ -858,7 +857,7 @@ final class Scanner
void scanToNextBreakToSlice() @system pure nothrow @nogc void scanToNextBreakToSlice() @system pure nothrow @nogc
{ {
uint length = 0; uint length = 0;
while(!"\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek(length))) while(!searchAllBreaks.canFind(reader_.peek(length)))
{ {
++length; ++length;
} }
@ -1077,7 +1076,7 @@ final class Scanner
{ {
findNextNonSpace(); findNextNonSpace();
if(reader_.peekByte() == '#') { scanToNextBreak(); } if(reader_.peekByte() == '#') { scanToNextBreak(); }
if("\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek())) if(searchAllBreaks.canFind(reader_.peek()))
{ {
scanLineBreak(); scanLineBreak();
return; return;
@ -1111,7 +1110,7 @@ final class Scanner
char[] value = reader_.sliceBuilder.finish(); char[] value = reader_.sliceBuilder.finish();
if(error_) { return Token.init; } if(error_) { return Token.init; }
if(!" \t\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek()) && if(!searchAllWhitespace.canFind(reader_.peek()) &&
!"?:,]}%@"d.canFind(reader_.peekByte())) !"?:,]}%@"d.canFind(reader_.peekByte()))
{ {
enum anchorCtx = "While scanning an anchor"; enum anchorCtx = "While scanning an anchor";
@ -1162,7 +1161,7 @@ final class Scanner
} }
reader_.forward(); reader_.forward();
} }
else if(" \t\0\n\r\u0085\u2028\u2029"d.canFind(c)) else if(searchAllWhitespace.canFind(c))
{ {
reader_.forward(); reader_.forward();
handleEnd = 0; handleEnd = 0;
@ -1442,7 +1441,7 @@ final class Scanner
findNextNonSpace(); findNextNonSpace();
if(reader_.peekByte()== '#') { scanToNextBreak(); } if(reader_.peekByte()== '#') { scanToNextBreak(); }
if("\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek())) if(searchAllBreaks.canFind(reader_.peek()))
{ {
scanLineBreak(); scanLineBreak();
return; return;
@ -1699,7 +1698,7 @@ final class Scanner
// Instead of checking indentation, we check for document separators. // Instead of checking indentation, we check for document separators.
const prefix = reader_.prefix(3); const prefix = reader_.prefix(3);
if((prefix == "---" || prefix == "...") && if((prefix == "---" || prefix == "...") &&
" \t\0\n\r\u0085\u2028\u2029"d.canFind(reader_.peek(3))) searchAllWhitespace.canFind(reader_.peek(3)))
{ {
error("While scanning a quoted scalar", startMark, error("While scanning a quoted scalar", startMark,
"found unexpected document separator", reader_.mark); "found unexpected document separator", reader_.mark);