Переезд на antlr 4.13.1.

Версия не совместима с прошлыми

Author: theshadowco

.github/dependabot.yml

@@ -9,8 +9,11 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    groups:
+      freefair:
+        patterns:
+          - "io.freefair.*"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
-      

build.gradle.kts

@@ -7,14 +7,14 @@ plugins {
     jacoco
     `java-library`
     signing
-    id("org.sonarqube") version "4.4.1.3373"
+    id("org.sonarqube") version "5.0.0.4638"
     id("org.cadixdev.licenser") version "0.6.1"
     id("me.qoomon.git-versioning") version "6.4.3"
-    id("io.freefair.javadoc-links") version "8.4"
-    id("io.freefair.javadoc-utf-8") version "8.4"
-    id("com.github.ben-manes.versions") version "0.50.0"
-    id("io.freefair.maven-central.validate-poms") version "8.4"
-    id("ru.vyarus.pom") version "2.2.2"
+    id("io.freefair.javadoc-links") version "8.6"
+    id("io.freefair.javadoc-utf-8") version "8.6"
+    id("com.github.ben-manes.versions") version "0.51.0"
+    id("io.freefair.maven-central.validate-poms") version "8.6"
+    id("ru.vyarus.pom") version "3.0.0"
     id("io.codearte.nexus-staging") version "0.30.0"
 }
 
@@ -43,7 +43,7 @@ gitVersioning.apply {
 val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG
 
 dependencies {
-    implementation("com.tunnelvisionlabs", "antlr4", "4.9.0")
+    implementation("org.antlr", "antlr4", "4.13.1")
     implementation("com.github.1c-syntax", "utils", "0.5.1")
     implementation("commons-io", "commons-io", "2.15.1")
 }

src/main/java/com/github/_1c_syntax/bsl/parser/CRAwareLexerATNSimulator.java

@@ -25,14 +25,12 @@
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.atn.ATN;
 import org.antlr.v4.runtime.atn.LexerATNSimulator;
+import org.antlr.v4.runtime.atn.PredictionContextCache;
+import org.antlr.v4.runtime.dfa.DFA;
 
 public class CRAwareLexerATNSimulator extends LexerATNSimulator {
-  public CRAwareLexerATNSimulator(ATN atn) {
-    super(atn);
-  }
-
-  public CRAwareLexerATNSimulator(Lexer recog, ATN atn) {
-    super(recog, atn);
+  public CRAwareLexerATNSimulator(Lexer recog, ATN atn, DFA[] dfas, PredictionContextCache sharedContextCache) {
+    super(recog, atn, dfas, sharedContextCache);
   }
 
   @Override

src/main/java/com/github/_1c_syntax/bsl/parser/CaseChangingCharStream.java

@@ -27,6 +27,7 @@
 import org.antlr.v4.runtime.CommonToken;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.ConsoleErrorListener;
+import org.antlr.v4.runtime.IntStream;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.Parser;
 import org.antlr.v4.runtime.Token;
@@ -36,12 +37,13 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import static java.util.Objects.requireNonNull;
 import static org.antlr.v4.runtime.Token.EOF;
@@ -62,6 +64,8 @@ public abstract class Tokenizer<T extends BSLParserRuleContext, P extends Parser
   private final Class<P> parserClass;
   protected P parser;
 
+  private final Optional<Method> setInputStreamMethod;
+
   protected Tokenizer(String content, Lexer lexer, Class<P> parserClass) {
     this(IOUtils.toInputStream(content, StandardCharsets.UTF_8), lexer, parserClass);
   }
@@ -72,6 +76,11 @@ protected Tokenizer(InputStream content, Lexer lexer, Class<P> parserClass) {
     this.content = content;
     this.lexer = lexer;
     this.parserClass = parserClass;
+    var methods = lexer.getClass().getMethods();
+    setInputStreamMethod = Arrays.stream(methods)
+      .filter(method -> "setInputStream".equals(method.getName())
+        && method.getParameterCount() == 1
+        && method.getParameterTypes()[0] == IntStream.class).findFirst();
   }
 
   /**
@@ -85,6 +94,7 @@ public List<Token> getTokens() {
 
   /**
    * Возвращает абстрактное синтаксическое дерево, полученное на основании парсинга
+   *
    * @return AST
    */
   public T getAst() {
@@ -123,15 +133,23 @@ private CommonTokenStream computeTokenStream() {
 
     try (
       var ubis = new UnicodeBOMInputStream(content);
-      Reader inputStreamReader = new InputStreamReader(ubis, StandardCharsets.UTF_8)
     ) {
       ubis.skipBOM();
-      input = CharStreams.fromReader(inputStreamReader);
+      input = CharStreams.fromStream(ubis);
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
 
-    lexer.setInputStream(input);
+    if (setInputStreamMethod.isPresent()) {
+      try {
+        setInputStreamMethod.get().invoke(lexer, input);
+      } catch (IllegalAccessException | InvocationTargetException e) {
+        throw new RuntimeException(e);
+      }
+    } else {
+      lexer.setInputStream(input);
+    }
+
     lexer.removeErrorListener(ConsoleErrorListener.INSTANCE);
 
     var tempTokenStream = new CommonTokenStream(lexer);