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) foreach (Token t; tokens)
{ {
switch (t.type) if (t.type > TokenType.TYPES_BEGIN && t.type < TokenType.TYPES_END)
{
case TokenType.KEYWORDS_BEGIN: .. case TokenType.KEYWORDS_END:
writeSpan("kwrd", t.value);
break;
case TokenType.TYPES_BEGIN: .. case TokenType.TYPES_END:
writeSpan("type", t.value); writeSpan("type", t.value);
break; else if (t.type > TokenType.KEYWORDS_BEGIN && t.type < TokenType.KEYWORDS_END)
case TokenType.Comment: writeSpan("kwrd", t.value);
else if (t.type == TokenType.Comment)
writeSpan("com", t.value); writeSpan("com", t.value);
break; else if (t.type > TokenType.STRINGS_BEGIN && t.type < TokenType.STRINGS_END)
case TokenType.STRINGS_BEGIN: .. case TokenType.STRINGS_END:
writeSpan("str", t.value); writeSpan("str", t.value);
break; else if (t.type > TokenType.NUMBERS_BEGIN && t.type < TokenType.NUMBERS_END)
case TokenType.NUMBERS_BEGIN: .. case TokenType.NUMBERS_END:
writeSpan("num", t.value); writeSpan("num", t.value);
break; else if (t.type > TokenType.OPERATORS_BEGIN && t.type < TokenType.OPERATORS_END)
case TokenType.OPERATORS_BEGIN: .. case TokenType.OPERATORS_END:
writeSpan("op", t.value); writeSpan("op", t.value);
break; else
default:
stdout.write(t.value.replace("<", "&lt;")); stdout.write(t.value.replace("<", "&lt;"));
break;
}
} }
stdout.writeln("</pre>\n</body></html>"); stdout.writeln("</pre>\n</body></html>");
} }

10
std/d/lexer.d
View File

@ -539,7 +539,9 @@ enum TokenType: uint
XorEquals, /// ^= XorEquals, /// ^=
OPERATORS_END, /// OPERATORS_END, ///
// Types
// Keywords
KEYWORDS_BEGIN, ///
TYPES_BEGIN, /// TYPES_BEGIN, ///
Bool, /// bool Bool, /// bool
Byte, /// byte Byte, /// byte
@ -570,11 +572,6 @@ enum TokenType: uint
Wchar, /// wchar Wchar, /// wchar
WString, /// wstring WString, /// wstring
TYPES_END, /// TYPES_END, ///
Template, /// template
// Keywords
KEYWORDS_BEGIN, ///
ATTRIBUTES_BEGIN, /// ATTRIBUTES_BEGIN, ///
Align, /// align Align, /// align
Deprecated, /// deprecated Deprecated, /// deprecated
@ -643,6 +640,7 @@ enum TokenType: uint
Struct, /// struct Struct, /// struct
Super, /// super Super, /// super
Switch, /// switch Switch, /// switch
Template, /// template
This, /// this This, /// this
Throw, /// throw Throw, /// throw
True, /// true True, /// true