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

Merge branch 'range-based-lexer' of https://github.com/Hackerpilot/Dscanner into range-based-lexer

This commit is contained in:
Hackerpilot 2013-03-24 01:19:49 +00:00
parent 490d632a29 bd9ec03707
commit 41ec752e86
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
std/d/ast.d
View File

@ -74,6 +74,8 @@ class LabeledStatement : NonEmptyStatementNoCaseNoDefault
interface ExpressionStatement : NonEmptyStatementNoCaseNoDefault {}
interface DeclarationStatement : NonEmptyStatementNoCaseNoDefault {}
/+
/**
* $(LINK2 http://dlang.org/statement.html#IfStatement)
*/
@ -395,3 +397,6 @@ class Inherits : DeclDef
//FunctionDeclaration[] functions;
}
+/
+/

24
std/d/lexer.d
View File

@ -174,7 +174,7 @@ struct Token
/**
* Checks to see if the token is of the given type.
*/
bool opEquals(TokenType type) const { return type == type; }
bool opEquals(TokenType type) const { return this.type == type; }
/**
* Comparison operator orders tokens by start index.
@ -393,7 +393,6 @@ L_advance:
// since this branch at most is taken once per file
_empty = true;
return;
// pragma(msg, generateCaseTrie(
mixin(generateCaseTrie(
"=", "TokenType.assign",
"@", "TokenType.at",
@ -485,7 +484,7 @@ L_advance:
if (!src.canPeek())
{
current.type = TokenType.dot;
current.value = getTokenValue(TokenType.dot);
current.value = tokenValue!(TokenType.dot);
return;
}
switch (src.peek())
@ -501,13 +500,15 @@ L_advance:
{
current.type = TokenType.vararg;
nextCharNonLF();
current.value = tokenValue!(TokenType.vararg);
}
current.value = getTokenValue(current.type);
else
current.value = tokenValue!(TokenType.slice);
return;
default:
nextCharNonLF();
current.type = TokenType.dot;
current.value = getTokenValue(TokenType.dot);
current.value = tokenValue!(TokenType.dot);
return;
}
case '0': .. case '9':
@ -1464,7 +1465,7 @@ L_advance:
else
{
current.type = TokenType.hash;
current.value = getTokenValue(TokenType.hash);
current.value = tokenValue!(TokenType.hash);
}
}
@ -2705,6 +2706,11 @@ pure string getTokenValue(const TokenType type)
return tokenValues[type];
}
template tokenValue(TokenType val)
{
enum tokenValue = getTokenValue(val);
}
private pure bool isNewline(ubyte ch)
{
return ch == '\n' || ch == '\r';
@ -2955,7 +2961,7 @@ string printCaseStatements(K, V)(TrieNode!(K,V) node, string indentString)
caseStatement ~= indentString;
caseStatement ~= "\t{\n";
caseStatement ~= indentString;
caseStatement ~= "\t\tcurrent.value = getTokenValue(current.type);\n";
caseStatement ~= "\t\tcurrent.value = tokenValue!("~node.children[k].value~");\n";
caseStatement ~= indentString;
caseStatement ~= "\t\tcurrent.type = " ~ node.children[k].value;
caseStatement ~= ";\n";
@ -2975,7 +2981,7 @@ string printCaseStatements(K, V)(TrieNode!(K,V) node, string indentString)
caseStatement ~= v.value;
caseStatement ~= ";\n";
caseStatement ~= indentString;
caseStatement ~= "\t\tcurrent.value = getTokenValue(current.type);\n";
caseStatement ~= "\t\tcurrent.value = tokenValue!("~v.value~");\n";
caseStatement ~= indentString;
caseStatement ~= "\t\treturn;\n";
caseStatement ~= indentString;
@ -2988,7 +2994,7 @@ string printCaseStatements(K, V)(TrieNode!(K,V) node, string indentString)
caseStatement ~= v.value;
caseStatement ~= ";\n";
caseStatement ~= indentString;
caseStatement ~= "\tcurrent.value = getTokenValue(current.type);\n";
caseStatement ~= "\tcurrent.value = tokenValue!("~v.value~");\n";
caseStatement ~= indentString;
caseStatement ~= "\treturn;\n";
}