Finish v0.27.0

theshadowco · theshadowco · commit 10bb4a6bc40f · 2025-12-01T18:33:02.000+03:00
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -11,7 +11,7 @@ jobs:
         java_version: ['17', '21']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
     - name: Set up JDK ${{ matrix.java_version }}
@@ -23,7 +23,7 @@ jobs:
       run: ./gradlew check --stacktrace
     - name: Archive test results
       if: failure()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
         path: build/reports/tests/test
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -17,7 +17,7 @@ jobs:
   build-deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
@@ -31,7 +31,7 @@ jobs:
       run: ./gradlew --no-daemon javadoc
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.12'
         architecture: 'x64'
diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
     - name: Set up JDK
diff --git a/.github/workflows/publish-to-maven-central.yml b/.github/workflows/publish-to-maven-central.yml
@@ -12,7 +12,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Set up JDK
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: ''
       - run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
         matrix:
           os: [ ubuntu-latest, windows-latest, macOS-latest ]
       steps:
-        - uses: actions/checkout@v5
+        - uses: actions/checkout@v6
           with:
             fetch-depth: 0
         - uses: actions/setup-java@v5
diff --git a/.github/workflows/update-gradle.yaml b/.github/workflows/update-gradle.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,13 +9,13 @@ plugins {
     antlr
     id("org.cadixdev.licenser") version "0.6.1"
     id("me.qoomon.git-versioning") version "6.4.4"
-    id("io.freefair.javadoc-links") version "8.14.2"
-    id("io.freefair.javadoc-utf-8") version "8.14.2"
-    id("io.freefair.maven-central.validate-poms") version "8.14.2"
-    id("com.github.ben-manes.versions") version "0.52.0"
+    id("io.freefair.javadoc-links") version "9.1.0"
+    id("io.freefair.javadoc-utf-8") version "9.1.0"
+    id("io.freefair.maven-central.validate-poms") version "9.1.0"
+    id("com.github.ben-manes.versions") version "0.53.0"
     id("ru.vyarus.pom") version "3.0.0"
-    id("org.jreleaser") version "1.19.0"
-    id("org.sonarqube") version "6.2.0.5505"
+    id("org.jreleaser") version "1.21.0"
+    id("org.sonarqube") version "7.1.0.6387"
     id("me.champeau.gradle.jmh") version "0.5.3"
 }
 
@@ -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")
 
     // 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")
+
     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")
diff --git a/src/jmh/resources/.gitkeep b/src/jmh/resources/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/src/jmh/resources/Module.bsl b/src/jmh/resources/Module.bsl
diff --git a/src/main/antlr/BSLLexer.g4 b/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);
@@ -89,7 +81,7 @@ NULL: 'NULL';
 DECIMAL: DIGIT+;
 DATETIME: SQUOTE(~['\n\r])*SQUOTE?; // TODO: Честная регулярка
 
-FLOAT : DIGIT+ '.' DIGIT+;
+FLOAT : DIGIT+ '.' DIGIT*;
 STRING: '"' (~[\r\n"] | '""')* '"';
 STRINGSTART: '"' (~["\n\r]| '""')*;
 STRINGTAIL: BAR (~["\n\r] | '""')* '"';
diff --git a/src/main/antlr/BSLMethodDescriptionLexer.g4 b/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)) ':';
diff --git a/src/main/antlr/BSLMethodDescriptionParser.g4 b/src/main/antlr/BSLMethodDescriptionParser.g4
@@ -26,7 +26,6 @@ parser grammar BSLMethodDescriptionParser;
 
 options {
     tokenVocab = BSLMethodDescriptionLexer;
-    contextSuperClass = 'BSLParserRuleContext';
 }
 
 // структура описания
diff --git a/src/main/antlr/BSLParser.g4 b/src/main/antlr/BSLParser.g4
@@ -23,7 +23,7 @@ parser grammar BSLParser;
 
 options {
     tokenVocab = BSLLexer;
-    contextSuperClass = 'BSLParserRuleContext';
+    incremental = true;
 }
 
 // ROOT
diff --git a/src/main/antlr/SDBLLexer.g4 b/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);
diff --git a/src/main/antlr/SDBLParser.g4 b/src/main/antlr/SDBLParser.g4
@@ -26,7 +26,6 @@ parser grammar SDBLParser;
 
 options {
     tokenVocab = SDBLLexer;
-    contextSuperClass = 'BSLParserRuleContext';
 }
 
 // ROOT
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionTokenizer.java b/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);
   }
 
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/BSLTokenizer.java b/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) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/SDBLTokenizer.java b/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) {
diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/DescriptionReader.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/DescriptionReader.java
@@ -22,7 +22,7 @@
 package com.github._1c_syntax.bsl.parser.description.support;
 
 import com.github._1c_syntax.bsl.parser.BSLMethodDescriptionParser;
-import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
+import org.antlr.v4.runtime.ParserRuleContext;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
@@ -233,7 +233,7 @@ public static String readLink(BSLMethodDescriptionParser.MethodDescriptionContex
     return "";
   }
 
-  private static String getDescriptionString(BSLParserRuleContext ctx) {
+  private static String getDescriptionString(ParserRuleContext ctx) {
     var strings = new StringJoiner("");
     for (var i = 0; i < ctx.getChildCount(); i++) {
       var child = ctx.getChild(i);
diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLLexerTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLLexerTest.java
@@ -562,4 +562,14 @@ void testComments() {
     testLexer.assertThat("#Insert // Комментарий", BSLLexer.HIDDEN)
       .containsAll(BSLLexer.PREPROC_INSERT, BSLLexer.WHITE_SPACE, BSLLexer.LINE_COMMENT);
   }
+
+  @Test
+  void testNumber() {
+    testLexer.assertThat("0").containsAll(BSLLexer.DECIMAL);
+    testLexer.assertThat("111").containsAll(BSLLexer.DECIMAL);
+    testLexer.assertThat("0.1").containsAll(BSLLexer.FLOAT);
+    testLexer.assertThat("111.111").containsAll(BSLLexer.FLOAT);
+    testLexer.assertThat("0.").containsAll(BSLLexer.FLOAT);
+    testLexer.assertThat("111.").containsAll(BSLLexer.FLOAT);
+  }
 }
