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

Built-in types are keywords

This commit is contained in:
Hackerpilot 2013-01-24 11:02:09 -08:00
parent f4b001f623
commit 9e670cca65
2 changed files with 40 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
highlighter.d
View File

@ -37,30 +37,20 @@ html { background-color: #fff; color: #222; }
foreach (Token t; tokens)
{
switch (t.type)
{
case TokenType.KEYWORDS_BEGIN: .. case TokenType.KEYWORDS_END:
writeSpan("kwrd", t.value);
break;
case TokenType.TYPES_BEGIN: .. case TokenType.TYPES_END:
if (t.type > TokenType.TYPES_BEGIN && t.type < TokenType.TYPES_END)
writeSpan("type", t.value);
break;
case TokenType.Comment:
else if (t.type > TokenType.KEYWORDS_BEGIN && t.type < TokenType.KEYWORDS_END)
writeSpan("kwrd", t.value);
else if (t.type == TokenType.Comment)
writeSpan("com", t.value);
break;
case TokenType.STRINGS_BEGIN: .. case TokenType.STRINGS_END:
else if (t.type > TokenType.STRINGS_BEGIN && t.type < TokenType.STRINGS_END)
writeSpan("str", t.value);
break;
case TokenType.NUMBERS_BEGIN: .. case TokenType.NUMBERS_END:
else if (t.type > TokenType.NUMBERS_BEGIN && t.type < TokenType.NUMBERS_END)
writeSpan("num", t.value);
break;
case TokenType.OPERATORS_BEGIN: .. case TokenType.OPERATORS_END:
else if (t.type > TokenType.OPERATORS_BEGIN && t.type < TokenType.OPERATORS_END)
writeSpan("op", t.value);
break;
default:
else
stdout.write(t.value.replace("<", "&lt;"));
break;
}
}
stdout.writeln("</pre>\n</body></html>");
}

66
std/d/lexer.d
View File

@ -539,42 +539,39 @@ enum TokenType: uint
XorEquals, /// ^=
OPERATORS_END, ///
// Types
TYPES_BEGIN, ///
Bool, /// bool
Byte, /// byte
Cdouble, /// cdouble
Cent, /// cent
Cfloat, /// cfloat
Char, /// char
Creal, /// creal
Dchar, /// dchar
Double, /// double
DString, /// dstring
Float, /// float
Function, /// function
Idouble, /// idouble
Ifloat, /// ifloat
Int, /// int
Ireal, /// ireal
Long, /// long
Real, /// real
Short, /// short
String, /// string
Ubyte, /// ubyte
Ucent, /// ucent
Uint, /// uint
Ulong, /// ulong
Ushort, /// ushort
Void, /// void
Wchar, /// wchar
WString, /// wstring
TYPES_END, ///
Template, /// template
// Keywords
// Keywords
KEYWORDS_BEGIN, ///
TYPES_BEGIN, ///
Bool, /// bool
Byte, /// byte
Cdouble, /// cdouble
Cent, /// cent
Cfloat, /// cfloat
Char, /// char
Creal, /// creal
Dchar, /// dchar
Double, /// double
DString, /// dstring
Float, /// float
Function, /// function
Idouble, /// idouble
Ifloat, /// ifloat
Int, /// int
Ireal, /// ireal
Long, /// long
Real, /// real
Short, /// short
String, /// string
Ubyte, /// ubyte
Ucent, /// ucent
Uint, /// uint
Ulong, /// ulong
Ushort, /// ushort
Void, /// void
Wchar, /// wchar
WString, /// wstring
TYPES_END, ///
ATTRIBUTES_BEGIN, ///
Align, /// align
Deprecated, /// deprecated
@ -643,6 +640,7 @@ enum TokenType: uint
Struct, /// struct
Super, /// super
Switch, /// switch
Template, /// template
This, /// this
Throw, /// throw
True, /// true