Add function call statement

Author: Azganoth

corpus/functions.txt

@@ -86,3 +86,25 @@ f = function() return 'some string' end
   (variable_declaration (variable_declarator (identifier))
     (function_definition (parameters)
       (return_statement (string)))))
+
+============================================
+Function calls
+============================================
+
+f(3)
+
+f(r(), 10)
+
+g(5, r())
+
+---
+
+(lua
+  (function_call (identifier)
+    (arguments (number)))
+
+  (function_call (identifier)
+    (arguments (function_call (identifier) (arguments)) (number)))
+
+  (function_call (identifier)
+    (arguments (number) (function_call (identifier) (arguments)))))

grammar.js

@@ -31,6 +31,7 @@ module.exports = grammar({
   conflicts: $ => [
     [$._prefix],
     [$._expression, $._variable_declarator],
+    [$._expression, $.function_call_statement]
   ],
 
   externals: $ => [
@@ -68,7 +69,8 @@ module.exports = grammar({
       $._empty_statement,
 
       alias($.function_statement, $.function),
-      alias($.local_function_statement, $.local_function)
+      alias($.local_function_statement, $.local_function),
+      alias($.function_call_statement, $.function_call)
     ),
 
     // Declarations
@@ -207,6 +209,17 @@ module.exports = grammar({
       $._function_body
     ),
 
+    function_call_statement: $ => prec.dynamic(PREC.PRIORITY, choice(
+      seq($._prefix, $.arguments),
+      seq($._prefix, ':', alias($.identifier, $.method), $.arguments)
+    )),
+
+    arguments: $ => choice(
+      seq('(', optional(sequence($._expression)), ')'),
+      $.table,
+      $.string
+    ),
+
     function_name: $ => seq(
       $.identifier,
       repeat(seq('.', alias($.identifier, $.property_identifier))),
@@ -262,6 +275,7 @@ module.exports = grammar({
       $.this,
       $.self,
       $._variable_declarator,
+      alias($.function_call_statement, $.function_call),
       seq('(', $._expression, ')')
     ),
 

src/grammar.json

@@ -139,6 +139,15 @@
           },
           "named": true,
           "value": "local_function"
+        },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "function_call_statement"
+          },
+          "named": true,
+          "value": "function_call"
         }
       ]
     },
@@ -870,6 +879,113 @@
         }
       ]
     },
+    "function_call_statement": {
+      "type": "PREC_DYNAMIC",
+      "value": 1,
+      "content": {
+        "type": "CHOICE",
+        "members": [
+          {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_prefix"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "arguments"
+              }
+            ]
+          },
+          {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_prefix"
+              },
+              {
+                "type": "STRING",
+                "value": ":"
+              },
+              {
+                "type": "ALIAS",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "identifier"
+                },
+                "named": true,
+                "value": "method"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "arguments"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "arguments": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "("
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "_expression"
+                    },
+                    {
+                      "type": "REPEAT",
+                      "content": {
+                        "type": "SEQ",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ","
+                          },
+                          {
+                            "type": "SYMBOL",
+                            "name": "_expression"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "STRING",
+              "value": ")"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "table"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "string"
+        }
+      ]
+    },
     "function_name": {
       "type": "SEQ",
       "members": [
@@ -1153,6 +1269,15 @@
           "type": "SYMBOL",
           "name": "_variable_declarator"
         },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "function_call_statement"
+          },
+          "named": true,
+          "value": "function_call"
+        },
         {
           "type": "SEQ",
           "members": [
@@ -2299,6 +2424,10 @@
     [
       "_expression",
       "_variable_declarator"
+    ],
+    [
+      "_expression",
+      "function_call_statement"
     ]
   ],
   "externals": [