Pass sproc name metas, modify top-level token checks

Author: alancai98

lang/src/org/partiql/lang/ast/ExprNodeToStatement.kt

@@ -2,6 +2,7 @@ package org.partiql.lang.ast
 
 import com.amazon.ionelement.api.toIonElement
 import org.partiql.lang.domains.PartiqlAst
+import org.partiql.pig.runtime.SymbolPrimitive
 import org.partiql.pig.runtime.asPrimitive
 
 /** Converts an [ExprNode] to a [PartiqlAst.statement]. */
@@ -23,6 +24,9 @@ fun ExprNode.toAstStatement(): PartiqlAst.Statement {
 private fun PartiQlMetaContainer.toElectrolyteMetaContainer(): ElectrolyteMetaContainer =
     com.amazon.ionelement.api.metaContainerOf(map { it.tag to it })
 
+private fun SymbolicName.toSymbolPrimitive() : SymbolPrimitive =
+    SymbolPrimitive(this.name, this.metas.toElectrolyteMetaContainer())
+
 private fun ExprNode.toAstDdl(): PartiqlAst.Statement {
     val thiz = this
     val metas = metas.toElectrolyteMetaContainer()
@@ -55,7 +59,7 @@ private fun ExprNode.toAstExec() : PartiqlAst.Statement {
 
     return PartiqlAst.build {
         when (node) {
-            is Exec -> exec(node.procedureName.name, node.args.map { it.toAstExpr() }, metas)
+            is Exec -> exec_(node.procedureName.toSymbolPrimitive(), node.args.map { it.toAstExpr() }, metas)
             else -> error("Can't convert ${node.javaClass} to PartiqlAst.Statement.Exec")
         }
     }

lang/src/org/partiql/lang/syntax/SqlParser.kt

@@ -2243,10 +2243,13 @@ class SqlParser(private val ion: IonSystem) : Parser {
     }
 
     /**
-     * Checks that the given [Token] list does not have `EXEC` calls outside of the top level query. Throws
+     * Checks that the given [Token] list does not have any top-level tokens outside of the top level query. Throws
      * an error if so.
+     *
+     * Currently only checks for `EXEC`. DDL and DML along with corresponding error codes to be added in the future
+     * (https://github.com/partiql/partiql-lang-kotlin/issues/354).
      */
-    private fun List<Token>.checkForUnexpectedExec() {
+    private fun List<Token>.checkUnexpectedTopLevelToken() {
         for ((index, token) in this.withIndex()) {
             if (token.keywordText == "exec" && index != 0) {
                 token.err("EXEC call found at unexpected location", PARSE_EXEC_AT_UNEXPECTED_LOCATION)
@@ -2257,7 +2260,7 @@ class SqlParser(private val ion: IonSystem) : Parser {
     /** Entry point into the parser. */
     override fun parseExprNode(source: String): ExprNode {
         val tokens = SqlLexer(ion).tokenize(source)
-        tokens.checkForUnexpectedExec()
+        tokens.checkUnexpectedTopLevelToken()
         val node = tokens.parseExpression()
         val rem = node.remaining
         if (!rem.onlyEndOfStatement()) {