- новая версия antlr (#330)

- отказ от bsl-parser-core

Author: theshadowco

build.gradle.kts

@@ -49,15 +49,14 @@ gitVersioning.apply {
 }
 
 dependencies {
-    antlr("io.github.1c-syntax", "antlr4", "0.1.2")
-
-    implementation("io.github.1c-syntax", "bsl-parser-core", "0.3.1")
+    antlr("io.github.1c-syntax", "antlr4", "0.2.0-rc.1")
 
     // stat analysis
     compileOnly("com.github.spotbugs", "spotbugs-annotations", "4.8.6")
 
     // testing
-    testImplementation("io.github.1c-syntax", "bsl-parser-testing", "0.3.1")
+    testImplementation("io.github.1c-syntax", "bsl-parser-testing", "0.4.0-rc.1")
+
     testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
     testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
     testImplementation("org.junit.jupiter", "junit-jupiter-params", "5.11.4")

src/main/antlr/BSLLexer.g4

@@ -28,14 +28,6 @@ channels {
 
 options { caseInsensitive=true; }
 
-@members {
-public BSLLexer(CharStream input, boolean crAwareCostructor) {
-  super(input);
-  _interp = new CRAwareLexerATNSimulator(this, _ATN);
-  validateInputStream(_ATN, input);
-}
-}
-
 // commons
 fragment DIGIT: [0-9];
 LINE_COMMENT: '//' ~[\r\n]* -> channel(HIDDEN);

src/main/antlr/BSLMethodDescriptionLexer.g4

@@ -24,14 +24,6 @@
  */
 lexer grammar BSLMethodDescriptionLexer;
 
-@members {
-public BSLMethodDescriptionLexer(CharStream input, boolean crAwareCostructor) {
-  super(input);
-  _interp = new CRAwareLexerATNSimulator(this, _ATN);
-  validateInputStream(_ATN, input);
-}
-}
-
 // KEYWORDS
 PARAMETERS_KEYWORD:     (P A R A M E T E R S        | RU_P RU_A RU_R RU_A RU_M RU_E RU_T RU_R RU_Y) ':';
 RETURNS_KEYWORD:        (R E T U R N S              | (RU_V RU_O RU_Z RU_V RU_R RU_A RU_SCH RU_A RU_E RU_M RU_O RU_E ' ' RU_Z RU_N RU_A RU_CH RU_E RU_N RU_I RU_E)) ':';

src/main/antlr/BSLMethodDescriptionParser.g4

@@ -26,7 +26,6 @@ parser grammar BSLMethodDescriptionParser;
 
 options {
     tokenVocab = BSLMethodDescriptionLexer;
-    contextSuperClass = 'BSLParserRuleContext';
 }
 
 // структура описания

src/main/antlr/BSLParser.g4

@@ -23,7 +23,6 @@ parser grammar BSLParser;
 
 options {
     tokenVocab = BSLLexer;
-    contextSuperClass = 'BSLParserRuleContext';
 }
 
 // ROOT

src/main/antlr/SDBLLexer.g4

@@ -24,14 +24,6 @@
  */
 lexer grammar SDBLLexer;
 
-@members {
-public SDBLLexer(CharStream input, boolean crAwareCostructor) {
-  super(input);
-  _interp = new CRAwareLexerATNSimulator(this, _ATN);
-  validateInputStream(_ATN, input);
-}
-}
-
 // COMMONS
 WHITE_SPACE: [ \t\f\r\n]+ -> channel(HIDDEN);
 LINE_COMMENT: '//' ~[\r\n]* -> channel(HIDDEN);

src/main/antlr/SDBLParser.g4

@@ -26,7 +26,6 @@ parser grammar SDBLParser;
 
 options {
     tokenVocab = SDBLLexer;
-    contextSuperClass = 'BSLParserRuleContext';
 }
 
 // ROOT

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

@@ -22,12 +22,13 @@
 package com.github._1c_syntax.bsl.parser;
 
 import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.Tokenizer;
 
 public class BSLMethodDescriptionTokenizer
   extends Tokenizer<BSLMethodDescriptionParser.MethodDescriptionContext, BSLMethodDescriptionParser> {
   public BSLMethodDescriptionTokenizer(String content) {
     super(content + "\n",
-      new BSLMethodDescriptionLexer(CharStreams.fromString(""), true),
+      new BSLMethodDescriptionLexer(CharStreams.fromString("")),
       BSLMethodDescriptionParser.class);
   }
 

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

@@ -23,10 +23,11 @@
 
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.Tokenizer;
 
 public class BSLTokenizer extends Tokenizer<BSLParser.FileContext, BSLParser> {
   public BSLTokenizer(String content) {
-    this(content, new BSLLexer(CharStreams.fromString(""), true));
+    this(content, new BSLLexer(CharStreams.fromString("")));
   }
 
   public BSLTokenizer(String content, Lexer lexer) {

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

@@ -23,10 +23,11 @@
 
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.Tokenizer;
 
 public class SDBLTokenizer extends Tokenizer<SDBLParser.QueryPackageContext, SDBLParser> {
   public SDBLTokenizer(String content) {
-    this(content, new SDBLLexer(CharStreams.fromString(""), true));
+    this(content, new SDBLLexer(CharStreams.fromString("")));
   }
 
   public SDBLTokenizer(String content, Lexer lexer) {