forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

eliminating more of extra ops from the common path

This commit is contained in:
Dmitry Olshansky 2013-02-27 23:12:46 +04:00
parent 47b77ef6cc
commit eb422f65d1
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
std/d/lexer.d
View File

@ -715,30 +715,26 @@ private:
* Advances the range to the next token * Advances the range to the next token
*/ */
void advance() void advance()
{ {
if (isEoF()) if (src.empty)
{ {
_empty = true; _empty = true;
return; return;
} }
src.mark(); // mark a start of a lexing "frame"
src.mark(); // mark a start of a lexing "frame"
current.line = lineNumber; current.line = lineNumber;
current.startIndex = src.index; current.startIndex = src.index;
current.column = column; current.column = column;
current.value = null; current.value = null;
if (isWhite())
{
if (config.iterStyle & IterationStyle.includeWhitespace)
lexWhitespace!true();
else
lexWhitespace!false();
return;
}
switch (src.front) switch (src.front)
{ {
// handle sentenels for end of input
case 0:
case 0x1a:
// TODO: check config flags, it's cheap
// since this branch at most is taken once per file
_empty = true;
return;
// pragma(msg, generateCaseTrie( // pragma(msg, generateCaseTrie(
mixin(generateCaseTrie( mixin(generateCaseTrie(
"=", "TokenType.assign", "=", "TokenType.assign",
@ -907,10 +903,26 @@ private:
case '#': case '#':
lexSpecialTokenSequence(); lexSpecialTokenSequence();
return; return;
default: // "short" ASCII whites
while(!isEoF() && !isSeparating()) case 0x20:
case 0x09: .. case 0x0d:
if (config.iterStyle & IterationStyle.includeWhitespace)
return lexWhitespace!true();
return lexWhitespace!false();
default:
if ((src.front & 0x80) && isLongWhite())
{
if (config.iterStyle & IterationStyle.includeWhitespace)
return lexWhitespace!true();
return lexWhitespace!false();
}
for(;;)
{ {
if(isSeparating())
break;
nextCharNonLF(); nextCharNonLF();
if(isEoF())
break;
} }
current.type = lookupTokenType(src.slice); current.type = lookupTokenType(src.slice);
@ -1552,7 +1564,7 @@ private:
import std.stdio; import std.stdio;
if(unescaped != Appender!(ubyte[]).init) if(unescaped != Appender!(ubyte[]).init)
{ {
//stuff in the last slice and used buffered data //stuff in the last slice and use buffered data
unescaped.put(src.slice); unescaped.put(src.slice);
setData(unescaped.data); setData(unescaped.data);
} }