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

Rename lAnd → logicAnd and lOr → logicOr to be consistent with lParen meaning "left parenthesis". Added wstring and dstring types.

This commit is contained in:
Brian 2012-04-26 13:40:48 -07:00
parent 1dc70fb0ae
commit 023ab09a7e
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
langutils.d
View File

@ -59,10 +59,10 @@ enum TokenType: uint
vararg, /// ... vararg, /// ...
bitAnd, /// & bitAnd, /// &
bitAndEquals, /// &= bitAndEquals, /// &=
lAnd, /// && logicAnd, /// &&
bitOr, /// | bitOr, /// |
bitOrEquals, /// |= bitOrEquals, /// |=
lOr, /// || logicOr, /// ||
minus, /// - minus, /// -
minusEquals, /// -= minusEquals, /// -=
uMinus, /// -- uMinus, /// --
@ -119,6 +119,8 @@ enum TokenType: uint
// Types // Types
TYPES_BEGIN, TYPES_BEGIN,
tString, /// string tString, /// string
tWString, /// wstring
tDString, /// dstring
tBool, /// bool, tBool, /// bool,
tByte, /// byte, tByte, /// byte,
tCdouble, /// cdouble, tCdouble, /// cdouble,
@ -264,7 +266,11 @@ enum TokenType: uint
longLiteral, /// 123L longLiteral, /// 123L
unsignedLongLiteral, /// 123uL unsignedLongLiteral, /// 123uL
NUMBERS_END, NUMBERS_END,
STRINGS_BEGIN,
stringLiteral, /// "a string" stringLiteral, /// "a string"
wStringLiteral, /// "16-bit character string"w
dStringLiteral, /// "32-bit character string"d
STRINGS_END,
identifier, /// anything else identifier, /// anything else
whitespace, /// whitespace whitespace, /// whitespace
blank, /// unknown token type blank, /// unknown token type
@ -310,6 +316,7 @@ static this()
"deprecated" : TokenType.tDeprecated, "deprecated" : TokenType.tDeprecated,
"do" : TokenType.tDo, "do" : TokenType.tDo,
"double" : TokenType.tDouble, "double" : TokenType.tDouble,
"dstring" : TokenType.tDString,
"else" : TokenType.tElse, "else" : TokenType.tElse,
"enum" : TokenType.tEnum, "enum" : TokenType.tEnum,
"export" : TokenType.tExport, "export" : TokenType.tExport,
@ -384,6 +391,7 @@ static this()
"wchar" : TokenType.tWchar, "wchar" : TokenType.tWchar,
"while" : TokenType.tWhile, "while" : TokenType.tWhile,
"with" : TokenType.tWith, "with" : TokenType.tWith,
"wstring" : TokenType.tWString,
"__FILE__" : TokenType.t__FILE__, "__FILE__" : TokenType.t__FILE__,
"__LINE__" : TokenType.t__LINE__, "__LINE__" : TokenType.t__LINE__,
"__gshared" : TokenType.t__gshared, "__gshared" : TokenType.t__gshared,

7
tokenizer.d
View File

@ -49,7 +49,7 @@ pure nothrow string lexWhitespace(S)(S inputString, ref size_t endIndex,
} }
/** /**
* If inputString starts from #!, increments endIndex until it indexes the next line. * If inputString starts with #!, increments endIndex until it indexes the next line.
* Params: * Params:
* inputString = the source code to examine * inputString = the source code to examine
* endIndex = an index into inputString * endIndex = an index into inputString
@ -139,7 +139,6 @@ pure nothrow string lexComment(S)(ref S inputString, ref size_t endIndex,
* quote = the opening (and closing) quote character for the string to be * quote = the opening (and closing) quote character for the string to be
* lexed * lexed
* Returns: a string literal, including its opening and closing quote characters * Returns: a string literal, including its opening and closing quote characters
* Bugs: Does not handle string suffixes
*/ */
pure nothrow string lexString(S, C)(S inputString, ref size_t endIndex, ref uint lineNumber, pure nothrow string lexString(S, C)(S inputString, ref size_t endIndex, ref uint lineNumber,
C quote, bool canEscape = true) if (isSomeString!S && isSomeChar!C) C quote, bool canEscape = true) if (isSomeString!S && isSomeChar!C)
@ -609,14 +608,14 @@ Token[] tokenize(S)(S inputString, IterationStyle iterationStyle = IterationStyl
">", "TokenType.greater", ">", "TokenType.greater",
">=", "TokenType.greaterEqual", ">=", "TokenType.greaterEqual",
"#", "TokenType.hash", "#", "TokenType.hash",
"&&", "TokenType.lAnd", "&&", "TokenType.logicAnd",
"{", "TokenType.lBrace", "{", "TokenType.lBrace",
"[", "TokenType.lBracket", "[", "TokenType.lBracket",
"<", "TokenType.less", "<", "TokenType.less",
"<=", "TokenType.lessEqual", "<=", "TokenType.lessEqual",
"<>=", "TokenType.lessEqualGreater", "<>=", "TokenType.lessEqualGreater",
"<>", "TokenType.lessOrGreater", "<>", "TokenType.lessOrGreater",
"||", "TokenType.lOr", "||", "TokenType.logicOr",
"(", "TokenType.lParen", "(", "TokenType.lParen",
"-", "TokenType.minus", "-", "TokenType.minus",
"-=", "TokenType.minusEquals", "-=", "TokenType.minusEquals",