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

Renamed tokens for consistency

This commit is contained in:
Hackerpilot 2013-02-22 22:24:23 +00:00
parent 119c6b917d
commit bfd6c55de3
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
std/d/lexer.d
View File

@ -744,10 +744,10 @@ private:
"=", "TokenType.assign", "=", "TokenType.assign",
"@", "TokenType.at", "@", "TokenType.at",
"&", "TokenType.bitAnd", "&", "TokenType.bitAnd",
"&=", "TokenType.bitAndEquals", "&=", "TokenType.bitAndEqual",
"|", "TokenType.bitOr", "|", "TokenType.bitOr",
"|=", "TokenType.bitOrEquals", "|=", "TokenType.bitOrEqual",
"~=", "TokenType.catEquals", "~=", "TokenType.catEqual",
":", "TokenType.colon", ":", "TokenType.colon",
",", "TokenType.comma", ",", "TokenType.comma",
"--", "TokenType.decrement", "--", "TokenType.decrement",
@ -767,21 +767,21 @@ private:
"||", "TokenType.logicOr", "||", "TokenType.logicOr",
"(", "TokenType.lParen", "(", "TokenType.lParen",
"-", "TokenType.minus", "-", "TokenType.minus",
"-=", "TokenType.minusEquals", "-=", "TokenType.minusEqual",
"%", "TokenType.mod", "%", "TokenType.mod",
"%=", "TokenType.modEquals", "%=", "TokenType.modEqual",
"*=", "TokenType.mulEquals", "*=", "TokenType.mulEqual",
"!", "TokenType.not", "!", "TokenType.not",
"!=", "TokenType.notEquals", "!=", "TokenType.notEqual",
"!>", "TokenType.notGreater", "!>", "TokenType.notGreater",
"!>=", "TokenType.notGreaterEqual", "!>=", "TokenType.notGreaterEqual",
"!<", "TokenType.notLess", "!<", "TokenType.notLess",
"!<=", "TokenType.notLessEqual", "!<=", "TokenType.notLessEqual",
"!<>", "TokenType.notLessEqualGreater", "!<>", "TokenType.notLessEqualGreater",
"+", "TokenType.plus", "+", "TokenType.plus",
"+=", "TokenType.plusEquals", "+=", "TokenType.plusEqual",
"^^", "TokenType.pow", "^^", "TokenType.pow",
"^^=", "TokenType.powEquals", "^^=", "TokenType.powEqual",
"}", "TokenType.rBrace", "}", "TokenType.rBrace",
"]", "TokenType.rBracket", "]", "TokenType.rBracket",
")", "TokenType.rParen", ")", "TokenType.rParen",
@ -797,7 +797,7 @@ private:
">>>", "TokenType.unsignedShiftRight", ">>>", "TokenType.unsignedShiftRight",
">>>=", "TokenType.unsignedShiftRightEqual", ">>>=", "TokenType.unsignedShiftRightEqual",
"^", "TokenType.xor", "^", "TokenType.xor",
"^=", "TokenType.xorEquals", "^=", "TokenType.xorEqual",
)); ));
case '/': case '/':
nextCharNonLF(); nextCharNonLF();
@ -2325,10 +2325,10 @@ enum TokenType: ushort
assign, /// = assign, /// =
at, /// @ at, /// @
bitAnd, /// & bitAnd, /// &
bitAndEquals, /// &= bitAndEqual, /// &=
bitOr, /// | bitOr, /// |
bitOrEquals, /// |= bitOrEqual, /// |=
catEquals, /// ~= catEqual, /// ~=
colon, /// : colon, /// :
comma, /// , comma, /// ,
decrement, /// -- decrement, /// --
@ -2352,21 +2352,21 @@ enum TokenType: ushort
logicOr, /// || logicOr, /// ||
lParen, /// $(LPAREN) lParen, /// $(LPAREN)
minus, /// - minus, /// -
minusEquals, /// -= minusEqual, /// -=
mod, /// % mod, /// %
modEquals, /// %= modEqual, /// %=
mulEquals, /// *= mulEqual, /// *=
not, /// ! not, /// !
notEquals, /// != notEqual, /// !=
notGreater, /// !> notGreater, /// !>
notGreaterEqual, /// !>= notGreaterEqual, /// !>=
notLess, /// !< notLess, /// !<
notLessEqual, /// !<= notLessEqual, /// !<=
notLessEqualGreater, /// !<> notLessEqualGreater, /// !<>
plus, /// + plus, /// +
plusEquals, /// += plusEqual, /// +=
pow, /// ^^ pow, /// ^^
powEquals, /// ^^= powEqual, /// ^^=
rBrace, /// } rBrace, /// }
rBracket, /// ] rBracket, /// ]
rParen, /// $(RPAREN) rParen, /// $(RPAREN)
@ -2384,7 +2384,7 @@ enum TokenType: ushort
unsignedShiftRightEqual, /// >>>= unsignedShiftRightEqual, /// >>>=
vararg, /// ... vararg, /// ...
xor, /// ^ xor, /// ^
xorEquals, /// ^= xorEqual, /// ^=
bool_, /// $(D_KEYWORD bool) bool_, /// $(D_KEYWORD bool)
byte_, /// $(D_KEYWORD byte) byte_, /// $(D_KEYWORD byte)
@ -2522,6 +2522,7 @@ enum TokenType: ushort
dstringLiteral, /// $(D_STRING "32-bit character string"d) dstringLiteral, /// $(D_STRING "32-bit character string"d)
stringLiteral, /// $(D_STRING "an 8-bit string") stringLiteral, /// $(D_STRING "an 8-bit string")
wstringLiteral, /// $(D_STRING "16-bit character string"w) wstringLiteral, /// $(D_STRING "16-bit character string"w)
invalid, /// Not a valid token type
} }
// Implementation details follow // Implementation details follow
@ -2734,6 +2735,7 @@ immutable(string[TokenType.max + 1]) tokenValues = [
null, null,
null, null,
null, null,
null,
]; ];
pure string getTokenValue(const TokenType type) pure string getTokenValue(const TokenType type)