parser: parse function call for sort clause

It seems it is possible to use functions calls for sort clauses instead of identifiers too, did not test other expressions though.
usagi-coffee · Sep 10, 2023 · 62aae55 · 62aae55
1 parent a2518fe
commit 62aae55
Show file tree

Hide file tree

Showing 5 changed files with 12,283 additions and 12,095 deletions.
diff --git a/grammar.js b/grammar.js
@@ -544,7 +544,7 @@ module.exports = grammar({
     /// FOR statement
     sort_order: ($) => choice(kw("DESCENDING")),
     sort_column: ($) =>
-      seq(field("column", $.identifier), optional($.sort_order)),
+      seq(field("column", choice($.function_call, $.identifier)), optional($.sort_order)),
 
     sort_clause: ($) =>
       seq(optional(kw("BREAK")), kw("BY"), repeat1($.sort_column)),

diff --git a/src/grammar.json b/src/grammar.json
@@ -4108,8 +4108,17 @@
           "type": "FIELD",
           "name": "column",
           "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "function_call"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
+            ]
           }
         },
         {

diff --git a/src/node-types.json b/src/node-types.json
@@ -1540,6 +1540,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "function_call",
+            "named": true
+          },
           {
             "type": "identifier",
             "named": true