Skip to content

Commit 9147679

Browse files
committed
Релиз 0.24
2 parents ec5aa2a + 364f4fa commit 9147679

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2867
-4230
lines changed

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Set up Python
3232
uses: actions/setup-python@v5
3333
with:
34-
python-version: '3.6'
34+
python-version: '3.12'
3535
architecture: 'x64'
3636

3737
- name: Install dependencies

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Make image
22

33
on:
44
release:
5-
types: [published, edited]
5+
types: [published]
66

77
jobs:
88
build:
@@ -25,4 +25,4 @@ jobs:
2525
with:
2626
files: './build/libs/*.jar'
2727
repo-token: ${{ secrets.GITHUB_TOKEN }}
28-
28+

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,4 @@ gen/
6969
*.orig
7070
/.idea/misc.xml
7171
*.tokens
72+
/.idea/inspectionProfiles/Project_Default.xml

build.gradle.kts

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,20 @@ gitVersioning.apply {
4444
}
4545
val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG
4646

47-
val antlrVersion = "4.9.0"
48-
val antlrGroupId = "com.tunnelvisionlabs"
49-
val antlrArtifactId = "antlr4"
50-
5147
dependencies {
52-
implementation(antlrGroupId, antlrArtifactId, antlrVersion)
53-
antlr(antlrGroupId, antlrArtifactId, antlrVersion)
54-
55-
implementation("com.github.1c-syntax", "utils", "0.5.1")
56-
57-
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.6.1")
58-
testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.6.1")
59-
testImplementation("org.assertj", "assertj-core", "3.14.0")
48+
antlr("com.tunnelvisionlabs", "antlr4", "4.9.0")
6049

61-
// https://mvnrepository.com/artifact/commons-io/commons-io
62-
implementation("commons-io", "commons-io", "2.6")
50+
implementation("io.github.1c-syntax", "bsl-parser-core", "0.1.0")
6351

6452
// stat analysis
6553
compileOnly("com.google.code.findbugs", "jsr305", "3.0.2")
54+
55+
// testing
56+
testImplementation("io.github.1c-syntax", "bsl-parser-testing", "0.1.1")
57+
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.10.1")
58+
testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.10.1")
59+
testImplementation("org.junit.jupiter", "junit-jupiter-params", "5.10.1")
60+
testImplementation("org.assertj", "assertj-core", "3.25.0")
6661
}
6762

6863
java {
@@ -95,7 +90,6 @@ sourceSets.jmh {
9590
// [bug] https://youtrack.jetbrains.com/issue/KT-46165
9691
tasks.named<org.gradle.jvm.tasks.Jar>("sourcesJar") {
9792
duplicatesStrategy = DuplicatesStrategy.INCLUDE
98-
9993
dependsOn(tasks.generateGrammarSource)
10094
}
10195

src/jmh/java/com/github/_1c_syntax/bsl/parser/JMXBSLLexerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of BSL Parser.
33
*
4-
* Copyright (c) 2018-2023
4+
* Copyright (c) 2018-2024
55
* Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>, Sergey Batanov <sergey.batanov@dmpas.ru>
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

src/jmh/java/com/github/_1c_syntax/bsl/parser/JMXBSLParserTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of BSL Parser.
33
*
4-
* Copyright (c) 2018-2023
4+
* Copyright (c) 2018-2024
55
* Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>, Sergey Batanov <sergey.batanov@dmpas.ru>
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of BSL Parser.
33
*
4-
* Copyright (c) 2018-2023
4+
* Copyright (c) 2018-2024
55
* Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>, Sergey Batanov <sergey.batanov@dmpas.ru>
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later
@@ -23,9 +23,12 @@
2323

2424
import org.antlr.v4.runtime.CharStreams;
2525

26-
public class BSLMethodDescriptionTokenizer extends Tokenizer<BSLMethodDescriptionParser.MethodDescriptionContext, BSLMethodDescriptionParser> {
26+
public class BSLMethodDescriptionTokenizer
27+
extends Tokenizer<BSLMethodDescriptionParser.MethodDescriptionContext, BSLMethodDescriptionParser> {
2728
public BSLMethodDescriptionTokenizer(String content) {
28-
super(content + "\n", new BSLMethodDescriptionLexer(CharStreams.fromString(""), true), BSLMethodDescriptionParser.class);
29+
super(content + "\n",
30+
new BSLMethodDescriptionLexer(CharStreams.fromString(""), true),
31+
BSLMethodDescriptionParser.class);
2932
}
3033

3134
@Override

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

Lines changed: 0 additions & 98 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of BSL Parser.
33
*
4-
* Copyright (c) 2018-2023
4+
* Copyright (c) 2018-2024
55
* Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>, Sergey Batanov <sergey.batanov@dmpas.ru>
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later
@@ -26,7 +26,7 @@
2626

2727
public class BSLTokenizer extends Tokenizer<BSLParser.FileContext, BSLParser> {
2828
public BSLTokenizer(String content) {
29-
super(content, new BSLLexer(CharStreams.fromString(""), true), BSLParser.class);
29+
this(content, new BSLLexer(CharStreams.fromString(""), true));
3030
}
3131

3232
public BSLTokenizer(String content, Lexer lexer) {

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

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)