parser: improve error recovery for expr_as_name_list

crates/squawk_parser/src/grammar.rs

@@ -983,10 +983,7 @@ fn xmlelement_fn(p: &mut Parser<'_>) -> CompletedMarker {
     col_label(p);
     if p.eat(COMMA) {
         if p.eat(XMLATTRIBUTES_KW) {
-            // TODO: use delimited
-            p.expect(L_PAREN);
             expr_as_name_list(p);
-            p.expect(R_PAREN);
             if p.eat(COMMA) && !opt_expr_list(p) {
                 p.error("expected expression list");
             }
@@ -1002,20 +999,27 @@ fn xmlelement_fn(p: &mut Parser<'_>) -> CompletedMarker {
 
 fn expr_as_name_list(p: &mut Parser<'_>) {
     let m = p.start();
-    // TODO: use delimited
-    while !p.at(EOF) && !p.at(R_PAREN) {
-        let m = p.start();
-        if expr(p).is_none() {
-            p.error("expected expression");
-        }
-        if p.eat(AS_KW) {
-            col_label(p);
-        }
-        m.complete(p, EXPR_AS_NAME);
-        if !p.eat(COMMA) {
-            break;
-        }
-    }
+    delimited(
+        p,
+        L_PAREN,
+        R_PAREN,
+        COMMA,
+        || "unexpected comma".to_string(),
+        EXPR_FIRST,
+        |p| {
+            let m = p.start();
+            if opt_expr(p).is_none() {
+                p.error("expected expression");
+                m.abandon(p);
+                return false;
+            }
+            if p.eat(AS_KW) {
+                col_label(p);
+            }
+            m.complete(p, EXPR_AS_NAME);
+            true
+        },
+    );
     m.complete(p, EXPR_AS_NAME_LIST);
 }
 
@@ -1024,9 +1028,7 @@ fn xmlforest_fn(p: &mut Parser<'_>) -> CompletedMarker {
     assert!(p.at(XMLFOREST_KW));
     let m = p.start();
     p.expect(XMLFOREST_KW);
-    p.expect(L_PAREN);
     expr_as_name_list(p);
-    p.expect(R_PAREN);
     let m = m.complete(p, XML_FOREST_FN).precede(p);
     opt_agg_clauses(p);
     m.complete(p, CALL_EXPR)
@@ -1865,7 +1867,6 @@ fn opt_type_name_with(p: &mut Parser<'_>, type_args_enabled: bool) -> Option<Com
         return None;
     }
     let m = p.start();
-    // TODO: add to ungram
     p.eat(SETOF_KW);
     let wrapper_type = match p.current() {
         BIT_KW => {
@@ -8560,9 +8561,7 @@ fn opt_element_table_properties_clause(p: &mut Parser<'_>) -> bool {
             p.expect(COLUMNS_KW);
             ALL_PROPERTIES
         } else {
-            p.expect(L_PAREN);
             expr_as_name_list(p);
-            p.expect(R_PAREN);
             PROPERTIES_LIST
         }
     };
@@ -8758,9 +8757,7 @@ fn alter_element_table_actions(p: &mut Parser<'_>) -> SyntaxKind {
         name_ref(p);
         if p.eat(ADD_KW) {
             p.expect(PROPERTIES_KW);
-            p.expect(L_PAREN);
             expr_as_name_list(p);
-            p.expect(R_PAREN);
             ADD_VERTEX_EDGE_LABEL_PROPERTIES
         } else {
             p.expect(DROP_KW);
@@ -8806,10 +8803,8 @@ fn graph_table_fn(p: &mut Parser<'_>) -> CompletedMarker {
     path_pattern_list(p);
     opt_where_clause(p);
     p.expect(COLUMNS_KW);
-    p.expect(L_PAREN);
     expr_as_name_list(p);
     p.expect(R_PAREN);
-    p.expect(R_PAREN);
     m.complete(p, GRAPH_TABLE_FN)
 }
 

crates/squawk_parser/tests/data/err/select_graph_table_fn.sql

@@ -0,0 +1,4 @@
+select * from graph_table(
+  foo match - columns (a b)
+--                      ^ comma missing
+);

crates/squawk_parser/tests/snapshots/tests__alter_property_graph_ok.snap

@@ -272,8 +272,8 @@ SOURCE_FILE
               PROPERTIES_LIST
                 PROPERTIES_KW "properties"
                 WHITESPACE " "
-                L_PAREN "("
                 EXPR_AS_NAME_LIST
+                  L_PAREN "("
                   EXPR_AS_NAME
                     NAME_REF
                       IDENT "o"
@@ -293,7 +293,7 @@ SOURCE_FILE
                     WHITESPACE " "
                     NAME
                       IDENT "p"
-                R_PAREN ")"
+                  R_PAREN ")"
             WHITESPACE "\n      "
             LABEL_AND_PROPERTIES
               LABEL_KW "label"
@@ -304,8 +304,8 @@ SOURCE_FILE
               PROPERTIES_LIST
                 PROPERTIES_KW "properties"
                 WHITESPACE " "
-                L_PAREN "("
                 EXPR_AS_NAME_LIST
+                  L_PAREN "("
                   EXPR_AS_NAME
                     NAME_REF
                       IDENT "i"
@@ -314,7 +314,7 @@ SOURCE_FILE
                     WHITESPACE " "
                     NAME
                       IDENT "x"
-                R_PAREN ")"
+                  R_PAREN ")"
         WHITESPACE "\n  "
         R_PAREN ")"
   SEMICOLON ";"

crates/squawk_parser/tests/snapshots/tests__create_property_graph_ok.snap

@@ -402,8 +402,8 @@ SOURCE_FILE
         PROPERTIES_LIST
           PROPERTIES_KW "properties"
           WHITESPACE " "
-          L_PAREN "("
           EXPR_AS_NAME_LIST
+            L_PAREN "("
             EXPR_AS_NAME
               NAME_REF
                 IDENT "a"
@@ -422,7 +422,7 @@ SOURCE_FILE
               WHITESPACE " "
               NAME
                 IDENT "y"
-          R_PAREN ")"
+            R_PAREN ")"
       R_PAREN ")"
   SEMICOLON ";"
   WHITESPACE "\n\n"

crates/squawk_parser/tests/snapshots/tests__select_funcs_ok.snap

@@ -847,8 +847,8 @@ SOURCE_FILE
               COMMA ","
               WHITESPACE " "
               XMLATTRIBUTES_KW "xmlattributes"
-              L_PAREN "("
               EXPR_AS_NAME_LIST
+                L_PAREN "("
                 EXPR_AS_NAME
                   NAME_REF
                     IDENT "foo"
@@ -862,7 +862,7 @@ SOURCE_FILE
                   WHITESPACE " "
                   NAME
                     IDENT "b"
-              R_PAREN ")"
+                R_PAREN ")"
               R_PAREN ")"
   SEMICOLON ";"
   WHITESPACE "\n"
@@ -912,8 +912,8 @@ SOURCE_FILE
               COMMA ","
               WHITESPACE " "
               XMLATTRIBUTES_KW "xmlattributes"
-              L_PAREN "("
               EXPR_AS_NAME_LIST
+                L_PAREN "("
                 EXPR_AS_NAME
                   NAME_REF
                     IDENT "buzz"
@@ -927,7 +927,7 @@ SOURCE_FILE
                   WHITESPACE " "
                   NAME
                     IDENT "c"
-              R_PAREN ")"
+                R_PAREN ")"
               COMMA ","
               WHITESPACE " "
               NAME_REF
@@ -1056,8 +1056,8 @@ SOURCE_FILE
           CALL_EXPR
             XML_FOREST_FN
               XMLFOREST_KW "xmlforest"
-              L_PAREN "("
               EXPR_AS_NAME_LIST
+                L_PAREN "("
                 EXPR_AS_NAME
                   NAME_REF
                     IDENT "foo"
@@ -1071,7 +1071,7 @@ SOURCE_FILE
                 EXPR_AS_NAME
                   NAME_REF
                     IDENT "buzz"
-              R_PAREN ")"
+                R_PAREN ")"
   SEMICOLON ";"
   WHITESPACE "\n\n"
   COMMENT "-- xmlparse"

crates/squawk_parser/tests/snapshots/tests__select_graph_table_fn_err.snap

@@ -0,0 +1,57 @@
+---
+source: crates/squawk_parser/tests/tests.rs
+input_file: crates/squawk_parser/tests/data/err/select_graph_table_fn.sql
+---
+SOURCE_FILE
+  SELECT
+    SELECT_CLAUSE
+      SELECT_KW "select"
+      WHITESPACE " "
+      TARGET_LIST
+        TARGET
+          STAR "*"
+    WHITESPACE " "
+    FROM_CLAUSE
+      FROM_KW "from"
+      WHITESPACE " "
+      FROM_ITEM
+        GRAPH_TABLE_FN
+          GRAPH_TABLE_KW "graph_table"
+          L_PAREN "("
+          WHITESPACE "\n  "
+          PATH
+            PATH_SEGMENT
+              NAME_REF
+                IDENT "foo"
+          WHITESPACE " "
+          MATCH_KW "match"
+          WHITESPACE " "
+          PATH_PATTERN_LIST
+            PATH_PATTERN
+              PATH_FACTOR
+                EDGE_ANY
+                  MINUS "-"
+          WHITESPACE " "
+          COLUMNS_KW "columns"
+          WHITESPACE " "
+          EXPR_AS_NAME_LIST
+            L_PAREN "("
+            EXPR_AS_NAME
+              NAME_REF
+                IDENT "a"
+            WHITESPACE " "
+            EXPR_AS_NAME
+              NAME_REF
+                IDENT "b"
+            R_PAREN ")"
+          WHITESPACE "\n"
+          COMMENT "--                      ^ comma missing"
+          WHITESPACE "\n"
+          R_PAREN ")"
+  SEMICOLON ";"
+  WHITESPACE "\n"
+---
+error[syntax-error]: expected COMMA
+  ╭▸ 
+2 │   foo match - columns (a b)
+  ╰╴                        ━