parser: parse qualified_name for table name

usagi-coffee · Jan 8, 2024 · ae183cd · ae183cd
1 parent 5116673
commit ae183cd
Show file tree

Hide file tree

Showing 4 changed files with 47,757 additions and 46,169 deletions.
diff --git a/grammar.js b/grammar.js
@@ -284,7 +284,7 @@ module.exports = grammar({
         field("name", $.identifier),
         kw("FOR"),
         optional(kw("TEMP-TABLE")),
-        field("table", $.identifier),
+        field("table", choice($.identifier, $.qualified_name)),
         $._terminator
       ),
 
@@ -700,7 +700,7 @@ module.exports = grammar({
         optional($.label),
         kw("FOR"),
         field("type", choice(kw("EACH"), kw("FIRST"), kw("LAST"))),
-        field("table", $.identifier),
+        field("table", choice($.identifier, $.qualified_name)),
         optional($.of),
         optional($._pre_tuning),
         optional($.where_clause),
@@ -722,7 +722,7 @@ module.exports = grammar({
       seq(
         kw("FIND"),
         field("type", optional($._find_type)),
-        field("table", $.identifier),
+        field("table", choice($.identifier, $.qualified_name)),
         optional($.of),
         optional($._pre_tuning),
         optional($.where_clause),
@@ -735,7 +735,7 @@ module.exports = grammar({
         kw("CAN-FIND"),
         "(",
         optional(choice(kw("FIRST"), kw("LAST"))),
-        field("table", $.identifier),
+        field("table", choice($.identifier, $.qualified_name)),
         optional(field("constant", $._expression)),
         repeat(
           choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -1859,8 +1859,17 @@
           "type": "FIELD",
           "name": "table",
           "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "qualified_name"
+              }
+            ]
           }
         },
         {
@@ -5555,8 +5564,17 @@
           "type": "FIELD",
           "name": "table",
           "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "qualified_name"
+              }
+            ]
           }
         },
         {
@@ -5796,8 +5814,17 @@
           "type": "FIELD",
           "name": "table",
           "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "qualified_name"
+              }
+            ]
           }
         },
         {
@@ -5921,8 +5948,17 @@
           "type": "FIELD",
           "name": "table",
           "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "qualified_name"
+              }
+            ]
           }
         },
         {

diff --git a/src/node-types.json b/src/node-types.json
@@ -434,6 +434,10 @@
           {
             "type": "identifier",
             "named": true
+          },
+          {
+            "type": "qualified_name",
+            "named": true
           }
         ]
       }
@@ -460,6 +464,10 @@
           {
             "type": "identifier",
             "named": true
+          },
+          {
+            "type": "qualified_name",
+            "named": true
           }
         ]
       }
@@ -1013,6 +1021,10 @@
           {
             "type": "identifier",
             "named": true
+          },
+          {
+            "type": "qualified_name",
+            "named": true
           }
         ]
       },
@@ -1073,6 +1085,10 @@
           {
             "type": "identifier",
             "named": true
+          },
+          {
+            "type": "qualified_name",
+            "named": true
           }
         ]
       },