diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-05-12 15:38:52 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-05-12 15:38:52 +0200 |
| commit | bee984365cb01ee08432097ef1cfb69bec16a3ed (patch) | |
| tree | 7f82aa9b6b855483c178b3a1cfb65a5fde7f5dcb | |
| parent | 8ad635e599e5d16c80fbf36cc3dd3f6e9466e409 (diff) | |
| download | dotty-bee984365cb01ee08432097ef1cfb69bec16a3ed.tar.gz dotty-bee984365cb01ee08432097ef1cfb69bec16a3ed.tar.bz2 dotty-bee984365cb01ee08432097ef1cfb69bec16a3ed.zip | |
Various fixes to token sets.
| -rw-r--r-- | src/dotty/tools/dotc/parsing/Tokens.scala | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dotty/tools/dotc/parsing/Tokens.scala b/src/dotty/tools/dotc/parsing/Tokens.scala index 94e8a6ff3..d33fcf3a7 100644 --- a/src/dotty/tools/dotc/parsing/Tokens.scala +++ b/src/dotty/tools/dotc/parsing/Tokens.scala @@ -46,8 +46,6 @@ object Tokens { final val INTERPOLATIONID = 10; enter(INTERPOLATIONID, "string interpolator") final val SYMBOLLIT = 11; enter(SYMBOLLIT, "symbol literal") // TODO: deprecate - final val literalTokens = tokenRange(CHARLIT, SYMBOLLIT) - /** identifiers */ final val IDENTIFIER = 12; enter(IDENTIFIER, "identifier") final val BACKQUOTED_IDENT = 13; enter(BACKQUOTED_IDENT, "identifier", "backquoted ident") @@ -97,11 +95,11 @@ object Tokens { final val WHILE = 56; enter(WHILE, "while") final val RETURN = 57; enter(RETURN, "return") final val MATCH = 58; enter(MATCH, "match") - final val FORSOME = 59; enter(FORSOME, "forSome") // TODO: deprecate - final val LAZY = 61; enter(LAZY, "lazy") - final val THEN = 62; enter(THEN, "then") + final val LAZY = 59; enter(LAZY, "lazy") + final val THEN = 60; enter(THEN, "then") + final val FORSOME = 61; enter(FORSOME, "forSome") // TODO: deprecate - final val alphaKeywords = tokenRange(IF, LAZY) + final val alphaKeywords = tokenRange(IF, FORSOME) /** special symbols */ final val COMMA = 70; enter(COMMA, "','") @@ -113,7 +111,7 @@ object Tokens { /** special keywords */ final val USCORE = 73; enter(USCORE, "_") final val COLON = 74; enter(COLON, ":") - final val EQUALS = 75; enter(EQUALS, "==") + final val EQUALS = 75; enter(EQUALS, "=") final val LARROW = 76; enter(LARROW, "<-") final val ARROW = 77; enter(ARROW, "=>") final val SUBTYPE = 80; enter(SUBTYPE, "<:") @@ -142,6 +140,8 @@ object Tokens { final val allTokens = tokenRange(minToken, maxToken) + final val literalTokens = tokenRange(CHARLIT, SYMBOLLIT) | BitSet(TRUE, FALSE, NULL) + final val atomicExprTokens = literalTokens | identifierTokens | BitSet( USCORE, NULL, THIS, SUPER, TRUE, FALSE, RETURN, XMLSTART) @@ -171,7 +171,7 @@ object Tokens { IMPORT, PACKAGE) final val canStartStatTokens = canStartExpressionTokens | mustStartStatTokens | BitSet( - AT) + AT, CASE) final val canEndStatTokens = atomicExprTokens | BitSet( TYPE, RPAREN, RBRACE, RBRACKET) |