Fix tests for new grammar

corpus/control_flow.txt

@@ -34,6 +34,7 @@ x = if true then 1
       (expression
         (assignment
           (identifier)
+          (statement
             (expression
               (control_flow
                 (expression
@@ -42,5 +43,4 @@ x = if true then 1
                 (statement
                   (expression
                     (value
-                    (integer)))))))))))
+                      (integer))))))))))))
-

corpus/functions.txt

@@ -32,8 +32,9 @@ foobar <"Hiya">
       (expression
         (function_call
           (identifier)
+          (expression
             (value
-            (string)))))))
+              (string))))))))
 
 ==================
 Complex Function

corpus/lists.txt

@@ -31,28 +31,26 @@ foobar = ['answer', 42]
       (expression
         (assignment
           (identifier)
+          (statement
             (expression
               (value
                 (list
                   (value
                     (string))
                   (value
-                  (integer))))))))))
+                    (integer)))))))))))
 
 ==================
 List Nesting
 ==================
 
-foobar = ['answers', [42, [666]]]
+['answers', [42, [666]]]
 
 ---
 
 (root
   (item
     (statement
-      (expression
-        (assignment
-          (identifier)
       (expression
         (value
           (list
@@ -65,4 +63,4 @@ foobar = ['answers', [42, [666]]]
                 (value
                   (list
                     (value
-                          (integer))))))))))))))
+                      (integer))))))))))))

corpus/maps.txt

@@ -34,12 +34,13 @@ x = map {
       (expression
         (assignment
           (identifier)          
+            (statement
               (expression
                 (value
                   (map
                     (identifier)
                     (value
-                  (integer))))))))))
+                      (integer)))))))))))
 
 ==================
 Map Access

corpus/statements.txt

@@ -39,17 +39,19 @@ y = "one"
       (expression
         (assignment
           (identifier)
+          (statement
             (expression
               (value
-              (integer)))))))
+                (integer))))))))
   (item
     (statement    
       (expression
         (assignment
           (identifier)
+          (statement
             (expression
               (value
-              (string))))))))
+                (string)))))))))
 
 ==================
 Complex Assignment
@@ -65,6 +67,7 @@ x = 1 + 1
       (expression
         (assignment
           (identifier)
+          (statement
             (expression
               (math
                 (expression
@@ -73,4 +76,4 @@ x = 1 + 1
                 (math_operator)
                 (expression
                   (value
-                  (integer))))))))))
+                    (integer)))))))))))

corpus/tables.txt

@@ -38,6 +38,7 @@ foobar = table <text, number> {
       (expression
         (assignment
           (identifier)
+          (statement
             (expression
               (value
                 (table
@@ -47,7 +48,7 @@ foobar = table <text, number> {
                     (value
                       (string))
                     (value
-                    (integer)))))))))))
+                      (integer))))))))))))
           
 ==================
 Table Access

corpus/yield.txt

@@ -0,0 +1,71 @@
+==================
+Simple Yield
+==================
+
+1 -> output
+
+---
+
+(root
+  (item
+    (statement
+      (yield
+        (expression
+          (value
+            (integer)))
+        (expression
+          (identifier))))))
+
+==================
+Complex Yield
+==================
+
+1 + 1 -> to_string -> output
+
+---
+
+(root
+  (item
+    (statement
+      (yield
+        (expression
+          (math
+            (expression
+              (value
+                (integer)))
+            (math_operator)
+            (expression
+              (value
+                (integer)))))
+        (expression
+          (identifier))
+        (expression
+          (identifier))))))
+
+==================
+Yield Assignment
+==================
+
+x = 1 + 1 -> to_string
+
+---
+
+(root
+  (item
+    (statement
+      (expression
+        (assignment
+          (identifier)
+          (statement
+            (yield
+              (expression
+                (math
+                  (expression
+                    (value
+                      (integer)))
+                  (math_operator)
+                  (expression
+                    (value
+                      (integer)))))
+              (expression
+                (identifier)))))))))

grammar.js

@@ -18,7 +18,14 @@ module.exports = grammar({
       $.yield,
     )),
 
-    yield: $ => prec.left(seq($.statement, '->', $.statement)),
+    yield: $ => prec.left(
+      seq(
+        $.expression,
+        '->',
+        $.expression,
+        repeat(prec.left(seq('->', $.expression)))
+      )
+    ),
 
     expression: $ => choice(
       $._expression_kind,
@@ -157,9 +164,7 @@ module.exports = grammar({
     function_call: $ => prec.right(seq(
       $.identifier,
       '<',
-      repeat(
+      repeat($.expression),
-        choice($.identifier, $.value),
-      ),
       '>',
     )),
 

src/grammar.json

@@ -63,7 +63,7 @@
         "members": [
           {
             "type": "SYMBOL",
-            "name": "statement"
+            "name": "expression"
           },
           {
             "type": "STRING",
@@ -71,7 +71,27 @@
           },
           {
             "type": "SYMBOL",
-            "name": "statement"
+            "name": "expression"
+          },
+          {
+            "type": "REPEAT",
+            "content": {
+              "type": "PREC_LEFT",
+              "value": 0,
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "->"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "expression"
+                  }
+                ]
+              }
+            }
           }
         ]
       }
@@ -713,17 +733,8 @@
           {
             "type": "REPEAT",
             "content": {
-              "type": "CHOICE",
-              "members": [
-                {
               "type": "SYMBOL",
-                  "name": "identifier"
+              "name": "expression"
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "value"
-                }
-              ]
             }
           },
           {

src/node-types.json

@@ -145,11 +145,11 @@
       "required": true,
       "types": [
         {
-          "type": "identifier",
+          "type": "expression",
           "named": true
         },
         {
-          "type": "value",
+          "type": "identifier",
           "named": true
         }
       ]
@@ -460,7 +460,7 @@
       "required": true,
       "types": [
         {
-          "type": "statement",
+          "type": "expression",
           "named": true
         }
       ]