Skip to content

Commit 57ad97e

Browse files
committed
Remove forward references in JavaTokens.scala
1 parent b353088 commit 57ad97e

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

src/dotty/tools/dotc/parsing/JavaTokens.scala

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@ import collection.immutable.BitSet
66

77
object JavaTokens extends TokensCommon {
88
final val minToken = EMPTY
9-
final val maxToken = DOUBLE
10-
11-
final val javaOnlyKeywords = tokenRange(INSTANCEOF, ASSERT)
12-
final val sharedKeywords = BitSet( IF, FOR, ELSE, THIS, NULL, NEW, SUPER, ABSTRACT, FINAL, PRIVATE, PROTECTED,
13-
OVERRIDE, EXTENDS, TRUE, FALSE, CLASS, IMPORT, PACKAGE, DO, THROW, TRY, CATCH, FINALLY, WHILE, RETURN )
14-
final val primTypes = tokenRange(VOID, DOUBLE)
15-
final val keywords = sharedKeywords | javaOnlyKeywords | primTypes
9+
final val maxToken = 188
1610

1711
/** keywords */
1812
final val INSTANCEOF = 101; enter(INSTANCEOF, "instanceof")
@@ -89,4 +83,13 @@ object JavaTokens extends TokensCommon {
8983
final val LONG = 186; enter(LONG, "long")
9084
final val FLOAT = 187; enter(FLOAT, "float")
9185
final val DOUBLE = 188; enter(DOUBLE, "double")
86+
87+
assert(maxToken == DOUBLE, "change if maxToken changes")
88+
89+
final val sharedKeywords = BitSet( IF, FOR, ELSE, THIS, NULL, NEW, SUPER, ABSTRACT, FINAL, PRIVATE, PROTECTED,
90+
OVERRIDE, EXTENDS, TRUE, FALSE, CLASS, IMPORT, PACKAGE, DO, THROW, TRY, CATCH, FINALLY, WHILE, RETURN )
91+
final val javaOnlyKeywords = tokenRange(INSTANCEOF, ASSERT)
92+
93+
final val primTypes = tokenRange(VOID, DOUBLE)
94+
final val keywords = sharedKeywords | javaOnlyKeywords | primTypes
9295
}

0 commit comments

Comments
 (0)