Merge pull request #43 from KacperFKorban/fix-more-overflows

Fix StackOverflowError caused by recursive calls in fetchToken for files with huge amounts of commented lines

Author: tgodzik

src/main/java/com/virtuslab/using_directives/custom/Scanner.java

@@ -415,6 +415,11 @@ private boolean pastBlankLine() {
   }
 
   private void fetchToken() {
+    while (doFetchToken()) {}
+    ;
+  }
+
+  private boolean doFetchToken() {
     Character ch = null;
     do {
       if (ch != null) reader.nextChar();
@@ -453,7 +458,7 @@ private void fetchToken() {
       reader.nextChar();
       getOperatorRest();
     } else if (ch == '/') {
-      if (skipComment()) fetchToken();
+      if (skipComment()) return true;
       else {
         putChar('/');
         getOperatorRest();
@@ -601,6 +606,7 @@ private void fetchToken() {
         reader.nextChar();
       }
     }
+    return false;
   }
 
   // Unsupported: Keeping comments

src/test/java/ParserTest.java

@@ -39,7 +39,8 @@ private void compareAST(String pathToInput, String pathToExpectedResult, String
   }
 
   @ParameterizedTest(name = "Run parser testcase no. {0}")
-  @ValueSource(ints = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21})
+  @ValueSource(
+      ints = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22})
   public void testParser(int no) {
     compareAST("testcase" + no + ".txt", "ast" + no + ".json", "config" + no + ".json");
   }

src/test/resources/parser_tests/asts/ast22.json

@@ -0,0 +1 @@
+{"usingDefs":[],"codeOffset":0,"codeStart": 54740}

src/test/resources/parser_tests/configs/config22.json

@@ -0,0 +1 @@
+{}