fix operations; add one line blocks

src/grammar.json

@@ -21,6 +21,10 @@
               "type": "SYMBOL",
               "name": "block"
             },
+            {
+              "type": "SYMBOL",
+              "name": "one_line_block"
+            },
             {
               "type": "SYMBOL",
               "name": "_newlines"
@@ -127,6 +131,68 @@
         ]
       }
     },
+    "one_line_block": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "identifier"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "string_lit"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
+            ]
+          }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_block_start"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "identifier"
+                },
+                {
+                  "type": "STRING",
+                  "value": "="
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "expression"
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_block_end"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_newlines"
+        }
+      ]
+    },
     "_block_start": {
       "type": "STRING",
       "value": "{"
@@ -763,6 +829,18 @@
           "type": "SYMBOL",
           "name": "_tuple_start"
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_newlines"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "SYMBOL",
           "name": "for_intro"
@@ -783,6 +861,18 @@
             }
           ]
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_newlines"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "SYMBOL",
           "name": "_tuple_end"
@@ -796,6 +886,18 @@
           "type": "SYMBOL",
           "name": "_object_start"
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_newlines"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "SYMBOL",
           "name": "for_intro"
@@ -836,6 +938,18 @@
             }
           ]
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_newlines"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "SYMBOL",
           "name": "_object_end"
@@ -1487,6 +1601,10 @@
     [
       "string_lit",
       "quoted_template"
+    ],
+    [
+      "block",
+      "one_line_block"
     ]
   ],
   "precedences": [],

src/node-types.json

@@ -126,6 +126,10 @@
         {
           "type": "block",
           "named": true
+        },
+        {
+          "type": "one_line_block",
+          "named": true
         }
       ]
     }
@@ -514,6 +518,29 @@
       ]
     }
   },
+  {
+    "type": "one_line_block",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "expression",
+          "named": true
+        },
+        {
+          "type": "identifier",
+          "named": true
+        },
+        {
+          "type": "string_lit",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "operation",
     "named": true,