Removes Ast.exprTable method in favor of Ast.exprValues

partiql · Dec 2, 2024 · d828d61 · d828d61
1 parent 247776b
commit d828d61
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/partiql-ast/api/partiql-ast.api b/partiql-ast/api/partiql-ast.api
@@ -49,7 +49,6 @@ public final class org/partiql/ast/Ast {
 	public static final fun exprStruct (Ljava/util/List;)Lorg/partiql/ast/expr/ExprStruct;
 	public static final fun exprStructField (Lorg/partiql/ast/expr/Expr;Lorg/partiql/ast/expr/Expr;)Lorg/partiql/ast/expr/ExprStruct$Field;
 	public static final fun exprSubstring (Lorg/partiql/ast/expr/Expr;Lorg/partiql/ast/expr/Expr;Lorg/partiql/ast/expr/Expr;)Lorg/partiql/ast/expr/ExprSubstring;
-	public static final fun exprTable (Ljava/util/List;)Lorg/partiql/ast/expr/ExprValues;
 	public static final fun exprTrim (Lorg/partiql/ast/expr/Expr;Lorg/partiql/ast/expr/Expr;Lorg/partiql/ast/expr/TrimSpec;)Lorg/partiql/ast/expr/ExprTrim;
 	public static final fun exprValues (Ljava/util/List;)Lorg/partiql/ast/expr/ExprValues;
 	public static final fun exprVarRef (Lorg/partiql/ast/IdentifierChain;Lorg/partiql/ast/expr/Scope;)Lorg/partiql/ast/expr/ExprVarRef;

diff --git a/partiql-ast/src/main/kotlin/org/partiql/ast/Ast.kt b/partiql-ast/src/main/kotlin/org/partiql/ast/Ast.kt
@@ -70,12 +70,6 @@ public object Ast {
         return ExprBag(values)
     }
 
-    @JvmStatic
-    public fun exprTable(values: List<Expr>): ExprValues {
-        // TODO: Is exprTable the right name here? IMO, ExprValues should really just be called TableValueConstructor to match the EBNF
-        return ExprValues(values)
-    }
-
     @JvmStatic
     public fun exprBetween(value: Expr, from: Expr, to: Expr, not: Boolean): ExprBetween {
         return ExprBetween(value, from, to, not)
@@ -209,7 +203,8 @@ public object Ast {
     }
 
     @JvmStatic
-    public fun exprValues(rows: List<ExprRowValue>): ExprValues {
+    public fun exprValues(rows: List<Expr>): ExprValues {
+        // TODO: Is exprTable the right name here? IMO, ExprValues should really just be called TableValueConstructor to match the EBNF
         return ExprValues(rows)
     }
 

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
@@ -79,8 +79,8 @@ import org.partiql.ast.Ast.exprSessionAttribute
 import org.partiql.ast.Ast.exprStruct
 import org.partiql.ast.Ast.exprStructField
 import org.partiql.ast.Ast.exprSubstring
-import org.partiql.ast.Ast.exprTable
 import org.partiql.ast.Ast.exprTrim
+import org.partiql.ast.Ast.exprValues
 import org.partiql.ast.Ast.exprVarRef
 import org.partiql.ast.Ast.exprVariant
 import org.partiql.ast.Ast.exprWindow
@@ -1512,7 +1512,7 @@ internal class PartiQLParserDefault : PartiQLParser {
 
         override fun visitTableValueConstructor(ctx: GeneratedParser.TableValueConstructorContext) = translate(ctx) {
             val rows = visitOrEmpty<Expr>(ctx.rowValueExpressionList().expr())
-            exprTable(rows)
+            exprValues(rows)
         }
 
         override fun visitExprGraphMatchMany(ctx: GeneratedParser.ExprGraphMatchManyContext) = translate(ctx) {