Browse Source

Introduce ScalaTokenConstants.numberOfTokens

Robin Maisch 4 years ago
parent
commit
cedac83870

+ 1 - 0
jplag.frontend.scala/src/main/scala/de/jplag/scala/ScalaTokenConstants.scala

@@ -78,5 +78,6 @@ object ScalaTokenConstants extends Enumeration with TokenConstants {
   val EnumGenerator: Value = Value("ENUMERATE")
   val EnumGenerator: Value = Value("ENUMERATE")
   val Member: Value = Value("MEMBER")
   val Member: Value = Value("MEMBER")
 
 
+  def numberOfTokens() : Int = maxId
 }
 }
 
 

+ 2 - 2
jplag.frontend.scala/src/test/java/de/jplag/scala/ScalaFrontendTest.java

@@ -76,7 +76,7 @@ class ScalaFrontendTest {
      */
      */
     @Test
     @Test
     void testTokenToString() {
     void testTokenToString() {
-        var missingTokens = IntStream.range(0, language.numberOfTokens())
+        var missingTokens = IntStream.range(0, ScalaTokenConstants.numberOfTokens())
                 .mapToObj(type -> new ScalaToken(type, NOT_SET_STRING, NOT_SET, NOT_SET, NOT_SET))
                 .mapToObj(type -> new ScalaToken(type, NOT_SET_STRING, NOT_SET, NOT_SET, NOT_SET))
                 .filter(token -> token.type2string().contains("UNKNOWN")).toList();
                 .filter(token -> token.type2string().contains("UNKNOWN")).toList();
 
 
@@ -162,7 +162,7 @@ class ScalaFrontendTest {
      */
      */
     private void testTokenCoverage(TokenList tokens, String fileName) {
     private void testTokenCoverage(TokenList tokens, String fileName) {
         var foundTokens = StreamSupport.stream(tokens.allTokens().spliterator(), true).mapToInt(Token::getType).distinct().boxed().toList();
         var foundTokens = StreamSupport.stream(tokens.allTokens().spliterator(), true).mapToInt(Token::getType).distinct().boxed().toList();
-        var allTokens = IntStream.range(0, language.numberOfTokens()).boxed().toList();
+        var allTokens = IntStream.range(0, ScalaTokenConstants.numberOfTokens()).boxed().toList();
         allTokens = new ArrayList<>(allTokens);
         allTokens = new ArrayList<>(allTokens);
 
 
         // Only non-found tokens are left
         // Only non-found tokens are left