parser: try to streamline function call argument

Fixes #85
usagi-coffee · Nov 18, 2024 · d390a38 · d390a38
1 parent aca3a5f
commit d390a38
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/grammar.js b/grammar.js
@@ -370,31 +370,33 @@ module.exports = grammar({
         choice(kw("INPUT"), kw("OUTPUT"), kw("INPUT-OUTPUT"), kw("DATA-SOURCE"))
       ),
 
-    argument_pass_type: ($) =>
-      choice(kw("BY-VALUE"), kw("BY-REFERENCE"), kw("BIND")),
-    _function_argument_with_mode: ($) =>
-      seq(
-        $.argument_mode,
-        choice(
-          seq(
-            choice($.identifier, $.object_access, $.qualified_name),
-            optional($.type_tuning)
-          ),
-          seq(
-            choice(
-              kw("TABLE"),
-              kw("TABLE-HANDLE"),
-              kw("DATASET"),
-              kw("DATASET-HANDLE")
+    argument_tuning: ($) =>
+      choice(kw("BY-VALUE"), kw("BY-REFERENCE"), kw("BIND"), kw("APPEND")),
+    function_call_argument: ($) =>
+      prec.right(
+        1,
+        seq(
+          optional($.argument_mode),
+          choice(
+            seq(
+              choice($.identifier, $.object_access, $.qualified_name),
+              optional($.type_tuning)
             ),
-            choice($.identifier, $.qualified_name)
-          )
-        ),
-        optional(kw("APPEND")),
-        optional($.argument_pass_type)
+            seq(
+              optional(
+                choice(
+                  kw("TABLE"),
+                  kw("TABLE-HANDLE"),
+                  kw("DATASET"),
+                  kw("DATASET-HANDLE")
+                )
+              ),
+              $._expression
+            )
+          ),
+          optional($.argument_tuning)
+        )
       ),
-    function_call_argument: ($) =>
-      prec.right(1, choice($._function_argument_with_mode, $._expression)),
 
     function_arguments: ($) =>
       seq(

diff --git a/test/corpus/basic.txt b/test/corpus/basic.txt
@@ -993,7 +993,7 @@ PersonData:GetById(id, output table ttPerson by-reference).
         (argument
           (argument_mode)
           (identifier)
-          (argument_pass_type))))))
+          (argument_tuning))))))
 
 ================================================================================
 DO TRANSACTION statement