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

Fix TokenID implementation: The order of tokens in the static if branches was wrong. Using a simplified uniform array avoids these errors. Fix tokenStringRepresentation, it had the wrong order of comparisons just like TokenID.

This commit is contained in:
Andrej Mitrovic 2014-02-11 12:50:43 +01:00
parent a5d7bf0956
commit fdad20c7c5
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
stdx/lexer.d
View File

@ -140,18 +140,33 @@ template TokenIdType(alias staticTokens, alias dynamicTokens,
*/ */
string tokenStringRepresentation(IdType, alias staticTokens, alias dynamicTokens, alias possibleDefaultTokens)(IdType type) @property string tokenStringRepresentation(IdType, alias staticTokens, alias dynamicTokens, alias possibleDefaultTokens)(IdType type) @property
{ {
enum tokens = staticTokens ~ dynamicTokens ~ possibleDefaultTokens;
if (type == 0) if (type == 0)
return "!ERROR!"; return "!ERROR!";
else if (type < staticTokens.length + 1) else if (type < tokens.length + 1)
return staticTokens[type - 1]; return tokens[type - 1];
else if (type < staticTokens.length + possibleDefaultTokens.length + 1)
return possibleDefaultTokens[type - staticTokens.length - 1];
else if (type < staticTokens.length + possibleDefaultTokens.length + dynamicTokens.length + 1)
return dynamicTokens[type - staticTokens.length - possibleDefaultTokens.length - 1];
else else
return null; return null;
} }
unittest
{
/// Fix https://github.com/Hackerpilot/Dscanner/issues/96
alias IdType = TokenIdType!(["foo"], ["bar"], ["doo"]);
template tok(string token)
{
alias tok = TokenId!(IdType, ["foo"], ["bar"], ["doo"], token);
}
alias str = tokenStringRepresentation!(IdType, ["foo"], ["bar"], ["doo"]);
static assert(str(tok!"foo") == "foo");
static assert(str(tok!"bar") == "bar");
static assert(str(tok!"doo") == "doo");
}
/** /**
* Generates the token type identifier for the given symbol. There are two * Generates the token type identifier for the given symbol. There are two
* special cases: * special cases:
@ -178,6 +193,8 @@ string tokenStringRepresentation(IdType, alias staticTokens, alias dynamicTokens
template TokenId(IdType, alias staticTokens, alias dynamicTokens, template TokenId(IdType, alias staticTokens, alias dynamicTokens,
alias possibleDefaultTokens, string symbol) alias possibleDefaultTokens, string symbol)
{ {
enum tokens = staticTokens ~ dynamicTokens ~ possibleDefaultTokens;
import std.algorithm; import std.algorithm;
static if (symbol == "") static if (symbol == "")
{ {
@ -186,36 +203,20 @@ template TokenId(IdType, alias staticTokens, alias dynamicTokens,
} }
else static if (symbol == "\0") else static if (symbol == "\0")
{ {
enum id = 1 + staticTokens.length + dynamicTokens.length + possibleDefaultTokens.length; enum id = 1 + tokens.length;
alias TokenId = id; alias TokenId = id;
} }
else else
{ {
enum i = staticTokens.countUntil(symbol); enum i = tokens.countUntil(symbol);
static if (i >= 0) static if (i != -1)
{ {
enum id = i + 1; enum id = i + 1;
static assert (id >= 0 && id < IdType.max, "Invalid token: " ~ symbol);
alias TokenId = id; alias TokenId = id;
} }
else else
{ static assert (0, "Invalid token: " ~ symbol);
enum ii = possibleDefaultTokens.countUntil(symbol);
static if (ii >= 0)
{
enum id = ii + staticTokens.length + 1;
static assert (id >= 0 && id < IdType.max, "Invalid token: " ~ symbol);
alias TokenId = id;
}
else
{
enum dynamicId = dynamicTokens.countUntil(symbol);
enum id = dynamicId >= 0
? i + staticTokens.length + possibleDefaultTokens.length + dynamicId + 1
: -1;
static assert (id >= 0 && id < IdType.max, "Invalid token: " ~ symbol);
alias TokenId = id;
}
}
} }
} }