[v1] Rename V1Parser to Parser; move parser builder within the interf…

…ace (#1637)
partiql · Nov 1, 2024 · bd7745f · bd7745f
1 parent 8b5cc65
commit bd7745f
Show file tree

Hide file tree

Showing 40 changed files with 1,218 additions and 5,996 deletions.
diff --git a/partiql-ast/api/partiql-ast.api b/partiql-ast/api/partiql-ast.api
@@ -4983,15 +4983,6 @@ public final class org/partiql/ast/builder/TypeVarcharBuilder {
 	public final fun setLength (Ljava/lang/Integer;)V
 }
 
-public final class org/partiql/ast/helpers/ToBinderKt {
-	public static final fun toBinder (Lorg/partiql/ast/Expr;I)Lorg/partiql/ast/Identifier$Symbol;
-	public static final fun toBinder (Lorg/partiql/ast/Expr;Lkotlin/jvm/functions/Function0;)Lorg/partiql/ast/Identifier$Symbol;
-}
-
-public final class org/partiql/ast/normalize/Normalize {
-	public static final fun normalize (Lorg/partiql/ast/Statement;)Lorg/partiql/ast/Statement;
-}
-
 public abstract class org/partiql/ast/sql/SqlBlock {
 	public static final field Companion Lorg/partiql/ast/sql/SqlBlock$Companion;
 	public field next Lorg/partiql/ast/sql/SqlBlock;

diff --git a/partiql-ast/src/main/kotlin/org/partiql/ast/helpers/ToBinder.kt b/partiql-ast/src/main/kotlin/org/partiql/ast/helpers/ToBinder.kt
diff --git a/partiql-ast/src/main/kotlin/org/partiql/ast/normalize/AstPass.kt b/partiql-ast/src/main/kotlin/org/partiql/ast/normalize/AstPass.kt
diff --git a/partiql-ast/src/main/kotlin/org/partiql/ast/normalize/Normalize.kt b/partiql-ast/src/main/kotlin/org/partiql/ast/normalize/Normalize.kt
diff --git a/partiql-ast/src/main/kotlin/org/partiql/ast/normalize/NormalizeFromSource.kt b/partiql-ast/src/main/kotlin/org/partiql/ast/normalize/NormalizeFromSource.kt
diff --git a/partiql-ast/src/main/kotlin/org/partiql/ast/normalize/NormalizeGroupBy.kt b/partiql-ast/src/main/kotlin/org/partiql/ast/normalize/NormalizeGroupBy.kt
diff --git a/partiql-cli/src/main/kotlin/org/partiql/cli/pipeline/Pipeline.kt b/partiql-cli/src/main/kotlin/org/partiql/cli/pipeline/Pipeline.kt
@@ -4,8 +4,7 @@ import org.partiql.ast.v1.Statement
 import org.partiql.cli.ErrorCodeString
 import org.partiql.eval.Mode
 import org.partiql.eval.compiler.PartiQLCompiler
-import org.partiql.parser.PartiQLParserBuilderV1
-import org.partiql.parser.PartiQLParserV1
+import org.partiql.parser.PartiQLParser
 import org.partiql.plan.Plan
 import org.partiql.planner.PartiQLPlanner
 import org.partiql.spi.Context
@@ -15,7 +14,7 @@ import org.partiql.spi.value.Datum
 import java.io.PrintStream
 
 internal class Pipeline private constructor(
-    private val parser: PartiQLParserV1,
+    private val parser: PartiQLParser,
     private val planner: PartiQLPlanner,
     private val compiler: PartiQLCompiler,
     private val ctx: Context,
@@ -83,7 +82,7 @@ internal class Pipeline private constructor(
         private fun create(mode: Mode, out: PrintStream, config: Config): Pipeline {
             val listener = config.getErrorListener(out)
             val ctx = Context.of(listener)
-            val parser = PartiQLParserBuilderV1().build()
+            val parser = PartiQLParser.Builder().build()
             val planner = PartiQLPlanner.builder().build()
             val compiler = PartiQLCompiler.builder().build()
             return Pipeline(parser, planner, compiler, ctx, mode)

diff --git a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/PartiQLEvaluatorTest.kt b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/PartiQLEvaluatorTest.kt
@@ -9,7 +9,7 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
 import org.partiql.eval.Mode
 import org.partiql.eval.compiler.PartiQLCompiler
-import org.partiql.parser.PartiQLParserV1
+import org.partiql.parser.PartiQLParser
 import org.partiql.plan.Plan
 import org.partiql.planner.PartiQLPlanner
 import org.partiql.spi.catalog.Catalog
@@ -1308,7 +1308,7 @@ class PartiQLEvaluatorTest {
     ) {
 
         private val compiler = PartiQLCompiler.standard()
-        private val parser = PartiQLParserV1.standard()
+        private val parser = PartiQLParser.standard()
         private val planner = PartiQLPlanner.standard()
 
         /**
@@ -1376,7 +1376,7 @@ class PartiQLEvaluatorTest {
     ) {
 
         private val compiler = PartiQLCompiler.standard()
-        private val parser = PartiQLParserV1.standard()
+        private val parser = PartiQLParser.standard()
         private val planner = PartiQLPlanner.standard()
 
         internal fun assert() {

diff --git a/partiql-parser/api/partiql-parser.api b/partiql-parser/api/partiql-parser.api
@@ -1,34 +1,16 @@
 public abstract interface class org/partiql/parser/PartiQLParser {
-	public static fun builder ()Lorg/partiql/parser/PartiQLParserBuilder;
+	public static fun builder ()Lorg/partiql/parser/PartiQLParser$Builder;
 	public fun parse (Ljava/lang/String;)Lorg/partiql/parser/PartiQLParser$Result;
 	public abstract fun parse (Ljava/lang/String;Lorg/partiql/spi/Context;)Lorg/partiql/parser/PartiQLParser$Result;
 	public static fun standard ()Lorg/partiql/parser/PartiQLParser;
 }
 
-public final class org/partiql/parser/PartiQLParser$Result {
-	public field locations Lorg/partiql/spi/SourceLocations;
-	public field statements Ljava/util/List;
-	public fun <init> (Ljava/util/List;Lorg/partiql/spi/SourceLocations;)V
-}
-
-public class org/partiql/parser/PartiQLParserBuilder {
+public class org/partiql/parser/PartiQLParser$Builder {
 	public fun <init> ()V
 	public fun build ()Lorg/partiql/parser/PartiQLParser;
 }
 
-public class org/partiql/parser/PartiQLParserBuilderV1 {
-	public fun <init> ()V
-	public fun build ()Lorg/partiql/parser/PartiQLParserV1;
-}
-
-public abstract interface class org/partiql/parser/PartiQLParserV1 {
-	public static fun builder ()Lorg/partiql/parser/PartiQLParserBuilderV1;
-	public fun parse (Ljava/lang/String;)Lorg/partiql/parser/PartiQLParserV1$Result;
-	public abstract fun parse (Ljava/lang/String;Lorg/partiql/spi/Context;)Lorg/partiql/parser/PartiQLParserV1$Result;
-	public static fun standard ()Lorg/partiql/parser/PartiQLParserV1;
-}
-
-public final class org/partiql/parser/PartiQLParserV1$Result {
+public final class org/partiql/parser/PartiQLParser$Result {
 	public field locations Lorg/partiql/spi/SourceLocations;
 	public field statements Ljava/util/List;
 	public fun <init> (Ljava/util/List;Lorg/partiql/spi/SourceLocations;)V