Fixes ANTLR parser grammar and renames parser g4 file (#1474)

partiql · May 30, 2024 · a8c618a · a8c618a · github-actions · May 30, 2024
1 parent 8402db6
commit a8c618a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/partiql-lang/src/main/kotlin/org/partiql/lang/syntax/impl/PartiQLPigVisitor.kt b/partiql-lang/src/main/kotlin/org/partiql/lang/syntax/impl/PartiQLPigVisitor.kt
@@ -60,8 +60,8 @@ import org.partiql.lang.util.checkThreadInterrupted
 import org.partiql.lang.util.error
 import org.partiql.lang.util.getPrecisionFromTimeString
 import org.partiql.lang.util.unaryMinus
-import org.partiql.parser.antlr.PartiQLBaseVisitor
 import org.partiql.parser.antlr.PartiQLParser
+import org.partiql.parser.antlr.PartiQLParserBaseVisitor
 import org.partiql.pig.runtime.SymbolPrimitive
 import org.partiql.value.datetime.DateTimeException
 import org.partiql.value.datetime.TimeZone
@@ -73,12 +73,12 @@ import java.time.format.DateTimeFormatter
 import java.time.format.DateTimeParseException
 
 /**
- * Extends ANTLR's generated [PartiQLBaseVisitor] to visit an ANTLR ParseTree and convert it into a PartiQL AST. This
+ * Extends ANTLR's generated [PartiQLParserBaseVisitor] to visit an ANTLR ParseTree and convert it into a PartiQL AST. This
  * class uses the [PartiqlAst.PartiqlAstNode] to represent all nodes within the new AST.
  *
  * When the grammar in PartiQL.g4 is extended with a new rule, one needs to override corresponding visitor methods
  * in this class, in order to extend the transformation from an ANTLR parse tree into a [PartqlAst] tree.
- * (Trivial implementations of these methods are generated into [PartiQLBaseVisitor].)
+ * (Trivial implementations of these methods are generated into [PartiQLParserBaseVisitor].)
  *
  * For a rule of the form
  * ```
@@ -119,7 +119,7 @@ internal class PartiQLPigVisitor(
     val customTypes: List<CustomType> = listOf(),
     private val parameterIndexes: Map<Int, Int> = mapOf(),
 ) :
-    PartiQLBaseVisitor<PartiqlAst.PartiqlAstNode>() {
+    PartiQLParserBaseVisitor<PartiqlAst.PartiqlAstNode>() {
 
     companion object {
         internal val TRIM_SPECIFICATION_KEYWORDS = setOf("both", "leading", "trailing")

diff --git a/partiql-parser/build.gradle.kts b/partiql-parser/build.gradle.kts
@@ -82,6 +82,8 @@ tasks.processResources {
     from("src/main/antlr") {
         include("**/*.g4")
     }
+    // TODO remove in next major version release.
+    rename("PartiQLParser.g4", "PartiQL.g4")
 }
 
 publish {

diff --git a/partiql-parser/src/main/antlr/PartiQL.g4 → ...ql-parser/src/main/antlr/PartiQLParser.g4 b/partiql-parser/src/main/antlr/PartiQL.g4 → ...ql-parser/src/main/antlr/PartiQLParser.g4
@@ -1,4 +1,4 @@
-grammar PartiQL;
+parser grammar PartiQLParser;
 
 options {
     tokenVocab=PartiQLTokens;

diff --git a/partiql-parser/src/main/kotlin/org/partiql/parser/internal/PartiQLParserDefault.kt b/partiql-parser/src/main/kotlin/org/partiql/parser/internal/PartiQLParserDefault.kt
@@ -208,7 +208,7 @@ import org.partiql.parser.PartiQLParserException
 import org.partiql.parser.PartiQLSyntaxException
 import org.partiql.parser.SourceLocation
 import org.partiql.parser.SourceLocations
-import org.partiql.parser.antlr.PartiQLBaseVisitor
+import org.partiql.parser.antlr.PartiQLParserBaseVisitor
 import org.partiql.parser.internal.util.DateTimeUtils
 import org.partiql.value.NumericValue
 import org.partiql.value.PartiQLValueExperimental
@@ -422,7 +422,7 @@ internal class PartiQLParserDefault : PartiQLParser {
     private class Visitor(
         private val locations: SourceLocations.Mutable,
         private val parameters: Map<Int, Int> = mapOf(),
-    ) : PartiQLBaseVisitor<AstNode>() {
+    ) : PartiQLParserBaseVisitor<AstNode>() {
 
         companion object {