chore(spdx-utils): Remove ANTLR parser

Remove the dependency on ANTLR and all related files, as the parser generated by ANTLR was replaced in the previous commit. Relaates to #8164. Signed-off-by: Martin Nonnenmacher <[email protected]>
oss-review-toolkit · Feb 6, 2024 · f0da513 · f0da513
1 parent 9e2e861
commit f0da513
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 336 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,7 +11,6 @@ kotlinPlugin = "1.9.22"
 mavenPublishPlugin = "0.27.0"
 versionsPlugin = "0.51.0"
 
-antlr = "4.13.1"
 asciidoctorj = "2.5.11"
 asciidoctorjPdf = "2.3.10"
 clikt = "4.2.2"
@@ -80,7 +79,6 @@ plugin-graalVmNativeImage = { module = "org.graalvm.buildtools:native-gradle-plu
 plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinPlugin" }
 plugin-mavenPublish = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "mavenPublishPlugin" }
 
-antlr = { module = "org.antlr:antlr4", version.ref = "antlr" }
 asciidoctorj = { module = "org.asciidoctor:asciidoctorj", version.ref = "asciidoctorj" }
 asciidoctorj-pdf = { module = "org.asciidoctor:asciidoctorj-pdf", version.ref = "asciidoctorjPdf" }
 awsS3 = { module = "software.amazon.awssdk:s3", version.ref = "s3" }

diff --git a/utils/spdx/build.gradle.kts b/utils/spdx/build.gradle.kts
@@ -28,50 +28,14 @@ import java.net.URI
 val spdxLicenseListVersion: String by project
 
 plugins {
-    // Apply core plugins.
-    antlr
-
     // Apply precompiled plugins.
     id("ort-library-conventions")
 
     // Apply third-party plugins.
     alias(libs.plugins.download)
 }
 
-tasks.withType<AntlrTask>().configureEach {
-    arguments = arguments + listOf("-visitor")
-
-    doLast {
-        // Work around https://github.com/antlr/antlr4/issues/4128.
-        outputDirectory.walk()
-            .filter { it.isFile && it.extension == "java" }
-            .forEach { javaFile ->
-                val lines = javaFile.readLines()
-
-                val text = buildString {
-                    lines.mapIndexed { index, line ->
-                        val patchedLine = when {
-                            index == 0 && line.startsWith("// Generated from ") -> line.replace('\\', '/')
-                            else -> line
-                        }
-
-                        appendLine(patchedLine)
-                    }
-                }
-
-                javaFile.writeText(text)
-            }
-    }
-}
-
-sourceSets.configureEach {
-    val generateGrammarSource = tasks.named(getTaskName("generate", "GrammarSource"))
-    java.srcDir(generateGrammarSource.map { files() })
-}
-
 dependencies {
-    antlr(libs.antlr)
-
     api(libs.jackson.databind)
 
     implementation(projects.utils.commonUtils)

diff --git a/utils/spdx/src/main/antlr/org/ossreviewtoolkit/utils/spdx/SpdxExpression.g4 b/utils/spdx/src/main/antlr/org/ossreviewtoolkit/utils/spdx/SpdxExpression.g4
diff --git a/utils/spdx/src/main/kotlin/SpdxErrorListener.kt b/utils/spdx/src/main/kotlin/SpdxErrorListener.kt
diff --git a/utils/spdx/src/main/kotlin/SpdxExpressionDefaultVisitor.kt b/utils/spdx/src/main/kotlin/SpdxExpressionDefaultVisitor.kt
diff --git a/utils/spdx/src/test/kotlin/SpdxDeclaredLicenseMappingTest.kt b/utils/spdx/src/test/kotlin/SpdxDeclaredLicenseMappingTest.kt
@@ -30,6 +30,7 @@ import io.kotest.matchers.string.containADigit
 import io.kotest.matchers.string.shouldContain
 
 import org.ossreviewtoolkit.utils.common.titlecase
+import org.ossreviewtoolkit.utils.spdx.parser.SpdxExpressionLexer
 
 class SpdxDeclaredLicenseMappingTest : WordSpec({
     "The list" should {
@@ -76,7 +77,7 @@ class SpdxDeclaredLicenseMappingTest : WordSpec({
             licenseIdMapping.keys.forAll { declaredLicense ->
                 @Suppress("SwallowedException")
                 try {
-                    val tokens = getTokensByTypeForExpression(declaredLicense)
+                    val tokens = SpdxExpressionLexer(declaredLicense).tokens().toList()
 
                     tokens.size shouldBeGreaterThanOrEqual 2
 

diff --git a/utils/spdx/src/test/kotlin/SpdxExpressionLexerTest.kt b/utils/spdx/src/test/kotlin/SpdxExpressionLexerTest.kt