Skip to content

Commit d446af2

Browse files
authored
Доработки SDBL парсера (#357)
* up gradle * парсер sdbl переведен на регистронезависимость + поправлены ошибки + новый кейворд УНИКАЛЬНО * - объединил составные последовательные ключевые слова в один токен - ИНДЕКСИРОВАТЬ ПО НАБОРАМ (INDEX BY SETS) + доработка парасера - ИНДЕКСИРОВАТЬ ПО (INDEX BY) - СГРУППИРОВАТЬ ПО ГРУППИРУЮЩИМ НАБОРАМ (GROUP BY GROUPING SETS) + доработка парсера - СГРУППИРОВАТЬ ПО (GROUP BY) - УПОРЯДОЧИТЬ ПО (ORDER BY) - ДЛЯ ИЗМЕНЕНИЯ (FOR UPDATE) - RIGHT_OUTER_JOIN, RIGHT_JOIN, LEFT_OUTER_JOIN, LEFT_JOIN, FULL_OUTER_JOIN, FULL_JOIN, INNER_JOIN + доработка парсера - UNION_ALL - ONLY_HIERARCHY - IN_HIERARCHY - Добавил новые конструкции - ДОБАВИТЬ (ADD) для временных таблиц - ЛЕВ (LEFT), ПРАВ (RIGHT) - стровые ф-ии * несколько уточнений - поправлен сбор строковых литералов - скорректирован выбор выражения * #309 Исправлена ошибка невозможности использования более ждвух выражений упорядочивания * fixes + поддержка комментариев * fixes * нембольшое изменение в структуре join * скрыл служебный токен * новый антлр
1 parent 4a4f676 commit d446af2

File tree

18 files changed

+546
-551
lines changed

18 files changed

+546
-551
lines changed

build.gradle.kts

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ plugins {
77
jacoco
88
idea
99
antlr
10-
id("org.cadixdev.licenser") version "0.6.1"
10+
id("cloud.rio.license") version "0.18.0"
1111
id("me.qoomon.git-versioning") version "6.4.4"
1212
id("io.freefair.javadoc-links") version "9.2.0"
1313
id("io.freefair.javadoc-utf-8") version "9.2.0"
1414
id("io.freefair.lombok") version "9.2.0"
15-
id("io.freefair.maven-central.validate-poms") version "9.2.0"
15+
// id("io.freefair.maven-central.validate-poms") version "9.2.0"
1616
id("com.github.ben-manes.versions") version "0.53.0"
1717
id("ru.vyarus.pom") version "3.0.0"
1818
id("org.jreleaser") version "1.21.0"
1919
id("org.sonarqube") version "7.2.2.6593"
20-
id("me.champeau.gradle.jmh") version "0.5.3"
20+
id("me.champeau.jmh") version "0.7.3"
2121
}
2222

2323
repositories {
@@ -50,18 +50,20 @@ gitVersioning.apply {
5050
}
5151

5252
dependencies {
53-
antlr("io.github.1c-syntax", "antlr4", "0.2.0")
54-
55-
// stat analysis
56-
compileOnly("com.github.spotbugs", "spotbugs-annotations", "4.8.6")
53+
antlr("io.github.1c-syntax", "antlr4", "0.3.0-rc.2") {
54+
exclude("org.antlr:antlr-runtime")
55+
exclude("org.antlr:ST4")
56+
}
5757

5858
// testing
59-
testImplementation("io.github.1c-syntax", "bsl-parser-testing", "0.4.0")
59+
testImplementation("io.github.1c-syntax", "bsl-parser-testing", "0.5.0-rc.1")
6060

6161
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
6262
testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
6363
testImplementation("org.junit.jupiter", "junit-jupiter-params", "5.11.4")
6464
testImplementation("org.assertj", "assertj-core", "3.27.0")
65+
66+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
6567
}
6668

6769
java {
@@ -118,7 +120,7 @@ idea {
118120

119121
jmh {
120122
jvmArgsAppend = listOf("-XX:+UseParallelGC")
121-
isIncludeTests = true
123+
includeTests.set(true)
122124
duplicateClassesStrategy = DuplicatesStrategy.WARN
123125
timeUnit = "s"
124126
}
@@ -134,12 +136,12 @@ tasks.generateGrammarSource {
134136
outputDirectory = file("src/main/gen/com/github/_1c_syntax/bsl/parser")
135137
}
136138

137-
tasks.updateLicenseMain {
139+
tasks.licenseFormatMain {
138140
mustRunAfter(tasks.generateGrammarSource)
139141
}
140142

141-
tasks.checkLicenseMain {
142-
dependsOn(tasks.updateLicenseMain)
143+
tasks.licenseMain {
144+
dependsOn(tasks.licenseFormatMain)
143145
}
144146

145147
tasks.test {
@@ -173,18 +175,16 @@ tasks.javadoc {
173175
}
174176

175177
license {
176-
header(rootProject.file("license/HEADER.txt"))
177-
newLine(false)
178+
header = rootProject.file("license/HEADER.txt")
179+
skipExistingHeaders = false
180+
strictCheck = true
181+
mapping("java", "SLASHSTAR_STYLE")
178182
ext["year"] = "2018-" + Calendar.getInstance().get(Calendar.YEAR)
179183
ext["name"] =
180-
"Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>, Sergey Batanov <sergey.batanov@dmpas.ru>"
184+
"Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com>, " +
185+
"Sergey Batanov <sergey.batanov@dmpas.ru>"
181186
ext["project"] = "BSL Parser"
182-
exclude("**/*.tokens")
183-
exclude("**/*.interp")
184-
exclude("**/*.g4")
185-
exclude("**/*.bsl")
186-
exclude("**/*.orig")
187-
exclude("**/*.gitkeep")
187+
include("**/*.java")
188188
}
189189

190190
tasks.clean {
@@ -201,7 +201,8 @@ sonar {
201201
property("sonar.projectKey", "1c-syntax_bsl-parser")
202202
property("sonar.projectName", "BSL Parser")
203203
property("sonar.scm.exclusions.disabled", "true")
204-
property("sonar.coverage.jacoco.xmlReportPaths", "${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml")
204+
property("sonar.coverage.jacoco.xmlReportPaths",
205+
"${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml")
205206
}
206207
}
207208

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)