feat: Allow calls immediately after function definition.

gap-system · May 26, 2024 · 2c1958e · 2c1958e
1 parent e92c672
commit 2c1958e
Show file tree

Hide file tree

Showing 5 changed files with 5,934 additions and 5,931 deletions.
diff --git a/grammar.js b/grammar.js
@@ -449,7 +449,11 @@ module.exports = grammar({
     call: $ => prec(PREC.CALL, seq(
       field('function', choice(
         $._variable,
-        $.parenthesized_expression
+        $.parenthesized_expression,
+        // Yes, you can define a function and immediately call it
+        $.function
+        // But not an atomic function, for some reason!?
+        // $.atomic_function
       )),
       field('arguments', $.argument_list)
     )),
@@ -545,7 +549,7 @@ module.exports = grammar({
     comment: _ => token(seq('#', /.*/)),
 
     // TODO: implement external scanner for line continuations
-    line_continuation: _ => token(seq('\\', choice(seq(optional('\r'), '\n'), '\0'))),
+    // line_continuation: _ => token(seq('\\', choice(seq(optional('\r'), '\n'), '\0'))),
 
     qualifier: _ => choice('readonly', 'readwrite')
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -1749,6 +1749,10 @@
                 {
                   "type": "SYMBOL",
                   "name": "parenthesized_expression"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "function"
                 }
               ]
             }
@@ -2232,48 +2236,6 @@
         ]
       }
     },
-    "line_continuation": {
-      "type": "TOKEN",
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "\\"
-          },
-          {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "STRING",
-                        "value": "\r"
-                      },
-                      {
-                        "type": "BLANK"
-                      }
-                    ]
-                  },
-                  {
-                    "type": "STRING",
-                    "value": "\n"
-                  }
-                ]
-              },
-              {
-                "type": "STRING",
-                "value": "\u0000"
-              }
-            ]
-          }
-        ]
-      }
-    },
     "qualifier": {
       "type": "CHOICE",
       "members": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -702,6 +702,10 @@
             "type": "component_selector",
             "named": true
           },
+          {
+            "type": "function",
+            "named": true
+          },
           {
             "type": "identifier",
             "named": true