forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add syntax highlight for safe system trusted @property @nogc @disable - implement #319

This commit is contained in:
Vadim Lopatin 2017-09-22 11:33:30 +03:00
parent 33fa1056dd
commit 9674e404fa
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/ddc/lexer/tokenizer.d
View File

@ -580,6 +580,11 @@ dstring getOpNameD(OpCode op) pure nothrow {
enum Keyword : ubyte { enum Keyword : ubyte {
NONE, NONE,
AT_DISABLE, //"@disable",
AT_NOGC, //"@nogc",
AT_PROPERTY, //"@property",
ABSTRACT, ABSTRACT,
ALIAS, ALIAS,
ALIGN, ALIGN,
@ -667,6 +672,7 @@ enum Keyword : ubyte {
REF, REF,
RETURN, RETURN,
SAFE,
SCOPE, SCOPE,
SHARED, SHARED,
SHORT, SHORT,
@ -675,11 +681,13 @@ enum Keyword : ubyte {
SUPER, SUPER,
SWITCH, SWITCH,
SYNCHRONIZED, SYNCHRONIZED,
SYSTEM,
TEMPLATE, TEMPLATE,
THIS, THIS,
THROW, THROW,
TRUE, TRUE,
TRUSTED,
TRY, TRY,
TYPEDEF, TYPEDEF,
TYPEID, TYPEID,
@ -724,6 +732,11 @@ enum Keyword : ubyte {
immutable dstring[] KEYWORD_STRINGS = [ immutable dstring[] KEYWORD_STRINGS = [
"", "",
"@disable",
"@nogc",
"@property",
"abstract", "abstract",
"alias", "alias",
"align", "align",
@ -811,6 +824,7 @@ immutable dstring[] KEYWORD_STRINGS = [
"ref", "ref",
"return", "return",
"safe",
"scope", "scope",
"shared", "shared",
"short", "short",
@ -819,11 +833,13 @@ immutable dstring[] KEYWORD_STRINGS = [
"super", "super",
"switch", "switch",
"synchronized", "synchronized",
"system",
"template", "template",
"this", "this",
"throw", "throw",
"true", "true",
"trusted",
"try", "try",
"typedef", "typedef",
"typeid", "typeid",
@ -2142,10 +2158,14 @@ class Tokenizer
} }
protected Keyword detectKeyword(dchar ch) { protected Keyword detectKeyword(dchar ch) {
if (ch > 'z') if (ch < '@' || ch > 'z')
return Keyword.NONE; return Keyword.NONE;
int len = _len - _pos; int len = _len - _pos;
switch (cast(ubyte)ch) { switch (cast(ubyte)ch) {
// AT_DISABLE
// AT_NOGC
// AT_PROPERTY
case '@': return findKeyword(Keyword.AT_DISABLE, Keyword.AT_PROPERTY, _lineText.ptr + _pos, len, _pos);
// ABSTRACT, // ABSTRACT,
// ALIAS, // ALIAS,
// ALIGN, // ALIGN,
@ -2246,7 +2266,8 @@ class Tokenizer
// REF, // REF,
// RETURN, // RETURN,
case 'r': return findKeyword(Keyword.REAL, Keyword.RETURN, _lineText.ptr + _pos, len, _pos); case 'r': return findKeyword(Keyword.REAL, Keyword.RETURN, _lineText.ptr + _pos, len, _pos);
// SAFE
// SCOPE, // SCOPE,
// SHARED, // SHARED,
// SHORT, // SHORT,
@ -2255,7 +2276,8 @@ class Tokenizer
// SUPER, // SUPER,
// SWITCH, // SWITCH,
// SYNCHRONIZED, // SYNCHRONIZED,
case 's': return findKeyword(Keyword.SCOPE, Keyword.SYNCHRONIZED, _lineText.ptr + _pos, len, _pos); // SYSTEM
case 's': return findKeyword(Keyword.SAFE, Keyword.SYSTEM, _lineText.ptr + _pos, len, _pos);
// TEMPLATE, // TEMPLATE,
// THIS, // THIS,
@ -2787,7 +2809,7 @@ class Tokenizer
if (ch == '.' && next >= '0' && next <= '9') // .123 if (ch == '.' && next >= '0' && next <= '9') // .123
return processDecFloatSecondPart(0); return processDecFloatSecondPart(0);
if (ch == '_' || isUniversalAlpha(ch)) { if (ch == '_' || ch == '@' || isUniversalAlpha(ch)) {
// start of identifier or keyword? // start of identifier or keyword?
Keyword keyword = detectKeyword(ch); Keyword keyword = detectKeyword(ch);
if (keyword != Keyword.NONE) { if (keyword != Keyword.NONE) {