diff --git a/examples/NQueens.rp1 b/examples/NQueens.rp1
index e8ce847..9d7bd0b 100644
--- a/examples/NQueens.rp1
+++ b/examples/NQueens.rp1
@@ -8,13 +8,13 @@ define output decision Queen(Coord, Coord)
 Queen(row, col) :- Coord row, Coord col.
 
 ; Exactly one queen goes on each row.
-:- For(row), @count Queen(row, _) = 1.
+:- @count col : Queen(row, _) = 1.
 
 ; Exactly one queen goes on each column.
-:- For(col), @count Queen(_, col) = 1.
+:- @count col : Queen(_, col) = 1.
 
 ; At most one queen can go along each main diagonal.
-:- For(diag), @count { Queen (row, col), diag = row + col } <= 1.
+:- @count diag : { Queen (row, col), diag = row + col } <= 1.
 
 ; At most one queen can go along each orthogonal diagonal.
-:- For(diag), @count { Queen (row, col), diag = row - col } <= 1.
+:- @count diag : { Queen (row, col), diag = row - col } <= 1.
diff --git a/tree-sitter-kerolox/grammar.js b/tree-sitter-kerolox/grammar.js
index 52e4936..bdc6ff1 100644
--- a/tree-sitter-kerolox/grammar.js
+++ b/tree-sitter-kerolox/grammar.js
@@ -131,6 +131,7 @@ export default grammar({
 
     aggregate: $ => seq(
       field("op", $.aggregate_op),
+      optional(seq(list(field("witness", $.variable)), ":")),
       choice(
         field("atom", $.atom),
         seq("{", field("body", $.rule_body ), "}"),
diff --git a/tree-sitter-kerolox/queries/highlights.scm b/tree-sitter-kerolox/queries/highlights.scm
index 3ffe518..04ad2b8 100644
--- a/tree-sitter-kerolox/queries/highlights.scm
+++ b/tree-sitter-kerolox/queries/highlights.scm
@@ -12,7 +12,7 @@
 (definition relation: (symbol) @function)
 (atom head: (symbol) @function)
 
-[ ":-" "," "." ] @punctuation.delimiter
+[ ":-" "," "." ":" ] @punctuation.delimiter
 [ "(" ")" "{" "}" ] @punctuation.bracket
 
 (aggregate_op) @keyword
diff --git a/tree-sitter-kerolox/src/grammar.json b/tree-sitter-kerolox/src/grammar.json
index d6521b9..5e516b4 100644
--- a/tree-sitter-kerolox/src/grammar.json
+++ b/tree-sitter-kerolox/src/grammar.json
@@ -742,6 +742,56 @@
             "name": "aggregate_op"
           }
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "FIELD",
+                      "name": "witness",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "variable"
+                      }
+                    },
+                    {
+                      "type": "REPEAT",
+                      "content": {
+                        "type": "SEQ",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ","
+                          },
+                          {
+                            "type": "FIELD",
+                            "name": "witness",
+                            "content": {
+                              "type": "SYMBOL",
+                              "name": "variable"
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "STRING",
+                  "value": ":"
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "CHOICE",
           "members": [
diff --git a/tree-sitter-kerolox/src/node-types.json b/tree-sitter-kerolox/src/node-types.json
index 094b0f4..fe7e832 100644
--- a/tree-sitter-kerolox/src/node-types.json
+++ b/tree-sitter-kerolox/src/node-types.json
@@ -32,6 +32,16 @@
             "named": true
           }
         ]
+      },
+      "witness": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "variable",
+            "named": true
+          }
+        ]
       }
     }
   },
@@ -669,6 +679,10 @@
     "type": "0",
     "named": false
   },
+  {
+    "type": ":",
+    "named": false
+  },
   {
     "type": ":-",
     "named": false
diff --git a/tree-sitter-kerolox/src/parser.c b/tree-sitter-kerolox/src/parser.c
index afac2cf..f5b7301 100644
--- a/tree-sitter-kerolox/src/parser.c
+++ b/tree-sitter-kerolox/src/parser.c
@@ -7,16 +7,16 @@
 #endif
 
 #define LANGUAGE_VERSION 14
-#define STATE_COUNT 148
+#define STATE_COUNT 163
 #define LARGE_STATE_COUNT 3
-#define SYMBOL_COUNT 65
+#define SYMBOL_COUNT 67
 #define ALIAS_COUNT 0
-#define TOKEN_COUNT 41
+#define TOKEN_COUNT 42
 #define EXTERNAL_TOKEN_COUNT 0
-#define FIELD_COUNT 32
+#define FIELD_COUNT 33
 #define MAX_ALIAS_SEQUENCE_LENGTH 8
 #define MAX_RESERVED_WORD_SET_SIZE 0
-#define PRODUCTION_ID_COUNT 55
+#define PRODUCTION_ID_COUNT 61
 #define SUPERTYPE_COUNT 0
 
 enum ts_symbol_identifiers {
@@ -45,45 +45,47 @@ enum ts_symbol_identifiers {
   anon_sym__ = 23,
   anon_sym_True = 24,
   anon_sym_False = 25,
-  anon_sym_LBRACE = 26,
-  anon_sym_RBRACE = 27,
-  sym_aggregate_op = 28,
-  anon_sym_BANG = 29,
-  anon_sym_STAR = 30,
-  anon_sym_SLASH = 31,
-  anon_sym_PLUS = 32,
-  anon_sym_DOT_DOT = 33,
-  anon_sym_BANG_EQ = 34,
-  anon_sym_GT_EQ = 35,
-  anon_sym_LT_EQ = 36,
-  anon_sym_LT = 37,
-  anon_sym_GT = 38,
-  anon_sym_AMP_AMP = 39,
-  anon_sym_PIPE_PIPE = 40,
-  sym_file = 41,
-  sym_comment = 42,
-  sym_integer = 43,
-  sym_type_alias = 44,
-  sym_type = 45,
-  sym_import = 46,
-  sym_definition = 47,
-  sym_rule = 48,
-  sym_assumption = 49,
-  sym_rule_body = 50,
-  sym_expr = 51,
-  sym_atom = 52,
-  sym_tuple = 53,
-  sym_value = 54,
-  sym_aggregate = 55,
-  sym_unary_expr = 56,
-  sym_unary_op = 57,
-  sym_binary_expr = 58,
-  aux_sym_file_repeat1 = 59,
-  aux_sym_type_repeat1 = 60,
-  aux_sym_import_repeat1 = 61,
-  aux_sym_import_repeat2 = 62,
-  aux_sym_rule_body_repeat1 = 63,
-  aux_sym_tuple_repeat1 = 64,
+  anon_sym_COLON = 26,
+  anon_sym_LBRACE = 27,
+  anon_sym_RBRACE = 28,
+  sym_aggregate_op = 29,
+  anon_sym_BANG = 30,
+  anon_sym_STAR = 31,
+  anon_sym_SLASH = 32,
+  anon_sym_PLUS = 33,
+  anon_sym_DOT_DOT = 34,
+  anon_sym_BANG_EQ = 35,
+  anon_sym_GT_EQ = 36,
+  anon_sym_LT_EQ = 37,
+  anon_sym_LT = 38,
+  anon_sym_GT = 39,
+  anon_sym_AMP_AMP = 40,
+  anon_sym_PIPE_PIPE = 41,
+  sym_file = 42,
+  sym_comment = 43,
+  sym_integer = 44,
+  sym_type_alias = 45,
+  sym_type = 46,
+  sym_import = 47,
+  sym_definition = 48,
+  sym_rule = 49,
+  sym_assumption = 50,
+  sym_rule_body = 51,
+  sym_expr = 52,
+  sym_atom = 53,
+  sym_tuple = 54,
+  sym_value = 55,
+  sym_aggregate = 56,
+  sym_unary_expr = 57,
+  sym_unary_op = 58,
+  sym_binary_expr = 59,
+  aux_sym_file_repeat1 = 60,
+  aux_sym_type_repeat1 = 61,
+  aux_sym_import_repeat1 = 62,
+  aux_sym_import_repeat2 = 63,
+  aux_sym_rule_body_repeat1 = 64,
+  aux_sym_tuple_repeat1 = 65,
+  aux_sym_aggregate_repeat1 = 66,
 };
 
 static const char * const ts_symbol_names[] = {
@@ -113,6 +115,7 @@ static const char * const ts_symbol_names[] = {
   [anon_sym__] = "_",
   [anon_sym_True] = "True",
   [anon_sym_False] = "False",
+  [anon_sym_COLON] = ":",
   [anon_sym_LBRACE] = "{",
   [anon_sym_RBRACE] = "}",
   [sym_aggregate_op] = "aggregate_op",
@@ -152,6 +155,7 @@ static const char * const ts_symbol_names[] = {
   [aux_sym_import_repeat2] = "import_repeat2",
   [aux_sym_rule_body_repeat1] = "rule_body_repeat1",
   [aux_sym_tuple_repeat1] = "tuple_repeat1",
+  [aux_sym_aggregate_repeat1] = "aggregate_repeat1",
 };
 
 static const TSSymbol ts_symbol_map[] = {
@@ -181,6 +185,7 @@ static const TSSymbol ts_symbol_map[] = {
   [anon_sym__] = anon_sym__,
   [anon_sym_True] = anon_sym_True,
   [anon_sym_False] = anon_sym_False,
+  [anon_sym_COLON] = anon_sym_COLON,
   [anon_sym_LBRACE] = anon_sym_LBRACE,
   [anon_sym_RBRACE] = anon_sym_RBRACE,
   [sym_aggregate_op] = sym_aggregate_op,
@@ -220,6 +225,7 @@ static const TSSymbol ts_symbol_map[] = {
   [aux_sym_import_repeat2] = aux_sym_import_repeat2,
   [aux_sym_rule_body_repeat1] = aux_sym_rule_body_repeat1,
   [aux_sym_tuple_repeat1] = aux_sym_tuple_repeat1,
+  [aux_sym_aggregate_repeat1] = aux_sym_aggregate_repeat1,
 };
 
 static const TSSymbolMetadata ts_symbol_metadata[] = {
@@ -327,6 +333,10 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
+  [anon_sym_COLON] = {
+    .visible = true,
+    .named = false,
+  },
   [anon_sym_LBRACE] = {
     .visible = true,
     .named = false,
@@ -483,6 +493,10 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = false,
   },
+  [aux_sym_aggregate_repeat1] = {
+    .visible = false,
+    .named = false,
+  },
 };
 
 enum ts_field_identifiers {
@@ -518,6 +532,7 @@ enum ts_field_identifiers {
   field_unary = 30,
   field_value = 31,
   field_variable = 32,
+  field_witness = 33,
 };
 
 static const char * const ts_field_names[] = {
@@ -554,6 +569,7 @@ static const char * const ts_field_names[] = {
   [field_unary] = "unary",
   [field_value] = "value",
   [field_variable] = "variable",
+  [field_witness] = "witness",
 };
 
 static const TSMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
@@ -593,24 +609,30 @@ static const TSMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
   [34] = {.index = 53, .length = 1},
   [35] = {.index = 54, .length = 2},
   [36] = {.index = 56, .length = 2},
-  [37] = {.index = 58, .length = 2},
-  [38] = {.index = 60, .length = 3},
-  [39] = {.index = 63, .length = 3},
-  [40] = {.index = 66, .length = 4},
-  [41] = {.index = 70, .length = 4},
-  [42] = {.index = 74, .length = 4},
-  [43] = {.index = 78, .length = 2},
-  [44] = {.index = 80, .length = 1},
-  [45] = {.index = 81, .length = 2},
-  [46] = {.index = 83, .length = 2},
-  [47] = {.index = 85, .length = 5},
-  [48] = {.index = 90, .length = 4},
-  [49] = {.index = 94, .length = 1},
-  [50] = {.index = 95, .length = 3},
-  [51] = {.index = 98, .length = 2},
-  [52] = {.index = 100, .length = 3},
-  [53] = {.index = 103, .length = 2},
-  [54] = {.index = 105, .length = 4},
+  [37] = {.index = 58, .length = 1},
+  [38] = {.index = 59, .length = 3},
+  [39] = {.index = 62, .length = 2},
+  [40] = {.index = 64, .length = 2},
+  [41] = {.index = 66, .length = 3},
+  [42] = {.index = 69, .length = 3},
+  [43] = {.index = 72, .length = 4},
+  [44] = {.index = 76, .length = 4},
+  [45] = {.index = 80, .length = 4},
+  [46] = {.index = 84, .length = 4},
+  [47] = {.index = 88, .length = 2},
+  [48] = {.index = 90, .length = 1},
+  [49] = {.index = 91, .length = 2},
+  [50] = {.index = 93, .length = 2},
+  [51] = {.index = 95, .length = 5},
+  [52] = {.index = 100, .length = 4},
+  [53] = {.index = 104, .length = 3},
+  [54] = {.index = 107, .length = 1},
+  [55] = {.index = 108, .length = 3},
+  [56] = {.index = 111, .length = 2},
+  [57] = {.index = 113, .length = 3},
+  [58] = {.index = 116, .length = 2},
+  [59] = {.index = 118, .length = 4},
+  [60] = {.index = 122, .length = 4},
 };
 
 static const TSFieldMapEntry ts_field_map_entries[] = {
@@ -709,70 +731,93 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
     {field_el, 0, .inherited = true},
     {field_el, 1, .inherited = true},
   [58] =
+    {field_witness, 1},
+  [59] =
+    {field_atom, 3},
+    {field_op, 0},
+    {field_witness, 1},
+  [62] =
+    {field_witness, 0, .inherited = true},
+    {field_witness, 1, .inherited = true},
+  [64] =
     {field_body, 2},
     {field_op, 0},
-  [60] =
+  [66] =
     {field_body, 3},
     {field_head, 1},
     {field_relation, 0},
-  [63] =
+  [69] =
     {field_item, 4},
     {field_path, 1},
     {field_path, 2, .inherited = true},
-  [66] =
+  [72] =
     {field_input, 1},
     {field_output, 2},
     {field_relation, 3},
     {field_type, 4},
-  [70] =
+  [76] =
     {field_decision, 2},
     {field_input, 1},
     {field_relation, 3},
     {field_type, 4},
-  [74] =
+  [80] =
     {field_decision, 2},
     {field_output, 1},
     {field_relation, 3},
     {field_type, 4},
-  [78] =
+  [84] =
+    {field_atom, 4},
+    {field_op, 0},
+    {field_witness, 1},
+    {field_witness, 2, .inherited = true},
+  [88] =
     {field_item, 4},
     {field_path, 1},
-  [80] =
+  [90] =
     {field_tuple, 1},
-  [81] =
+  [91] =
     {field_tuple, 1},
     {field_tuple, 2, .inherited = true},
-  [83] =
+  [93] =
     {field_tuple, 0, .inherited = true},
     {field_tuple, 1, .inherited = true},
-  [85] =
+  [95] =
     {field_decision, 3},
     {field_input, 1},
     {field_output, 2},
     {field_relation, 4},
     {field_type, 5},
-  [90] =
+  [100] =
     {field_body, 4},
     {field_head, 2},
     {field_negate, 0},
     {field_relation, 1},
-  [94] =
+  [104] =
+    {field_body, 4},
+    {field_op, 0},
+    {field_witness, 1},
+  [107] =
     {field_item, 1},
-  [95] =
+  [108] =
     {field_item, 4},
     {field_item, 5, .inherited = true},
     {field_path, 1},
-  [98] =
+  [111] =
     {field_item, 0, .inherited = true},
     {field_item, 1, .inherited = true},
-  [100] =
+  [113] =
     {field_item, 5},
     {field_path, 1},
     {field_path, 2, .inherited = true},
-  [103] =
+  [116] =
     {field_body, 5},
     {field_soft, 2},
-  [105] =
+  [118] =
+    {field_body, 5},
+    {field_op, 0},
+    {field_witness, 1},
+    {field_witness, 2, .inherited = true},
+  [122] =
     {field_item, 5},
     {field_item, 6, .inherited = true},
     {field_path, 1},
@@ -871,7 +916,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [80] = 80,
   [81] = 81,
   [82] = 82,
-  [83] = 81,
+  [83] = 83,
   [84] = 84,
   [85] = 85,
   [86] = 86,
@@ -895,7 +940,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [104] = 104,
   [105] = 105,
   [106] = 106,
-  [107] = 97,
+  [107] = 107,
   [108] = 108,
   [109] = 109,
   [110] = 110,
@@ -905,23 +950,23 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [114] = 114,
   [115] = 115,
   [116] = 116,
-  [117] = 57,
-  [118] = 70,
-  [119] = 71,
+  [117] = 105,
+  [118] = 96,
+  [119] = 119,
   [120] = 120,
-  [121] = 109,
+  [121] = 121,
   [122] = 122,
   [123] = 123,
   [124] = 124,
   [125] = 125,
   [126] = 126,
   [127] = 127,
-  [128] = 128,
-  [129] = 129,
-  [130] = 130,
+  [128] = 65,
+  [129] = 75,
+  [130] = 76,
   [131] = 131,
   [132] = 132,
-  [133] = 133,
+  [133] = 131,
   [134] = 134,
   [135] = 135,
   [136] = 136,
@@ -930,12 +975,27 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [139] = 139,
   [140] = 140,
   [141] = 141,
-  [142] = 139,
+  [142] = 142,
   [143] = 143,
   [144] = 144,
   [145] = 145,
   [146] = 146,
-  [147] = 77,
+  [147] = 147,
+  [148] = 148,
+  [149] = 149,
+  [150] = 150,
+  [151] = 151,
+  [152] = 152,
+  [153] = 153,
+  [154] = 154,
+  [155] = 155,
+  [156] = 156,
+  [157] = 157,
+  [158] = 156,
+  [159] = 159,
+  [160] = 160,
+  [161] = 161,
+  [162] = 84,
 };
 
 static bool ts_lex(TSLexer *lexer, TSStateId state) {
@@ -943,466 +1003,485 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
   eof = lexer->eof(lexer);
   switch (state) {
     case 0:
-      if (eof) ADVANCE(46);
+      if (eof) ADVANCE(47);
       ADVANCE_MAP(
-        '!', 86,
+        '!', 89,
         '&', 4,
-        '(', 66,
-        ')', 68,
-        '*', 87,
-        '+', 89,
-        ',', 67,
-        '-', 77,
-        '.', 71,
-        '/', 88,
-        '0', 62,
-        ':', 5,
-        ';', 47,
-        '<', 94,
-        '=', 65,
-        '>', 95,
-        '@', 43,
-        'F', 54,
-        'T', 58,
-        '_', 80,
-        'd', 9,
-        'i', 20,
-        'o', 38,
-        's', 24,
-        't', 41,
-        '{', 83,
-        '|', 42,
-        '}', 84,
-        '\t', 51,
-        ' ', 51,
-        '\n', 50,
-        '\r', 50,
+        '(', 67,
+        ')', 69,
+        '*', 90,
+        '+', 92,
+        ',', 68,
+        '-', 78,
+        '.', 72,
+        '/', 91,
+        '0', 63,
+        ':', 85,
+        ';', 48,
+        '<', 97,
+        '=', 66,
+        '>', 98,
+        '@', 44,
+        'F', 55,
+        'T', 59,
+        '_', 81,
+        'd', 10,
+        'i', 21,
+        'o', 39,
+        's', 25,
+        't', 42,
+        '{', 86,
+        '|', 43,
+        '}', 87,
+        '\t', 52,
+        ' ', 52,
+        '\n', 51,
+        '\r', 51,
       );
-      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(63);
-      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(61);
+      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(64);
+      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(62);
       END_STATE();
     case 1:
-      if (lookahead == '\n') ADVANCE(49);
-      if (lookahead == ';') ADVANCE(48);
+      if (lookahead == '\n') ADVANCE(50);
+      if (lookahead == ';') ADVANCE(49);
       if (lookahead == '\t' ||
           lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(52);
+          lookahead == ' ') ADVANCE(53);
       if (lookahead != 0) ADVANCE(2);
       END_STATE();
     case 2:
-      if (lookahead == '\n') ADVANCE(49);
+      if (lookahead == '\n') ADVANCE(50);
       if (lookahead != 0) ADVANCE(2);
       END_STATE();
     case 3:
       ADVANCE_MAP(
-        '!', 6,
+        '!', 7,
         '&', 4,
-        '(', 66,
-        ')', 68,
-        '*', 87,
-        '+', 89,
-        ',', 67,
-        '-', 76,
-        '.', 71,
-        '/', 88,
-        ':', 5,
-        ';', 47,
-        '<', 94,
-        '=', 65,
-        '>', 95,
-        'd', 12,
-        'i', 22,
-        'o', 38,
-        '{', 83,
-        '|', 42,
-        '}', 84,
-        '\t', 51,
-        '\n', 51,
-        '\r', 51,
-        ' ', 51,
+        '(', 67,
+        ')', 69,
+        '*', 90,
+        '+', 92,
+        ',', 68,
+        '-', 77,
+        '.', 72,
+        '/', 91,
+        ':', 6,
+        ';', 48,
+        '<', 97,
+        '=', 66,
+        '>', 98,
+        'd', 13,
+        'i', 23,
+        'o', 39,
+        '{', 86,
+        '|', 43,
+        '}', 87,
+        '\t', 52,
+        '\n', 52,
+        '\r', 52,
+        ' ', 52,
       );
-      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(61);
+      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(62);
       END_STATE();
     case 4:
-      if (lookahead == '&') ADVANCE(96);
+      if (lookahead == '&') ADVANCE(99);
       END_STATE();
     case 5:
-      if (lookahead == '-') ADVANCE(78);
+      if (lookahead == ',') ADVANCE(68);
+      if (lookahead == ':') ADVANCE(84);
+      if (lookahead == ';') ADVANCE(48);
+      if (lookahead == '{') ADVANCE(86);
+      if (lookahead == '\t' ||
+          lookahead == '\n' ||
+          lookahead == '\r' ||
+          lookahead == ' ') ADVANCE(52);
+      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(62);
+      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(54);
       END_STATE();
     case 6:
-      if (lookahead == '=') ADVANCE(91);
+      if (lookahead == '-') ADVANCE(79);
       END_STATE();
     case 7:
-      if (lookahead == 'c') ADVANCE(16);
+      if (lookahead == '=') ADVANCE(94);
       END_STATE();
     case 8:
-      if (lookahead == 'c') ADVANCE(16);
-      if (lookahead == 'f') ADVANCE(17);
+      if (lookahead == 'c') ADVANCE(17);
       END_STATE();
     case 9:
-      if (lookahead == 'e') ADVANCE(8);
+      if (lookahead == 'c') ADVANCE(17);
+      if (lookahead == 'f') ADVANCE(18);
       END_STATE();
     case 10:
-      if (lookahead == 'e') ADVANCE(64);
+      if (lookahead == 'e') ADVANCE(9);
       END_STATE();
     case 11:
-      if (lookahead == 'e') ADVANCE(72);
+      if (lookahead == 'e') ADVANCE(65);
       END_STATE();
     case 12:
-      if (lookahead == 'e') ADVANCE(7);
+      if (lookahead == 'e') ADVANCE(73);
       END_STATE();
     case 13:
-      if (lookahead == 'e') ADVANCE(15);
+      if (lookahead == 'e') ADVANCE(8);
       END_STATE();
     case 14:
-      if (lookahead == 'f') ADVANCE(33);
+      if (lookahead == 'e') ADVANCE(16);
       END_STATE();
     case 15:
-      if (lookahead == 'f') ADVANCE(17);
+      if (lookahead == 'f') ADVANCE(34);
       END_STATE();
     case 16:
-      if (lookahead == 'i') ADVANCE(32);
+      if (lookahead == 'f') ADVANCE(18);
       END_STATE();
     case 17:
-      if (lookahead == 'i') ADVANCE(23);
+      if (lookahead == 'i') ADVANCE(33);
       END_STATE();
     case 18:
-      if (lookahead == 'i') ADVANCE(26);
+      if (lookahead == 'i') ADVANCE(24);
       END_STATE();
     case 19:
-      if (lookahead == 'm') ADVANCE(28);
+      if (lookahead == 'i') ADVANCE(27);
       END_STATE();
     case 20:
-      if (lookahead == 'm') ADVANCE(28);
-      if (lookahead == 'n') ADVANCE(29);
+      if (lookahead == 'm') ADVANCE(29);
       END_STATE();
     case 21:
-      if (lookahead == 'n') ADVANCE(75);
+      if (lookahead == 'm') ADVANCE(29);
+      if (lookahead == 'n') ADVANCE(30);
       END_STATE();
     case 22:
-      if (lookahead == 'n') ADVANCE(29);
+      if (lookahead == 'n') ADVANCE(76);
       END_STATE();
     case 23:
-      if (lookahead == 'n') ADVANCE(11);
+      if (lookahead == 'n') ADVANCE(30);
       END_STATE();
     case 24:
-      if (lookahead == 'o') ADVANCE(14);
+      if (lookahead == 'n') ADVANCE(12);
       END_STATE();
     case 25:
-      if (lookahead == 'o') ADVANCE(31);
+      if (lookahead == 'o') ADVANCE(15);
       END_STATE();
     case 26:
-      if (lookahead == 'o') ADVANCE(21);
+      if (lookahead == 'o') ADVANCE(32);
       END_STATE();
     case 27:
-      if (lookahead == 'p') ADVANCE(10);
+      if (lookahead == 'o') ADVANCE(22);
       END_STATE();
     case 28:
-      if (lookahead == 'p') ADVANCE(25);
+      if (lookahead == 'p') ADVANCE(11);
       END_STATE();
     case 29:
-      if (lookahead == 'p') ADVANCE(39);
+      if (lookahead == 'p') ADVANCE(26);
       END_STATE();
     case 30:
       if (lookahead == 'p') ADVANCE(40);
       END_STATE();
     case 31:
-      if (lookahead == 'r') ADVANCE(35);
+      if (lookahead == 'p') ADVANCE(41);
       END_STATE();
     case 32:
-      if (lookahead == 's') ADVANCE(18);
+      if (lookahead == 'r') ADVANCE(36);
       END_STATE();
     case 33:
-      if (lookahead == 't') ADVANCE(79);
+      if (lookahead == 's') ADVANCE(19);
       END_STATE();
     case 34:
-      if (lookahead == 't') ADVANCE(73);
+      if (lookahead == 't') ADVANCE(80);
       END_STATE();
     case 35:
-      if (lookahead == 't') ADVANCE(69);
-      END_STATE();
-    case 36:
       if (lookahead == 't') ADVANCE(74);
       END_STATE();
+    case 36:
+      if (lookahead == 't') ADVANCE(70);
+      END_STATE();
     case 37:
-      if (lookahead == 't') ADVANCE(30);
+      if (lookahead == 't') ADVANCE(75);
       END_STATE();
     case 38:
-      if (lookahead == 'u') ADVANCE(37);
+      if (lookahead == 't') ADVANCE(31);
       END_STATE();
     case 39:
-      if (lookahead == 'u') ADVANCE(34);
+      if (lookahead == 'u') ADVANCE(38);
       END_STATE();
     case 40:
-      if (lookahead == 'u') ADVANCE(36);
+      if (lookahead == 'u') ADVANCE(35);
       END_STATE();
     case 41:
-      if (lookahead == 'y') ADVANCE(27);
+      if (lookahead == 'u') ADVANCE(37);
       END_STATE();
     case 42:
-      if (lookahead == '|') ADVANCE(97);
+      if (lookahead == 'y') ADVANCE(28);
       END_STATE();
     case 43:
-      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(85);
+      if (lookahead == '|') ADVANCE(100);
       END_STATE();
     case 44:
-      if (eof) ADVANCE(46);
-      ADVANCE_MAP(
-        '!', 86,
-        '&', 4,
-        '(', 66,
-        ')', 68,
-        '*', 87,
-        '+', 89,
-        ',', 67,
-        '-', 77,
-        '.', 71,
-        '/', 88,
-        '0', 62,
-        ':', 5,
-        ';', 47,
-        '<', 94,
-        '=', 65,
-        '>', 95,
-        '@', 43,
-        'F', 54,
-        'T', 58,
-        '_', 80,
-        '|', 42,
-        '}', 84,
-        '\t', 51,
-        '\n', 51,
-        '\r', 51,
-        ' ', 51,
-      );
-      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(63);
-      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(61);
-      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(53);
+      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(88);
       END_STATE();
     case 45:
-      if (eof) ADVANCE(46);
+      if (eof) ADVANCE(47);
       ADVANCE_MAP(
-        '-', 76,
-        '.', 70,
-        ':', 5,
-        ';', 47,
-        'd', 13,
-        'i', 19,
-        's', 24,
-        't', 41,
-        '\t', 51,
-        ' ', 51,
-        '\n', 50,
-        '\r', 50,
+        '!', 89,
+        '&', 4,
+        '(', 67,
+        ')', 69,
+        '*', 90,
+        '+', 92,
+        ',', 68,
+        '-', 78,
+        '.', 72,
+        '/', 91,
+        '0', 63,
+        ':', 6,
+        ';', 48,
+        '<', 97,
+        '=', 66,
+        '>', 98,
+        '@', 44,
+        'F', 55,
+        'T', 59,
+        '_', 81,
+        '|', 43,
+        '}', 87,
+        '\t', 52,
+        '\n', 52,
+        '\r', 52,
+        ' ', 52,
       );
-      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(61);
+      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(64);
+      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(62);
+      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(54);
       END_STATE();
     case 46:
-      ACCEPT_TOKEN(ts_builtin_sym_end);
+      if (eof) ADVANCE(47);
+      ADVANCE_MAP(
+        '-', 77,
+        '.', 71,
+        ':', 6,
+        ';', 48,
+        'd', 14,
+        'i', 20,
+        's', 25,
+        't', 42,
+        '\t', 52,
+        ' ', 52,
+        '\n', 51,
+        '\r', 51,
+      );
+      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(62);
       END_STATE();
     case 47:
-      ACCEPT_TOKEN(anon_sym_SEMI);
+      ACCEPT_TOKEN(ts_builtin_sym_end);
       END_STATE();
     case 48:
       ACCEPT_TOKEN(anon_sym_SEMI);
-      if (lookahead == '\n') ADVANCE(49);
-      if (lookahead != 0) ADVANCE(2);
       END_STATE();
     case 49:
-      ACCEPT_TOKEN(sym_commentInner);
+      ACCEPT_TOKEN(anon_sym_SEMI);
+      if (lookahead == '\n') ADVANCE(50);
+      if (lookahead != 0) ADVANCE(2);
       END_STATE();
     case 50:
-      ACCEPT_TOKEN(sym_newline);
+      ACCEPT_TOKEN(sym_commentInner);
       END_STATE();
     case 51:
-      ACCEPT_TOKEN(sym__whitespace);
+      ACCEPT_TOKEN(sym_newline);
       END_STATE();
     case 52:
       ACCEPT_TOKEN(sym__whitespace);
-      if (lookahead == '\n') ADVANCE(49);
-      if (lookahead != 0) ADVANCE(2);
       END_STATE();
     case 53:
+      ACCEPT_TOKEN(sym__whitespace);
+      if (lookahead == '\n') ADVANCE(50);
+      if (lookahead != 0) ADVANCE(2);
+      END_STATE();
+    case 54:
       ACCEPT_TOKEN(sym_variable);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(53);
-      END_STATE();
-    case 54:
-      ACCEPT_TOKEN(sym_symbol);
-      if (lookahead == 'a') ADVANCE(57);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'Z') ||
-          ('b' <= lookahead && lookahead <= 'z')) ADVANCE(61);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(54);
       END_STATE();
     case 55:
       ACCEPT_TOKEN(sym_symbol);
-      if (lookahead == 'e') ADVANCE(81);
+      if (lookahead == 'a') ADVANCE(58);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(61);
+          ('b' <= lookahead && lookahead <= 'z')) ADVANCE(62);
       END_STATE();
     case 56:
       ACCEPT_TOKEN(sym_symbol);
       if (lookahead == 'e') ADVANCE(82);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(61);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(62);
       END_STATE();
     case 57:
       ACCEPT_TOKEN(sym_symbol);
-      if (lookahead == 'l') ADVANCE(59);
+      if (lookahead == 'e') ADVANCE(83);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(61);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(62);
       END_STATE();
     case 58:
       ACCEPT_TOKEN(sym_symbol);
-      if (lookahead == 'r') ADVANCE(60);
+      if (lookahead == 'l') ADVANCE(60);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(61);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(62);
       END_STATE();
     case 59:
       ACCEPT_TOKEN(sym_symbol);
-      if (lookahead == 's') ADVANCE(56);
+      if (lookahead == 'r') ADVANCE(61);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(61);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(62);
       END_STATE();
     case 60:
       ACCEPT_TOKEN(sym_symbol);
-      if (lookahead == 'u') ADVANCE(55);
+      if (lookahead == 's') ADVANCE(57);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(61);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(62);
       END_STATE();
     case 61:
       ACCEPT_TOKEN(sym_symbol);
+      if (lookahead == 'u') ADVANCE(56);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(61);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(62);
       END_STATE();
     case 62:
-      ACCEPT_TOKEN(anon_sym_0);
+      ACCEPT_TOKEN(sym_symbol);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(62);
       END_STATE();
     case 63:
-      ACCEPT_TOKEN(aux_sym_integer_token1);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(63);
+      ACCEPT_TOKEN(anon_sym_0);
       END_STATE();
     case 64:
-      ACCEPT_TOKEN(anon_sym_type);
+      ACCEPT_TOKEN(aux_sym_integer_token1);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(64);
       END_STATE();
     case 65:
-      ACCEPT_TOKEN(anon_sym_EQ);
+      ACCEPT_TOKEN(anon_sym_type);
       END_STATE();
     case 66:
-      ACCEPT_TOKEN(anon_sym_LPAREN);
+      ACCEPT_TOKEN(anon_sym_EQ);
       END_STATE();
     case 67:
-      ACCEPT_TOKEN(anon_sym_COMMA);
+      ACCEPT_TOKEN(anon_sym_LPAREN);
       END_STATE();
     case 68:
-      ACCEPT_TOKEN(anon_sym_RPAREN);
+      ACCEPT_TOKEN(anon_sym_COMMA);
       END_STATE();
     case 69:
-      ACCEPT_TOKEN(anon_sym_import);
+      ACCEPT_TOKEN(anon_sym_RPAREN);
       END_STATE();
     case 70:
-      ACCEPT_TOKEN(anon_sym_DOT);
+      ACCEPT_TOKEN(anon_sym_import);
       END_STATE();
     case 71:
       ACCEPT_TOKEN(anon_sym_DOT);
-      if (lookahead == '.') ADVANCE(90);
       END_STATE();
     case 72:
-      ACCEPT_TOKEN(anon_sym_define);
+      ACCEPT_TOKEN(anon_sym_DOT);
+      if (lookahead == '.') ADVANCE(93);
       END_STATE();
     case 73:
-      ACCEPT_TOKEN(anon_sym_input);
+      ACCEPT_TOKEN(anon_sym_define);
       END_STATE();
     case 74:
-      ACCEPT_TOKEN(anon_sym_output);
+      ACCEPT_TOKEN(anon_sym_input);
       END_STATE();
     case 75:
-      ACCEPT_TOKEN(anon_sym_decision);
+      ACCEPT_TOKEN(anon_sym_output);
       END_STATE();
     case 76:
-      ACCEPT_TOKEN(anon_sym_DASH);
+      ACCEPT_TOKEN(anon_sym_decision);
       END_STATE();
     case 77:
       ACCEPT_TOKEN(anon_sym_DASH);
-      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(63);
       END_STATE();
     case 78:
-      ACCEPT_TOKEN(anon_sym_COLON_DASH);
+      ACCEPT_TOKEN(anon_sym_DASH);
+      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(64);
       END_STATE();
     case 79:
-      ACCEPT_TOKEN(anon_sym_soft);
+      ACCEPT_TOKEN(anon_sym_COLON_DASH);
       END_STATE();
     case 80:
-      ACCEPT_TOKEN(anon_sym__);
+      ACCEPT_TOKEN(anon_sym_soft);
       END_STATE();
     case 81:
+      ACCEPT_TOKEN(anon_sym__);
+      END_STATE();
+    case 82:
       ACCEPT_TOKEN(anon_sym_True);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(61);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(62);
       END_STATE();
-    case 82:
+    case 83:
       ACCEPT_TOKEN(anon_sym_False);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(61);
-      END_STATE();
-    case 83:
-      ACCEPT_TOKEN(anon_sym_LBRACE);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(62);
       END_STATE();
     case 84:
-      ACCEPT_TOKEN(anon_sym_RBRACE);
+      ACCEPT_TOKEN(anon_sym_COLON);
       END_STATE();
     case 85:
-      ACCEPT_TOKEN(sym_aggregate_op);
-      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(85);
+      ACCEPT_TOKEN(anon_sym_COLON);
+      if (lookahead == '-') ADVANCE(79);
       END_STATE();
     case 86:
-      ACCEPT_TOKEN(anon_sym_BANG);
-      if (lookahead == '=') ADVANCE(91);
+      ACCEPT_TOKEN(anon_sym_LBRACE);
       END_STATE();
     case 87:
-      ACCEPT_TOKEN(anon_sym_STAR);
+      ACCEPT_TOKEN(anon_sym_RBRACE);
       END_STATE();
     case 88:
-      ACCEPT_TOKEN(anon_sym_SLASH);
+      ACCEPT_TOKEN(sym_aggregate_op);
+      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(88);
       END_STATE();
     case 89:
-      ACCEPT_TOKEN(anon_sym_PLUS);
+      ACCEPT_TOKEN(anon_sym_BANG);
+      if (lookahead == '=') ADVANCE(94);
       END_STATE();
     case 90:
-      ACCEPT_TOKEN(anon_sym_DOT_DOT);
+      ACCEPT_TOKEN(anon_sym_STAR);
       END_STATE();
     case 91:
-      ACCEPT_TOKEN(anon_sym_BANG_EQ);
+      ACCEPT_TOKEN(anon_sym_SLASH);
       END_STATE();
     case 92:
-      ACCEPT_TOKEN(anon_sym_GT_EQ);
+      ACCEPT_TOKEN(anon_sym_PLUS);
       END_STATE();
     case 93:
-      ACCEPT_TOKEN(anon_sym_LT_EQ);
+      ACCEPT_TOKEN(anon_sym_DOT_DOT);
       END_STATE();
     case 94:
-      ACCEPT_TOKEN(anon_sym_LT);
-      if (lookahead == '=') ADVANCE(93);
+      ACCEPT_TOKEN(anon_sym_BANG_EQ);
       END_STATE();
     case 95:
-      ACCEPT_TOKEN(anon_sym_GT);
-      if (lookahead == '=') ADVANCE(92);
+      ACCEPT_TOKEN(anon_sym_GT_EQ);
       END_STATE();
     case 96:
-      ACCEPT_TOKEN(anon_sym_AMP_AMP);
+      ACCEPT_TOKEN(anon_sym_LT_EQ);
       END_STATE();
     case 97:
+      ACCEPT_TOKEN(anon_sym_LT);
+      if (lookahead == '=') ADVANCE(96);
+      END_STATE();
+    case 98:
+      ACCEPT_TOKEN(anon_sym_GT);
+      if (lookahead == '=') ADVANCE(95);
+      END_STATE();
+    case 99:
+      ACCEPT_TOKEN(anon_sym_AMP_AMP);
+      END_STATE();
+    case 100:
       ACCEPT_TOKEN(anon_sym_PIPE_PIPE);
       END_STATE();
     default:
@@ -1412,28 +1491,28 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
 
 static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [0] = {.lex_state = 0},
-  [1] = {.lex_state = 45},
-  [2] = {.lex_state = 44},
-  [3] = {.lex_state = 44},
-  [4] = {.lex_state = 44},
-  [5] = {.lex_state = 44},
-  [6] = {.lex_state = 44},
-  [7] = {.lex_state = 44},
-  [8] = {.lex_state = 44},
-  [9] = {.lex_state = 44},
-  [10] = {.lex_state = 44},
-  [11] = {.lex_state = 44},
-  [12] = {.lex_state = 44},
-  [13] = {.lex_state = 44},
-  [14] = {.lex_state = 44},
-  [15] = {.lex_state = 44},
-  [16] = {.lex_state = 44},
-  [17] = {.lex_state = 44},
-  [18] = {.lex_state = 44},
-  [19] = {.lex_state = 44},
-  [20] = {.lex_state = 44},
-  [21] = {.lex_state = 3},
-  [22] = {.lex_state = 3},
+  [1] = {.lex_state = 46},
+  [2] = {.lex_state = 45},
+  [3] = {.lex_state = 45},
+  [4] = {.lex_state = 45},
+  [5] = {.lex_state = 45},
+  [6] = {.lex_state = 45},
+  [7] = {.lex_state = 45},
+  [8] = {.lex_state = 45},
+  [9] = {.lex_state = 45},
+  [10] = {.lex_state = 45},
+  [11] = {.lex_state = 45},
+  [12] = {.lex_state = 45},
+  [13] = {.lex_state = 45},
+  [14] = {.lex_state = 45},
+  [15] = {.lex_state = 45},
+  [16] = {.lex_state = 45},
+  [17] = {.lex_state = 45},
+  [18] = {.lex_state = 45},
+  [19] = {.lex_state = 45},
+  [20] = {.lex_state = 45},
+  [21] = {.lex_state = 45},
+  [22] = {.lex_state = 45},
   [23] = {.lex_state = 3},
   [24] = {.lex_state = 3},
   [25] = {.lex_state = 3},
@@ -1462,103 +1541,118 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [48] = {.lex_state = 3},
   [49] = {.lex_state = 3},
   [50] = {.lex_state = 3},
-  [51] = {.lex_state = 45},
-  [52] = {.lex_state = 45},
-  [53] = {.lex_state = 44},
-  [54] = {.lex_state = 45},
-  [55] = {.lex_state = 45},
-  [56] = {.lex_state = 45},
-  [57] = {.lex_state = 45},
-  [58] = {.lex_state = 45},
+  [51] = {.lex_state = 3},
+  [52] = {.lex_state = 3},
+  [53] = {.lex_state = 3},
+  [54] = {.lex_state = 46},
+  [55] = {.lex_state = 46},
+  [56] = {.lex_state = 3},
+  [57] = {.lex_state = 3},
+  [58] = {.lex_state = 3},
   [59] = {.lex_state = 45},
-  [60] = {.lex_state = 45},
-  [61] = {.lex_state = 45},
-  [62] = {.lex_state = 45},
-  [63] = {.lex_state = 45},
-  [64] = {.lex_state = 45},
-  [65] = {.lex_state = 45},
-  [66] = {.lex_state = 45},
-  [67] = {.lex_state = 45},
-  [68] = {.lex_state = 45},
-  [69] = {.lex_state = 45},
-  [70] = {.lex_state = 45},
-  [71] = {.lex_state = 45},
-  [72] = {.lex_state = 45},
-  [73] = {.lex_state = 45},
-  [74] = {.lex_state = 45},
-  [75] = {.lex_state = 45},
-  [76] = {.lex_state = 45},
-  [77] = {.lex_state = 45},
-  [78] = {.lex_state = 45},
-  [79] = {.lex_state = 44},
-  [80] = {.lex_state = 44},
-  [81] = {.lex_state = 3},
-  [82] = {.lex_state = 3},
-  [83] = {.lex_state = 3},
-  [84] = {.lex_state = 44},
+  [60] = {.lex_state = 46},
+  [61] = {.lex_state = 46},
+  [62] = {.lex_state = 46},
+  [63] = {.lex_state = 46},
+  [64] = {.lex_state = 46},
+  [65] = {.lex_state = 46},
+  [66] = {.lex_state = 46},
+  [67] = {.lex_state = 46},
+  [68] = {.lex_state = 46},
+  [69] = {.lex_state = 46},
+  [70] = {.lex_state = 46},
+  [71] = {.lex_state = 46},
+  [72] = {.lex_state = 46},
+  [73] = {.lex_state = 46},
+  [74] = {.lex_state = 46},
+  [75] = {.lex_state = 46},
+  [76] = {.lex_state = 46},
+  [77] = {.lex_state = 46},
+  [78] = {.lex_state = 46},
+  [79] = {.lex_state = 46},
+  [80] = {.lex_state = 46},
+  [81] = {.lex_state = 46},
+  [82] = {.lex_state = 46},
+  [83] = {.lex_state = 46},
+  [84] = {.lex_state = 46},
   [85] = {.lex_state = 3},
-  [86] = {.lex_state = 3},
+  [86] = {.lex_state = 45},
   [87] = {.lex_state = 3},
-  [88] = {.lex_state = 3},
-  [89] = {.lex_state = 3},
+  [88] = {.lex_state = 45},
+  [89] = {.lex_state = 5},
   [90] = {.lex_state = 3},
-  [91] = {.lex_state = 3},
+  [91] = {.lex_state = 45},
   [92] = {.lex_state = 3},
   [93] = {.lex_state = 3},
-  [94] = {.lex_state = 44},
-  [95] = {.lex_state = 3},
-  [96] = {.lex_state = 44},
-  [97] = {.lex_state = 44},
+  [94] = {.lex_state = 3},
+  [95] = {.lex_state = 45},
+  [96] = {.lex_state = 3},
+  [97] = {.lex_state = 3},
   [98] = {.lex_state = 3},
-  [99] = {.lex_state = 3},
-  [100] = {.lex_state = 44},
-  [101] = {.lex_state = 44},
-  [102] = {.lex_state = 44},
-  [103] = {.lex_state = 3},
-  [104] = {.lex_state = 44},
-  [105] = {.lex_state = 44},
-  [106] = {.lex_state = 44},
-  [107] = {.lex_state = 44},
+  [99] = {.lex_state = 45},
+  [100] = {.lex_state = 3},
+  [101] = {.lex_state = 3},
+  [102] = {.lex_state = 5},
+  [103] = {.lex_state = 45},
+  [104] = {.lex_state = 5},
+  [105] = {.lex_state = 45},
+  [106] = {.lex_state = 3},
+  [107] = {.lex_state = 45},
   [108] = {.lex_state = 3},
-  [109] = {.lex_state = 44},
-  [110] = {.lex_state = 3},
-  [111] = {.lex_state = 44},
+  [109] = {.lex_state = 5},
+  [110] = {.lex_state = 45},
+  [111] = {.lex_state = 45},
   [112] = {.lex_state = 3},
-  [113] = {.lex_state = 44},
-  [114] = {.lex_state = 44},
+  [113] = {.lex_state = 45},
+  [114] = {.lex_state = 3},
   [115] = {.lex_state = 3},
-  [116] = {.lex_state = 44},
-  [117] = {.lex_state = 44},
-  [118] = {.lex_state = 44},
-  [119] = {.lex_state = 44},
-  [120] = {.lex_state = 44},
-  [121] = {.lex_state = 44},
-  [122] = {.lex_state = 3},
-  [123] = {.lex_state = 44},
+  [116] = {.lex_state = 45},
+  [117] = {.lex_state = 45},
+  [118] = {.lex_state = 3},
+  [119] = {.lex_state = 3},
+  [120] = {.lex_state = 45},
+  [121] = {.lex_state = 3},
+  [122] = {.lex_state = 5},
+  [123] = {.lex_state = 45},
   [124] = {.lex_state = 3},
-  [125] = {.lex_state = 3},
+  [125] = {.lex_state = 45},
   [126] = {.lex_state = 3},
-  [127] = {.lex_state = 44},
-  [128] = {.lex_state = 44},
-  [129] = {.lex_state = 3},
-  [130] = {.lex_state = 3},
-  [131] = {.lex_state = 44},
-  [132] = {.lex_state = 44},
-  [133] = {.lex_state = 44},
-  [134] = {.lex_state = 44},
+  [127] = {.lex_state = 45},
+  [128] = {.lex_state = 45},
+  [129] = {.lex_state = 45},
+  [130] = {.lex_state = 45},
+  [131] = {.lex_state = 45},
+  [132] = {.lex_state = 3},
+  [133] = {.lex_state = 45},
+  [134] = {.lex_state = 45},
   [135] = {.lex_state = 3},
-  [136] = {.lex_state = 3},
-  [137] = {.lex_state = 44},
-  [138] = {.lex_state = 44},
-  [139] = {.lex_state = 1},
+  [136] = {.lex_state = 45},
+  [137] = {.lex_state = 3},
+  [138] = {.lex_state = 3},
+  [139] = {.lex_state = 3},
   [140] = {.lex_state = 3},
-  [141] = {.lex_state = 44},
-  [142] = {.lex_state = 1},
-  [143] = {.lex_state = 3},
-  [144] = {.lex_state = 3},
-  [145] = {.lex_state = 3},
-  [146] = {.lex_state = 44},
-  [147] = {(TSStateId)(-1),},
+  [141] = {.lex_state = 45},
+  [142] = {.lex_state = 45},
+  [143] = {.lex_state = 45},
+  [144] = {.lex_state = 45},
+  [145] = {.lex_state = 45},
+  [146] = {.lex_state = 45},
+  [147] = {.lex_state = 45},
+  [148] = {.lex_state = 3},
+  [149] = {.lex_state = 45},
+  [150] = {.lex_state = 45},
+  [151] = {.lex_state = 45},
+  [152] = {.lex_state = 3},
+  [153] = {.lex_state = 3},
+  [154] = {.lex_state = 45},
+  [155] = {.lex_state = 45},
+  [156] = {.lex_state = 1},
+  [157] = {.lex_state = 3},
+  [158] = {.lex_state = 1},
+  [159] = {.lex_state = 3},
+  [160] = {.lex_state = 3},
+  [161] = {.lex_state = 45},
+  [162] = {(TSStateId)(-1),},
 };
 
 static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
@@ -1588,6 +1682,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym__] = ACTIONS(1),
     [anon_sym_True] = ACTIONS(1),
     [anon_sym_False] = ACTIONS(1),
+    [anon_sym_COLON] = ACTIONS(1),
     [anon_sym_LBRACE] = ACTIONS(1),
     [anon_sym_RBRACE] = ACTIONS(1),
     [sym_aggregate_op] = ACTIONS(1),
@@ -1605,14 +1700,14 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_PIPE_PIPE] = ACTIONS(1),
   },
   [STATE(1)] = {
-    [sym_file] = STATE(141),
+    [sym_file] = STATE(149),
     [sym_comment] = STATE(1),
-    [sym_type_alias] = STATE(51),
-    [sym_import] = STATE(51),
-    [sym_definition] = STATE(51),
-    [sym_rule] = STATE(51),
-    [sym_assumption] = STATE(51),
-    [aux_sym_file_repeat1] = STATE(51),
+    [sym_type_alias] = STATE(54),
+    [sym_import] = STATE(54),
+    [sym_definition] = STATE(54),
+    [sym_rule] = STATE(54),
+    [sym_assumption] = STATE(54),
+    [aux_sym_file_repeat1] = STATE(54),
     [ts_builtin_sym_end] = ACTIONS(7),
     [anon_sym_SEMI] = ACTIONS(9),
     [sym_newline] = ACTIONS(11),
@@ -1627,15 +1722,15 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
   },
   [STATE(2)] = {
     [sym_comment] = STATE(2),
-    [sym_integer] = STATE(43),
-    [sym_expr] = STATE(29),
-    [sym_atom] = STATE(22),
-    [sym_tuple] = STATE(23),
-    [sym_value] = STATE(24),
-    [sym_aggregate] = STATE(25),
-    [sym_unary_expr] = STATE(26),
-    [sym_unary_op] = STATE(10),
-    [sym_binary_expr] = STATE(27),
+    [sym_integer] = STATE(32),
+    [sym_expr] = STATE(25),
+    [sym_atom] = STATE(33),
+    [sym_tuple] = STATE(35),
+    [sym_value] = STATE(41),
+    [sym_aggregate] = STATE(44),
+    [sym_unary_expr] = STATE(46),
+    [sym_unary_op] = STATE(12),
+    [sym_binary_expr] = STATE(42),
     [anon_sym_SEMI] = ACTIONS(3),
     [sym__whitespace] = ACTIONS(27),
     [sym_variable] = ACTIONS(29),
@@ -1695,25 +1790,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG,
     STATE(3), 1,
       sym_comment,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
-    STATE(45), 1,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    STATE(51), 1,
       sym_expr,
-    STATE(134), 1,
+    STATE(151), 1,
       sym_rule_body,
     ACTIONS(33), 2,
       anon_sym_0,
@@ -1743,25 +1838,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG,
     STATE(4), 1,
       sym_comment,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
-    STATE(45), 1,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    STATE(51), 1,
       sym_expr,
-    STATE(127), 1,
+    STATE(136), 1,
       sym_rule_body,
     ACTIONS(33), 2,
       anon_sym_0,
@@ -1791,25 +1886,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG,
     STATE(5), 1,
       sym_comment,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
-    STATE(45), 1,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    STATE(51), 1,
       sym_expr,
-    STATE(133), 1,
+    STATE(142), 1,
       sym_rule_body,
     ACTIONS(33), 2,
       anon_sym_0,
@@ -1839,25 +1934,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG,
     STATE(6), 1,
       sym_comment,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
-    STATE(45), 1,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    STATE(51), 1,
       sym_expr,
-    STATE(138), 1,
+    STATE(154), 1,
       sym_rule_body,
     ACTIONS(33), 2,
       anon_sym_0,
@@ -1889,23 +1984,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_RPAREN,
     STATE(7), 1,
       sym_comment,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
-    STATE(50), 1,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    STATE(56), 1,
       sym_expr,
     ACTIONS(33), 2,
       anon_sym_0,
@@ -1935,30 +2030,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG,
     STATE(8), 1,
       sym_comment,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
-    STATE(45), 1,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    STATE(51), 1,
       sym_expr,
-    STATE(131), 1,
+    STATE(150), 1,
       sym_rule_body,
     ACTIONS(33), 2,
       anon_sym_0,
       aux_sym_integer_token1,
-  [426] = 22,
+  [426] = 23,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
@@ -1983,73 +2078,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG,
     STATE(9), 1,
       sym_comment,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(43), 1,
-      sym_integer,
-    STATE(48), 1,
-      sym_expr,
-    ACTIONS(33), 2,
-      anon_sym_0,
-      aux_sym_integer_token1,
-  [494] = 21,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(29), 1,
-      sym_variable,
-    ACTIONS(31), 1,
-      sym_symbol,
-    ACTIONS(37), 1,
-      anon_sym_LPAREN,
-    ACTIONS(41), 1,
-      anon_sym_DASH,
-    ACTIONS(43), 1,
-      anon_sym__,
-    ACTIONS(45), 1,
-      anon_sym_True,
-    ACTIONS(47), 1,
-      anon_sym_False,
-    ACTIONS(49), 1,
-      sym_aggregate_op,
-    ACTIONS(51), 1,
-      anon_sym_BANG,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
     STATE(32), 1,
-      sym_expr,
-    STATE(43), 1,
       sym_integer,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    STATE(51), 1,
+      sym_expr,
+    STATE(143), 1,
+      sym_rule_body,
     ACTIONS(33), 2,
       anon_sym_0,
       aux_sym_integer_token1,
-    STATE(10), 2,
-      sym_comment,
-      sym_unary_op,
-  [560] = 22,
+  [497] = 23,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
@@ -2073,75 +2125,77 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(51), 1,
       anon_sym_BANG,
     STATE(10), 1,
+      sym_comment,
+    STATE(12), 1,
       sym_unary_op,
+    STATE(32), 1,
+      sym_integer,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    STATE(51), 1,
+      sym_expr,
+    STATE(145), 1,
+      sym_rule_body,
+    ACTIONS(33), 2,
+      anon_sym_0,
+      aux_sym_integer_token1,
+  [568] = 22,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(29), 1,
+      sym_variable,
+    ACTIONS(31), 1,
+      sym_symbol,
+    ACTIONS(37), 1,
+      anon_sym_LPAREN,
+    ACTIONS(41), 1,
+      anon_sym_DASH,
+    ACTIONS(43), 1,
+      anon_sym__,
+    ACTIONS(45), 1,
+      anon_sym_True,
+    ACTIONS(47), 1,
+      anon_sym_False,
+    ACTIONS(49), 1,
+      sym_aggregate_op,
+    ACTIONS(51), 1,
+      anon_sym_BANG,
     STATE(11), 1,
       sym_comment,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(43), 1,
-      sym_integer,
-    STATE(49), 1,
-      sym_expr,
-    ACTIONS(33), 2,
-      anon_sym_0,
-      aux_sym_integer_token1,
-  [628] = 22,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(29), 1,
-      sym_variable,
-    ACTIONS(31), 1,
-      sym_symbol,
-    ACTIONS(37), 1,
-      anon_sym_LPAREN,
-    ACTIONS(41), 1,
-      anon_sym_DASH,
-    ACTIONS(43), 1,
-      anon_sym__,
-    ACTIONS(45), 1,
-      anon_sym_True,
-    ACTIONS(47), 1,
-      anon_sym_False,
-    ACTIONS(49), 1,
-      sym_aggregate_op,
-    ACTIONS(51), 1,
-      anon_sym_BANG,
-    STATE(10), 1,
-      sym_unary_op,
     STATE(12), 1,
-      sym_comment,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(29), 1,
-      sym_expr,
-    STATE(43), 1,
+      sym_unary_op,
+    STATE(32), 1,
       sym_integer,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    STATE(57), 1,
+      sym_expr,
     ACTIONS(33), 2,
       anon_sym_0,
       aux_sym_integer_token1,
-  [696] = 22,
+  [636] = 21,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
@@ -2164,30 +2218,75 @@ static const uint16_t ts_small_parse_table[] = {
       sym_aggregate_op,
     ACTIONS(51), 1,
       anon_sym_BANG,
-    STATE(10), 1,
+    STATE(26), 1,
+      sym_expr,
+    STATE(32), 1,
+      sym_integer,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    ACTIONS(33), 2,
+      anon_sym_0,
+      aux_sym_integer_token1,
+    STATE(12), 2,
+      sym_comment,
+      sym_unary_op,
+  [702] = 22,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(29), 1,
+      sym_variable,
+    ACTIONS(31), 1,
+      sym_symbol,
+    ACTIONS(37), 1,
+      anon_sym_LPAREN,
+    ACTIONS(41), 1,
+      anon_sym_DASH,
+    ACTIONS(43), 1,
+      anon_sym__,
+    ACTIONS(45), 1,
+      anon_sym_True,
+    ACTIONS(47), 1,
+      anon_sym_False,
+    ACTIONS(49), 1,
+      sym_aggregate_op,
+    ACTIONS(51), 1,
+      anon_sym_BANG,
+    STATE(12), 1,
       sym_unary_op,
     STATE(13), 1,
       sym_comment,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
     STATE(46), 1,
+      sym_unary_expr,
+    STATE(58), 1,
       sym_expr,
     ACTIONS(33), 2,
       anon_sym_0,
       aux_sym_integer_token1,
-  [764] = 22,
+  [770] = 22,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
@@ -2210,30 +2309,30 @@ static const uint16_t ts_small_parse_table[] = {
       sym_aggregate_op,
     ACTIONS(51), 1,
       anon_sym_BANG,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
     STATE(14), 1,
       sym_comment,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
     STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(34), 1,
       sym_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
     ACTIONS(33), 2,
       anon_sym_0,
       aux_sym_integer_token1,
-  [832] = 22,
+  [838] = 22,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
@@ -2256,30 +2355,30 @@ static const uint16_t ts_small_parse_table[] = {
       sym_aggregate_op,
     ACTIONS(51), 1,
       anon_sym_BANG,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
     STATE(15), 1,
       sym_comment,
-    STATE(21), 1,
-      sym_expr,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    STATE(52), 1,
+      sym_expr,
     ACTIONS(33), 2,
       anon_sym_0,
       aux_sym_integer_token1,
-  [900] = 22,
+  [906] = 22,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
@@ -2302,30 +2401,30 @@ static const uint16_t ts_small_parse_table[] = {
       sym_aggregate_op,
     ACTIONS(51), 1,
       anon_sym_BANG,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
     STATE(16), 1,
       sym_comment,
-    STATE(22), 1,
+    STATE(32), 1,
+      sym_integer,
+    STATE(33), 1,
       sym_atom,
-    STATE(23), 1,
+    STATE(35), 1,
       sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
     STATE(36), 1,
       sym_expr,
-    STATE(43), 1,
-      sym_integer,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
     ACTIONS(33), 2,
       anon_sym_0,
       aux_sym_integer_token1,
-  [968] = 22,
+  [974] = 22,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
@@ -2348,30 +2447,30 @@ static const uint16_t ts_small_parse_table[] = {
       sym_aggregate_op,
     ACTIONS(51), 1,
       anon_sym_BANG,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
     STATE(17), 1,
       sym_comment,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
-    STATE(47), 1,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(37), 1,
       sym_expr,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
     ACTIONS(33), 2,
       anon_sym_0,
       aux_sym_integer_token1,
-  [1036] = 22,
+  [1042] = 22,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
@@ -2394,30 +2493,30 @@ static const uint16_t ts_small_parse_table[] = {
       sym_aggregate_op,
     ACTIONS(51), 1,
       anon_sym_BANG,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
     STATE(18), 1,
       sym_comment,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(35), 1,
-      sym_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(38), 1,
+      sym_expr,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
     ACTIONS(33), 2,
       anon_sym_0,
       aux_sym_integer_token1,
-  [1104] = 22,
+  [1110] = 22,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
@@ -2440,30 +2539,30 @@ static const uint16_t ts_small_parse_table[] = {
       sym_aggregate_op,
     ACTIONS(51), 1,
       anon_sym_BANG,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
     STATE(19), 1,
       sym_comment,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(38), 1,
-      sym_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(40), 1,
+      sym_expr,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
     ACTIONS(33), 2,
       anon_sym_0,
       aux_sym_integer_token1,
-  [1172] = 22,
+  [1178] = 22,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
@@ -2486,450 +2585,128 @@ static const uint16_t ts_small_parse_table[] = {
       sym_aggregate_op,
     ACTIONS(51), 1,
       anon_sym_BANG,
-    STATE(10), 1,
+    STATE(12), 1,
       sym_unary_op,
     STATE(20), 1,
       sym_comment,
-    STATE(22), 1,
-      sym_atom,
-    STATE(23), 1,
-      sym_tuple,
-    STATE(24), 1,
-      sym_value,
-    STATE(25), 1,
-      sym_aggregate,
-    STATE(26), 1,
-      sym_unary_expr,
-    STATE(27), 1,
-      sym_binary_expr,
-    STATE(43), 1,
+    STATE(32), 1,
       sym_integer,
-    STATE(50), 1,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(39), 1,
+      sym_expr,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    ACTIONS(33), 2,
+      anon_sym_0,
+      aux_sym_integer_token1,
+  [1246] = 22,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(29), 1,
+      sym_variable,
+    ACTIONS(31), 1,
+      sym_symbol,
+    ACTIONS(37), 1,
+      anon_sym_LPAREN,
+    ACTIONS(41), 1,
+      anon_sym_DASH,
+    ACTIONS(43), 1,
+      anon_sym__,
+    ACTIONS(45), 1,
+      anon_sym_True,
+    ACTIONS(47), 1,
+      anon_sym_False,
+    ACTIONS(49), 1,
+      sym_aggregate_op,
+    ACTIONS(51), 1,
+      anon_sym_BANG,
+    STATE(12), 1,
+      sym_unary_op,
+    STATE(21), 1,
+      sym_comment,
+    STATE(32), 1,
+      sym_integer,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    STATE(56), 1,
       sym_expr,
     ACTIONS(33), 2,
       anon_sym_0,
       aux_sym_integer_token1,
-  [1240] = 7,
+  [1314] = 22,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    STATE(21), 1,
-      sym_comment,
-    ACTIONS(59), 2,
+    ACTIONS(29), 1,
+      sym_variable,
+    ACTIONS(31), 1,
+      sym_symbol,
+    ACTIONS(37), 1,
+      anon_sym_LPAREN,
+    ACTIONS(41), 1,
       anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(61), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(57), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(55), 11,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1276] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
+    ACTIONS(43), 1,
+      anon_sym__,
+    ACTIONS(45), 1,
+      anon_sym_True,
+    ACTIONS(47), 1,
+      anon_sym_False,
+    ACTIONS(49), 1,
+      sym_aggregate_op,
+    ACTIONS(51), 1,
+      anon_sym_BANG,
+    STATE(12), 1,
+      sym_unary_op,
     STATE(22), 1,
       sym_comment,
-    ACTIONS(65), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(63), 15,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_PLUS,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1308] = 5,
+    STATE(32), 1,
+      sym_integer,
+    STATE(33), 1,
+      sym_atom,
+    STATE(35), 1,
+      sym_tuple,
+    STATE(41), 1,
+      sym_value,
+    STATE(42), 1,
+      sym_binary_expr,
+    STATE(44), 1,
+      sym_aggregate,
+    STATE(46), 1,
+      sym_unary_expr,
+    STATE(53), 1,
+      sym_expr,
+    ACTIONS(33), 2,
+      anon_sym_0,
+      aux_sym_integer_token1,
+  [1382] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
     STATE(23), 1,
       sym_comment,
-    ACTIONS(69), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(67), 15,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_PLUS,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1340] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    STATE(24), 1,
-      sym_comment,
-    ACTIONS(73), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(71), 15,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_PLUS,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1372] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    STATE(25), 1,
-      sym_comment,
-    ACTIONS(77), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(75), 15,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_PLUS,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1404] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    STATE(26), 1,
-      sym_comment,
-    ACTIONS(81), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(79), 15,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_PLUS,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1436] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    STATE(27), 1,
-      sym_comment,
-    ACTIONS(85), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(83), 15,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_PLUS,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1468] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    STATE(28), 1,
-      sym_comment,
-    ACTIONS(89), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(87), 15,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_PLUS,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1500] = 8,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(95), 1,
-      anon_sym_DOT_DOT,
-    STATE(29), 1,
-      sym_comment,
-    ACTIONS(59), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(61), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(93), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(91), 10,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1538] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    STATE(30), 1,
-      sym_comment,
-    ACTIONS(99), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(97), 15,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_PLUS,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1570] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    STATE(31), 1,
-      sym_comment,
-    ACTIONS(103), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(101), 15,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_PLUS,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1602] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    STATE(32), 1,
-      sym_comment,
-    ACTIONS(107), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(105), 15,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_PLUS,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1634] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    STATE(33), 1,
-      sym_comment,
-    ACTIONS(111), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(109), 15,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-      anon_sym_PLUS,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1666] = 8,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(95), 1,
-      anon_sym_DOT_DOT,
-    STATE(34), 1,
-      sym_comment,
-    ACTIONS(59), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(61), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(57), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(55), 10,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1704] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    STATE(35), 1,
-      sym_comment,
-    ACTIONS(61), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(57), 3,
-      anon_sym_DOT,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(55), 13,
-      anon_sym_EQ,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_RBRACE,
-      anon_sym_PLUS,
-      anon_sym_DOT_DOT,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-  [1738] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    STATE(36), 1,
-      sym_comment,
     ACTIONS(57), 3,
       anon_sym_DOT,
       anon_sym_LT,
@@ -2950,13 +2727,398 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_EQ,
       anon_sym_AMP_AMP,
       anon_sym_PIPE_PIPE,
-  [1770] = 5,
+  [1414] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(24), 1,
+      sym_comment,
+    ACTIONS(61), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(59), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1446] = 8,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(71), 1,
+      anon_sym_DOT_DOT,
+    STATE(25), 1,
+      sym_comment,
+    ACTIONS(67), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(69), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(65), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(63), 10,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1484] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(26), 1,
+      sym_comment,
+    ACTIONS(75), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(73), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1516] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(27), 1,
+      sym_comment,
+    ACTIONS(79), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(77), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1548] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(28), 1,
+      sym_comment,
+    ACTIONS(83), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(81), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1580] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(29), 1,
+      sym_comment,
+    ACTIONS(87), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(85), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1612] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(30), 1,
+      sym_comment,
+    ACTIONS(91), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(89), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1644] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(31), 1,
+      sym_comment,
+    ACTIONS(95), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(93), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1676] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(32), 1,
+      sym_comment,
+    ACTIONS(99), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(97), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1708] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(33), 1,
+      sym_comment,
+    ACTIONS(103), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(101), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1740] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(34), 1,
+      sym_comment,
+    ACTIONS(107), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(105), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1772] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(35), 1,
+      sym_comment,
+    ACTIONS(111), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(109), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1804] = 8,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(71), 1,
+      anon_sym_DOT_DOT,
+    STATE(36), 1,
+      sym_comment,
+    ACTIONS(67), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(69), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(115), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(113), 10,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1842] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
     STATE(37), 1,
       sym_comment,
+    ACTIONS(69), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(115), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(113), 13,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1876] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(38), 1,
+      sym_comment,
     ACTIONS(115), 3,
       anon_sym_DOT,
       anon_sym_LT,
@@ -2977,21 +3139,50 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_EQ,
       anon_sym_AMP_AMP,
       anon_sym_PIPE_PIPE,
-  [1802] = 10,
+  [1908] = 7,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(57), 1,
-      anon_sym_DOT,
-    ACTIONS(95), 1,
-      anon_sym_DOT_DOT,
-    STATE(38), 1,
+    STATE(39), 1,
       sym_comment,
-    ACTIONS(59), 2,
+    ACTIONS(67), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    ACTIONS(61), 2,
+    ACTIONS(69), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(115), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(113), 11,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [1944] = 10,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(71), 1,
+      anon_sym_DOT_DOT,
+    ACTIONS(115), 1,
+      anon_sym_DOT,
+    STATE(40), 1,
+      sym_comment,
+    ACTIONS(67), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(69), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
     ACTIONS(119), 2,
@@ -3002,19 +3193,19 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_EQ,
-    ACTIONS(55), 6,
+    ACTIONS(113), 6,
       anon_sym_COMMA,
       anon_sym_RPAREN,
       anon_sym_COLON_DASH,
       anon_sym_RBRACE,
       anon_sym_AMP_AMP,
       anon_sym_PIPE_PIPE,
-  [1844] = 5,
+  [1986] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    STATE(39), 1,
+    STATE(41), 1,
       sym_comment,
     ACTIONS(123), 3,
       anon_sym_DOT,
@@ -3036,12 +3227,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_EQ,
       anon_sym_AMP_AMP,
       anon_sym_PIPE_PIPE,
-  [1876] = 5,
+  [2018] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    STATE(40), 1,
+    STATE(42), 1,
       sym_comment,
     ACTIONS(127), 3,
       anon_sym_DOT,
@@ -3063,12 +3254,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_EQ,
       anon_sym_AMP_AMP,
       anon_sym_PIPE_PIPE,
-  [1908] = 5,
+  [2050] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    STATE(41), 1,
+    STATE(43), 1,
       sym_comment,
     ACTIONS(131), 3,
       anon_sym_DOT,
@@ -3090,12 +3281,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_EQ,
       anon_sym_AMP_AMP,
       anon_sym_PIPE_PIPE,
-  [1940] = 5,
+  [2082] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    STATE(42), 1,
+    STATE(44), 1,
       sym_comment,
     ACTIONS(135), 3,
       anon_sym_DOT,
@@ -3117,12 +3308,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_EQ,
       anon_sym_AMP_AMP,
       anon_sym_PIPE_PIPE,
-  [1972] = 5,
+  [2114] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    STATE(43), 1,
+    STATE(45), 1,
       sym_comment,
     ACTIONS(139), 3,
       anon_sym_DOT,
@@ -3144,12 +3335,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_EQ,
       anon_sym_AMP_AMP,
       anon_sym_PIPE_PIPE,
-  [2004] = 5,
+  [2146] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    STATE(44), 1,
+    STATE(46), 1,
       sym_comment,
     ACTIONS(143), 3,
       anon_sym_DOT,
@@ -3171,96 +3362,204 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT_EQ,
       anon_sym_AMP_AMP,
       anon_sym_PIPE_PIPE,
-  [2036] = 13,
+  [2178] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(95), 1,
-      anon_sym_DOT_DOT,
-    ACTIONS(145), 1,
-      anon_sym_COMMA,
-    ACTIONS(147), 1,
-      anon_sym_DOT,
-    ACTIONS(149), 1,
-      anon_sym_RBRACE,
-    STATE(45), 1,
-      sym_comment,
-    STATE(80), 1,
-      aux_sym_rule_body_repeat1,
-    ACTIONS(59), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(61), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(119), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(151), 2,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-    ACTIONS(117), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-  [2083] = 12,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(95), 1,
-      anon_sym_DOT_DOT,
-    ACTIONS(153), 1,
-      anon_sym_COMMA,
-    ACTIONS(155), 1,
-      anon_sym_RPAREN,
-    STATE(46), 1,
-      sym_comment,
-    STATE(102), 1,
-      aux_sym_tuple_repeat1,
-    ACTIONS(59), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(61), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(119), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(151), 2,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-    ACTIONS(117), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-  [2127] = 11,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(95), 1,
-      anon_sym_DOT_DOT,
-    ACTIONS(159), 1,
-      anon_sym_DOT,
     STATE(47), 1,
       sym_comment,
-    ACTIONS(59), 2,
+    ACTIONS(147), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(145), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [2210] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(48), 1,
+      sym_comment,
+    ACTIONS(151), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(149), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [2242] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(49), 1,
+      sym_comment,
+    ACTIONS(155), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(153), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [2274] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(50), 1,
+      sym_comment,
+    ACTIONS(159), 3,
+      anon_sym_DOT,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(157), 15,
+      anon_sym_EQ,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_RBRACE,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+      anon_sym_PLUS,
+      anon_sym_DOT_DOT,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+  [2306] = 13,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(71), 1,
+      anon_sym_DOT_DOT,
+    ACTIONS(161), 1,
+      anon_sym_COMMA,
+    ACTIONS(163), 1,
+      anon_sym_DOT,
+    ACTIONS(165), 1,
+      anon_sym_RBRACE,
+    STATE(51), 1,
+      sym_comment,
+    STATE(88), 1,
+      aux_sym_rule_body_repeat1,
+    ACTIONS(67), 2,
       anon_sym_DASH,
       anon_sym_PLUS,
-    ACTIONS(61), 2,
+    ACTIONS(69), 2,
       anon_sym_STAR,
       anon_sym_SLASH,
     ACTIONS(119), 2,
       anon_sym_LT,
       anon_sym_GT,
-    ACTIONS(151), 2,
+    ACTIONS(167), 2,
       anon_sym_AMP_AMP,
       anon_sym_PIPE_PIPE,
-    ACTIONS(157), 2,
+    ACTIONS(117), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+  [2353] = 12,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(71), 1,
+      anon_sym_DOT_DOT,
+    ACTIONS(169), 1,
+      anon_sym_COMMA,
+    ACTIONS(171), 1,
+      anon_sym_RPAREN,
+    STATE(52), 1,
+      sym_comment,
+    STATE(107), 1,
+      aux_sym_tuple_repeat1,
+    ACTIONS(67), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(69), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(119), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(167), 2,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+    ACTIONS(117), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+  [2397] = 11,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(71), 1,
+      anon_sym_DOT_DOT,
+    ACTIONS(175), 1,
+      anon_sym_DOT,
+    STATE(53), 1,
+      sym_comment,
+    ACTIONS(67), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(69), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(119), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(167), 2,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+    ACTIONS(173), 2,
       anon_sym_COMMA,
       anon_sym_RBRACE,
     ACTIONS(117), 4,
@@ -3268,96 +3567,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_BANG_EQ,
       anon_sym_GT_EQ,
       anon_sym_LT_EQ,
-  [2169] = 11,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(95), 1,
-      anon_sym_DOT_DOT,
-    ACTIONS(161), 1,
-      anon_sym_DOT,
-    ACTIONS(163), 1,
-      anon_sym_COLON_DASH,
-    STATE(48), 1,
-      sym_comment,
-    ACTIONS(59), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(61), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(119), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(151), 2,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-    ACTIONS(117), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-  [2210] = 11,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(95), 1,
-      anon_sym_DOT_DOT,
-    ACTIONS(165), 1,
-      anon_sym_DOT,
-    ACTIONS(167), 1,
-      anon_sym_COLON_DASH,
-    STATE(49), 1,
-      sym_comment,
-    ACTIONS(59), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(61), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(119), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(151), 2,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-    ACTIONS(117), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-  [2251] = 10,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(95), 1,
-      anon_sym_DOT_DOT,
-    STATE(50), 1,
-      sym_comment,
-    ACTIONS(59), 2,
-      anon_sym_DASH,
-      anon_sym_PLUS,
-    ACTIONS(61), 2,
-      anon_sym_STAR,
-      anon_sym_SLASH,
-    ACTIONS(119), 2,
-      anon_sym_LT,
-      anon_sym_GT,
-    ACTIONS(151), 2,
-      anon_sym_AMP_AMP,
-      anon_sym_PIPE_PIPE,
-    ACTIONS(169), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-    ACTIONS(117), 4,
-      anon_sym_EQ,
-      anon_sym_BANG_EQ,
-      anon_sym_GT_EQ,
-      anon_sym_LT_EQ,
-  [2290] = 13,
+  [2439] = 13,
     ACTIONS(5), 1,
       sym__whitespace,
     ACTIONS(9), 1,
@@ -3376,43 +3586,43 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_COLON_DASH,
     ACTIONS(25), 1,
       anon_sym_soft,
-    ACTIONS(171), 1,
+    ACTIONS(177), 1,
       ts_builtin_sym_end,
-    ACTIONS(173), 1,
+    ACTIONS(179), 1,
       sym_newline,
-    STATE(51), 1,
+    STATE(54), 1,
       sym_comment,
-    STATE(52), 6,
+    STATE(55), 6,
       sym_type_alias,
       sym_import,
       sym_definition,
       sym_rule,
       sym_assumption,
       aux_sym_file_repeat1,
-  [2335] = 12,
+  [2484] = 12,
     ACTIONS(5), 1,
       sym__whitespace,
-    ACTIONS(175), 1,
+    ACTIONS(181), 1,
       ts_builtin_sym_end,
-    ACTIONS(177), 1,
-      anon_sym_SEMI,
-    ACTIONS(180), 1,
-      sym_newline,
     ACTIONS(183), 1,
-      sym_symbol,
+      anon_sym_SEMI,
     ACTIONS(186), 1,
-      anon_sym_type,
+      sym_newline,
     ACTIONS(189), 1,
-      anon_sym_import,
+      sym_symbol,
     ACTIONS(192), 1,
-      anon_sym_define,
+      anon_sym_type,
     ACTIONS(195), 1,
-      anon_sym_DASH,
+      anon_sym_import,
     ACTIONS(198), 1,
-      anon_sym_COLON_DASH,
+      anon_sym_define,
     ACTIONS(201), 1,
+      anon_sym_DASH,
+    ACTIONS(204), 1,
+      anon_sym_COLON_DASH,
+    ACTIONS(207), 1,
       anon_sym_soft,
-    STATE(52), 7,
+    STATE(55), 7,
       sym_comment,
       sym_type_alias,
       sym_import,
@@ -3420,19 +3630,108 @@ static const uint16_t ts_small_parse_table[] = {
       sym_rule,
       sym_assumption,
       aux_sym_file_repeat1,
-  [2378] = 5,
+  [2527] = 10,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    STATE(53), 1,
+    ACTIONS(71), 1,
+      anon_sym_DOT_DOT,
+    STATE(56), 1,
       sym_comment,
-    ACTIONS(206), 4,
+    ACTIONS(67), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(69), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(119), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(167), 2,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+    ACTIONS(210), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+    ACTIONS(117), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+  [2566] = 11,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(71), 1,
+      anon_sym_DOT_DOT,
+    ACTIONS(212), 1,
+      anon_sym_DOT,
+    ACTIONS(214), 1,
+      anon_sym_COLON_DASH,
+    STATE(57), 1,
+      sym_comment,
+    ACTIONS(67), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(69), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(119), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(167), 2,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+    ACTIONS(117), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+  [2607] = 11,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(71), 1,
+      anon_sym_DOT_DOT,
+    ACTIONS(216), 1,
+      anon_sym_DOT,
+    ACTIONS(218), 1,
+      anon_sym_COLON_DASH,
+    STATE(58), 1,
+      sym_comment,
+    ACTIONS(67), 2,
+      anon_sym_DASH,
+      anon_sym_PLUS,
+    ACTIONS(69), 2,
+      anon_sym_STAR,
+      anon_sym_SLASH,
+    ACTIONS(119), 2,
+      anon_sym_LT,
+      anon_sym_GT,
+    ACTIONS(167), 2,
+      anon_sym_AMP_AMP,
+      anon_sym_PIPE_PIPE,
+    ACTIONS(117), 4,
+      anon_sym_EQ,
+      anon_sym_BANG_EQ,
+      anon_sym_GT_EQ,
+      anon_sym_LT_EQ,
+  [2648] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(59), 1,
+      sym_comment,
+    ACTIONS(222), 4,
       sym_symbol,
       anon_sym_DASH,
       anon_sym_True,
       anon_sym_False,
-    ACTIONS(204), 7,
+    ACTIONS(220), 7,
       sym_variable,
       anon_sym_0,
       aux_sym_integer_token1,
@@ -3440,127 +3739,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym__,
       sym_aggregate_op,
       anon_sym_BANG,
-  [2403] = 4,
+  [2673] = 4,
     ACTIONS(5), 1,
       sym__whitespace,
-    ACTIONS(210), 1,
+    ACTIONS(226), 1,
       anon_sym_DOT,
-    STATE(54), 1,
-      sym_comment,
-    ACTIONS(208), 10,
-      ts_builtin_sym_end,
-      anon_sym_SEMI,
-      sym_newline,
-      sym_symbol,
-      anon_sym_type,
-      anon_sym_import,
-      anon_sym_define,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_soft,
-  [2425] = 4,
-    ACTIONS(5), 1,
-      sym__whitespace,
-    ACTIONS(210), 1,
-      anon_sym_DOT,
-    STATE(55), 1,
-      sym_comment,
-    ACTIONS(212), 10,
-      ts_builtin_sym_end,
-      anon_sym_SEMI,
-      sym_newline,
-      sym_symbol,
-      anon_sym_type,
-      anon_sym_import,
-      anon_sym_define,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_soft,
-  [2447] = 3,
-    ACTIONS(5), 1,
-      sym__whitespace,
-    STATE(56), 1,
-      sym_comment,
-    ACTIONS(214), 10,
-      ts_builtin_sym_end,
-      anon_sym_SEMI,
-      sym_newline,
-      sym_symbol,
-      anon_sym_type,
-      anon_sym_import,
-      anon_sym_define,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_soft,
-  [2466] = 3,
-    ACTIONS(5), 1,
-      sym__whitespace,
-    STATE(57), 1,
-      sym_comment,
-    ACTIONS(216), 10,
-      ts_builtin_sym_end,
-      anon_sym_SEMI,
-      sym_newline,
-      sym_symbol,
-      anon_sym_type,
-      anon_sym_import,
-      anon_sym_define,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_soft,
-  [2485] = 3,
-    ACTIONS(5), 1,
-      sym__whitespace,
-    STATE(58), 1,
-      sym_comment,
-    ACTIONS(218), 10,
-      ts_builtin_sym_end,
-      anon_sym_SEMI,
-      sym_newline,
-      sym_symbol,
-      anon_sym_type,
-      anon_sym_import,
-      anon_sym_define,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_soft,
-  [2504] = 3,
-    ACTIONS(5), 1,
-      sym__whitespace,
-    STATE(59), 1,
-      sym_comment,
-    ACTIONS(220), 10,
-      ts_builtin_sym_end,
-      anon_sym_SEMI,
-      sym_newline,
-      sym_symbol,
-      anon_sym_type,
-      anon_sym_import,
-      anon_sym_define,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_soft,
-  [2523] = 3,
-    ACTIONS(5), 1,
-      sym__whitespace,
     STATE(60), 1,
       sym_comment,
-    ACTIONS(222), 10,
-      ts_builtin_sym_end,
-      anon_sym_SEMI,
-      sym_newline,
-      sym_symbol,
-      anon_sym_type,
-      anon_sym_import,
-      anon_sym_define,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_soft,
-  [2542] = 3,
-    ACTIONS(5), 1,
-      sym__whitespace,
-    STATE(61), 1,
-      sym_comment,
     ACTIONS(224), 10,
       ts_builtin_sym_end,
       anon_sym_SEMI,
@@ -3572,26 +3757,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2561] = 3,
+  [2695] = 4,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(62), 1,
-      sym_comment,
-    ACTIONS(226), 10,
-      ts_builtin_sym_end,
-      anon_sym_SEMI,
-      sym_newline,
-      sym_symbol,
-      anon_sym_type,
-      anon_sym_import,
-      anon_sym_define,
-      anon_sym_DASH,
-      anon_sym_COLON_DASH,
-      anon_sym_soft,
-  [2580] = 3,
-    ACTIONS(5), 1,
-      sym__whitespace,
-    STATE(63), 1,
+    ACTIONS(226), 1,
+      anon_sym_DOT,
+    STATE(61), 1,
       sym_comment,
     ACTIONS(228), 10,
       ts_builtin_sym_end,
@@ -3604,10 +3775,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2599] = 3,
+  [2717] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(64), 1,
+    STATE(62), 1,
       sym_comment,
     ACTIONS(230), 10,
       ts_builtin_sym_end,
@@ -3620,10 +3791,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2618] = 3,
+  [2736] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(65), 1,
+    STATE(63), 1,
       sym_comment,
     ACTIONS(232), 10,
       ts_builtin_sym_end,
@@ -3636,10 +3807,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2637] = 3,
+  [2755] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(66), 1,
+    STATE(64), 1,
       sym_comment,
     ACTIONS(234), 10,
       ts_builtin_sym_end,
@@ -3652,10 +3823,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2656] = 3,
+  [2774] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(67), 1,
+    STATE(65), 1,
       sym_comment,
     ACTIONS(236), 10,
       ts_builtin_sym_end,
@@ -3668,10 +3839,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2675] = 3,
+  [2793] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(68), 1,
+    STATE(66), 1,
       sym_comment,
     ACTIONS(238), 10,
       ts_builtin_sym_end,
@@ -3684,10 +3855,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2694] = 3,
+  [2812] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(69), 1,
+    STATE(67), 1,
       sym_comment,
     ACTIONS(240), 10,
       ts_builtin_sym_end,
@@ -3700,10 +3871,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2713] = 3,
+  [2831] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(70), 1,
+    STATE(68), 1,
       sym_comment,
     ACTIONS(242), 10,
       ts_builtin_sym_end,
@@ -3716,10 +3887,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2732] = 3,
+  [2850] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(71), 1,
+    STATE(69), 1,
       sym_comment,
     ACTIONS(244), 10,
       ts_builtin_sym_end,
@@ -3732,10 +3903,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2751] = 3,
+  [2869] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(72), 1,
+    STATE(70), 1,
       sym_comment,
     ACTIONS(246), 10,
       ts_builtin_sym_end,
@@ -3748,10 +3919,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2770] = 3,
+  [2888] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(73), 1,
+    STATE(71), 1,
       sym_comment,
     ACTIONS(248), 10,
       ts_builtin_sym_end,
@@ -3764,10 +3935,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2789] = 3,
+  [2907] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(74), 1,
+    STATE(72), 1,
       sym_comment,
     ACTIONS(250), 10,
       ts_builtin_sym_end,
@@ -3780,10 +3951,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2808] = 3,
+  [2926] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(75), 1,
+    STATE(73), 1,
       sym_comment,
     ACTIONS(252), 10,
       ts_builtin_sym_end,
@@ -3796,10 +3967,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2827] = 3,
+  [2945] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(76), 1,
+    STATE(74), 1,
       sym_comment,
     ACTIONS(254), 10,
       ts_builtin_sym_end,
@@ -3812,10 +3983,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2846] = 3,
+  [2964] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(77), 1,
+    STATE(75), 1,
       sym_comment,
     ACTIONS(256), 10,
       ts_builtin_sym_end,
@@ -3828,10 +3999,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2865] = 3,
+  [2983] = 3,
     ACTIONS(5), 1,
       sym__whitespace,
-    STATE(78), 1,
+    STATE(76), 1,
       sym_comment,
     ACTIONS(258), 10,
       ts_builtin_sym_end,
@@ -3844,765 +4015,996 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH,
       anon_sym_COLON_DASH,
       anon_sym_soft,
-  [2884] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
+  [3002] = 3,
+    ACTIONS(5), 1,
       sym__whitespace,
-    ACTIONS(260), 1,
-      anon_sym_COMMA,
-    ACTIONS(263), 2,
-      anon_sym_DOT,
-      anon_sym_RBRACE,
-    STATE(79), 2,
+    STATE(77), 1,
       sym_comment,
-      aux_sym_rule_body_repeat1,
-  [2902] = 6,
-    ACTIONS(3), 1,
+    ACTIONS(260), 10,
+      ts_builtin_sym_end,
       anon_sym_SEMI,
-    ACTIONS(27), 1,
+      sym_newline,
+      sym_symbol,
+      anon_sym_type,
+      anon_sym_import,
+      anon_sym_define,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_soft,
+  [3021] = 3,
+    ACTIONS(5), 1,
+      sym__whitespace,
+    STATE(78), 1,
+      sym_comment,
+    ACTIONS(262), 10,
+      ts_builtin_sym_end,
+      anon_sym_SEMI,
+      sym_newline,
+      sym_symbol,
+      anon_sym_type,
+      anon_sym_import,
+      anon_sym_define,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_soft,
+  [3040] = 3,
+    ACTIONS(5), 1,
       sym__whitespace,
-    ACTIONS(145), 1,
-      anon_sym_COMMA,
     STATE(79), 1,
-      aux_sym_rule_body_repeat1,
+      sym_comment,
+    ACTIONS(264), 10,
+      ts_builtin_sym_end,
+      anon_sym_SEMI,
+      sym_newline,
+      sym_symbol,
+      anon_sym_type,
+      anon_sym_import,
+      anon_sym_define,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_soft,
+  [3059] = 3,
+    ACTIONS(5), 1,
+      sym__whitespace,
     STATE(80), 1,
       sym_comment,
-    ACTIONS(265), 2,
-      anon_sym_DOT,
-      anon_sym_RBRACE,
-  [2922] = 7,
-    ACTIONS(3), 1,
+    ACTIONS(266), 10,
+      ts_builtin_sym_end,
       anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(267), 1,
+      sym_newline,
       sym_symbol,
-    ACTIONS(269), 1,
-      anon_sym_LPAREN,
-    ACTIONS(271), 1,
-      anon_sym_RPAREN,
+      anon_sym_type,
+      anon_sym_import,
+      anon_sym_define,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_soft,
+  [3078] = 3,
+    ACTIONS(5), 1,
+      sym__whitespace,
     STATE(81), 1,
       sym_comment,
-    STATE(111), 1,
-      sym_type,
-  [2944] = 7,
-    ACTIONS(3), 1,
+    ACTIONS(268), 10,
+      ts_builtin_sym_end,
       anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(273), 1,
+      sym_newline,
       sym_symbol,
-    ACTIONS(275), 1,
-      anon_sym_input,
-    ACTIONS(277), 1,
-      anon_sym_output,
-    ACTIONS(279), 1,
-      anon_sym_decision,
+      anon_sym_type,
+      anon_sym_import,
+      anon_sym_define,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_soft,
+  [3097] = 3,
+    ACTIONS(5), 1,
+      sym__whitespace,
     STATE(82), 1,
       sym_comment,
-  [2966] = 7,
-    ACTIONS(3), 1,
+    ACTIONS(270), 10,
+      ts_builtin_sym_end,
       anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(267), 1,
+      sym_newline,
       sym_symbol,
-    ACTIONS(269), 1,
-      anon_sym_LPAREN,
-    ACTIONS(281), 1,
-      anon_sym_RPAREN,
+      anon_sym_type,
+      anon_sym_import,
+      anon_sym_define,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_soft,
+  [3116] = 3,
+    ACTIONS(5), 1,
+      sym__whitespace,
     STATE(83), 1,
       sym_comment,
-    STATE(111), 1,
-      sym_type,
-  [2988] = 5,
-    ACTIONS(3), 1,
+    ACTIONS(272), 10,
+      ts_builtin_sym_end,
       anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(283), 1,
-      anon_sym_COMMA,
-    ACTIONS(286), 1,
-      anon_sym_RPAREN,
-    STATE(84), 2,
-      sym_comment,
-      aux_sym_import_repeat2,
-  [3005] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(267), 1,
+      sym_newline,
       sym_symbol,
-    ACTIONS(269), 1,
+      anon_sym_type,
+      anon_sym_import,
+      anon_sym_define,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_soft,
+  [3135] = 3,
+    ACTIONS(5), 1,
+      sym__whitespace,
+    STATE(84), 1,
+      sym_comment,
+    ACTIONS(274), 10,
+      ts_builtin_sym_end,
+      anon_sym_SEMI,
+      sym_newline,
+      sym_symbol,
+      anon_sym_type,
+      anon_sym_import,
+      anon_sym_define,
+      anon_sym_DASH,
+      anon_sym_COLON_DASH,
+      anon_sym_soft,
+  [3154] = 7,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(276), 1,
+      sym_symbol,
+    ACTIONS(278), 1,
       anon_sym_LPAREN,
+    ACTIONS(280), 1,
+      anon_sym_RPAREN,
     STATE(85), 1,
       sym_comment,
-    STATE(121), 1,
+    STATE(125), 1,
       sym_type,
-  [3024] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(288), 1,
-      sym_symbol,
-    ACTIONS(290), 1,
-      anon_sym_LPAREN,
-    STATE(58), 1,
-      sym_type,
-    STATE(86), 1,
-      sym_comment,
-  [3043] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(288), 1,
-      sym_symbol,
-    ACTIONS(290), 1,
-      anon_sym_LPAREN,
-    STATE(63), 1,
-      sym_type,
-    STATE(87), 1,
-      sym_comment,
-  [3062] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(288), 1,
-      sym_symbol,
-    ACTIONS(290), 1,
-      anon_sym_LPAREN,
-    STATE(67), 1,
-      sym_type,
-    STATE(88), 1,
-      sym_comment,
-  [3081] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(288), 1,
-      sym_symbol,
-    ACTIONS(290), 1,
-      anon_sym_LPAREN,
-    STATE(68), 1,
-      sym_type,
-    STATE(89), 1,
-      sym_comment,
-  [3100] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(267), 1,
-      sym_symbol,
-    ACTIONS(269), 1,
-      anon_sym_LPAREN,
-    STATE(90), 1,
-      sym_comment,
-    STATE(109), 1,
-      sym_type,
-  [3119] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(288), 1,
-      sym_symbol,
-    ACTIONS(290), 1,
-      anon_sym_LPAREN,
-    STATE(62), 1,
-      sym_type,
-    STATE(91), 1,
-      sym_comment,
-  [3138] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(288), 1,
-      sym_symbol,
-    ACTIONS(290), 1,
-      anon_sym_LPAREN,
-    STATE(61), 1,
-      sym_type,
-    STATE(92), 1,
-      sym_comment,
-  [3157] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(288), 1,
-      sym_symbol,
-    ACTIONS(290), 1,
-      anon_sym_LPAREN,
-    STATE(60), 1,
-      sym_type,
-    STATE(93), 1,
-      sym_comment,
   [3176] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(292), 1,
+    ACTIONS(282), 1,
       anon_sym_COMMA,
-    ACTIONS(295), 1,
-      anon_sym_RPAREN,
-    STATE(94), 2,
+    ACTIONS(285), 2,
+      anon_sym_DOT,
+      anon_sym_RBRACE,
+    STATE(86), 2,
       sym_comment,
-      aux_sym_tuple_repeat1,
-  [3193] = 6,
+      aux_sym_rule_body_repeat1,
+  [3194] = 7,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(288), 1,
+    ACTIONS(287), 1,
       sym_symbol,
-    ACTIONS(290), 1,
-      anon_sym_LPAREN,
-    STATE(65), 1,
-      sym_type,
-    STATE(95), 1,
+    ACTIONS(289), 1,
+      anon_sym_input,
+    ACTIONS(291), 1,
+      anon_sym_output,
+    ACTIONS(293), 1,
+      anon_sym_decision,
+    STATE(87), 1,
       sym_comment,
-  [3212] = 6,
+  [3216] = 6,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(161), 1,
+      anon_sym_COMMA,
+    STATE(86), 1,
+      aux_sym_rule_body_repeat1,
+    STATE(88), 1,
+      sym_comment,
+    ACTIONS(295), 2,
+      anon_sym_DOT,
+      anon_sym_RBRACE,
+  [3236] = 7,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
     ACTIONS(297), 1,
-      anon_sym_COMMA,
+      sym_variable,
     ACTIONS(299), 1,
-      anon_sym_RPAREN,
-    STATE(96), 1,
+      sym_symbol,
+    ACTIONS(301), 1,
+      anon_sym_LBRACE,
+    STATE(28), 1,
+      sym_atom,
+    STATE(89), 1,
       sym_comment,
-    STATE(100), 1,
-      aux_sym_import_repeat2,
-  [3231] = 6,
+  [3258] = 7,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(301), 1,
-      anon_sym_COMMA,
+    ACTIONS(276), 1,
+      sym_symbol,
+    ACTIONS(278), 1,
+      anon_sym_LPAREN,
     ACTIONS(303), 1,
       anon_sym_RPAREN,
-    STATE(97), 1,
+    STATE(90), 1,
       sym_comment,
-    STATE(104), 1,
-      aux_sym_type_repeat1,
-  [3250] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(288), 1,
-      sym_symbol,
-    ACTIONS(290), 1,
-      anon_sym_LPAREN,
-    STATE(72), 1,
+    STATE(125), 1,
       sym_type,
-    STATE(98), 1,
-      sym_comment,
-  [3269] = 6,
+  [3280] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
     ACTIONS(305), 1,
-      sym_symbol,
-    ACTIONS(307), 1,
-      anon_sym_LBRACE,
-    STATE(31), 1,
-      sym_atom,
-    STATE(99), 1,
-      sym_comment,
-  [3288] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(297), 1,
       anon_sym_COMMA,
-    ACTIONS(309), 1,
+    ACTIONS(308), 1,
       anon_sym_RPAREN,
-    STATE(84), 1,
+    STATE(91), 2,
+      sym_comment,
       aux_sym_import_repeat2,
-    STATE(100), 1,
-      sym_comment,
-  [3307] = 6,
+  [3297] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(297), 1,
-      anon_sym_COMMA,
-    ACTIONS(311), 1,
-      anon_sym_RPAREN,
-    STATE(101), 1,
-      sym_comment,
-    STATE(105), 1,
-      aux_sym_import_repeat2,
-  [3326] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(313), 1,
-      anon_sym_COMMA,
-    ACTIONS(315), 1,
-      anon_sym_RPAREN,
-    STATE(94), 1,
-      aux_sym_tuple_repeat1,
-    STATE(102), 1,
-      sym_comment,
-  [3345] = 6,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(267), 1,
+    ACTIONS(310), 1,
       sym_symbol,
-    ACTIONS(269), 1,
+    ACTIONS(312), 1,
       anon_sym_LPAREN,
-    STATE(103), 1,
-      sym_comment,
-    STATE(111), 1,
+    STATE(70), 1,
       sym_type,
-  [3364] = 5,
+    STATE(92), 1,
+      sym_comment,
+  [3316] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(317), 1,
-      anon_sym_COMMA,
-    ACTIONS(320), 1,
-      anon_sym_RPAREN,
-    STATE(104), 2,
+    ACTIONS(310), 1,
+      sym_symbol,
+    ACTIONS(312), 1,
+      anon_sym_LPAREN,
+    STATE(73), 1,
+      sym_type,
+    STATE(93), 1,
       sym_comment,
-      aux_sym_type_repeat1,
-  [3381] = 6,
+  [3335] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(297), 1,
-      anon_sym_COMMA,
-    ACTIONS(322), 1,
-      anon_sym_RPAREN,
-    STATE(84), 1,
-      aux_sym_import_repeat2,
-    STATE(105), 1,
+    ACTIONS(310), 1,
+      sym_symbol,
+    ACTIONS(312), 1,
+      anon_sym_LPAREN,
+    STATE(72), 1,
+      sym_type,
+    STATE(94), 1,
       sym_comment,
-  [3400] = 5,
+  [3354] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    STATE(106), 1,
+    STATE(95), 1,
       sym_comment,
-    STATE(132), 1,
+    STATE(141), 1,
       sym_integer,
     ACTIONS(33), 2,
       anon_sym_0,
       aux_sym_integer_token1,
-  [3417] = 6,
+  [3371] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(301), 1,
+    ACTIONS(276), 1,
+      sym_symbol,
+    ACTIONS(278), 1,
+      anon_sym_LPAREN,
+    STATE(96), 1,
+      sym_comment,
+    STATE(131), 1,
+      sym_type,
+  [3390] = 6,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(310), 1,
+      sym_symbol,
+    ACTIONS(312), 1,
+      anon_sym_LPAREN,
+    STATE(81), 1,
+      sym_type,
+    STATE(97), 1,
+      sym_comment,
+  [3409] = 6,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(310), 1,
+      sym_symbol,
+    ACTIONS(312), 1,
+      anon_sym_LPAREN,
+    STATE(82), 1,
+      sym_type,
+    STATE(98), 1,
+      sym_comment,
+  [3428] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(314), 1,
+      anon_sym_COMMA,
+    ACTIONS(317), 1,
+      anon_sym_RPAREN,
+    STATE(99), 2,
+      sym_comment,
+      aux_sym_tuple_repeat1,
+  [3445] = 6,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(310), 1,
+      sym_symbol,
+    ACTIONS(312), 1,
+      anon_sym_LPAREN,
+    STATE(63), 1,
+      sym_type,
+    STATE(100), 1,
+      sym_comment,
+  [3464] = 6,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(299), 1,
+      sym_symbol,
+    ACTIONS(319), 1,
+      anon_sym_LBRACE,
+    STATE(49), 1,
+      sym_atom,
+    STATE(101), 1,
+      sym_comment,
+  [3483] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(321), 1,
       anon_sym_COMMA,
     ACTIONS(324), 1,
-      anon_sym_RPAREN,
-    STATE(104), 1,
-      aux_sym_type_repeat1,
-    STATE(107), 1,
+      anon_sym_COLON,
+    STATE(102), 2,
       sym_comment,
-  [3436] = 6,
+      aux_sym_aggregate_repeat1,
+  [3500] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
     ACTIONS(326), 1,
-      sym_symbol,
+      anon_sym_COMMA,
     ACTIONS(328), 1,
-      anon_sym_output,
-    ACTIONS(330), 1,
-      anon_sym_decision,
-    STATE(108), 1,
+      anon_sym_RPAREN,
+    STATE(103), 1,
       sym_comment,
-  [3455] = 5,
+    STATE(110), 1,
+      aux_sym_import_repeat2,
+  [3519] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(332), 1,
+    ACTIONS(330), 1,
       anon_sym_COMMA,
-    STATE(97), 1,
-      aux_sym_type_repeat1,
-    STATE(109), 1,
+    ACTIONS(332), 1,
+      anon_sym_COLON,
+    STATE(104), 1,
       sym_comment,
-  [3471] = 5,
+    STATE(109), 1,
+      aux_sym_aggregate_repeat1,
+  [3538] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
     ACTIONS(334), 1,
-      sym_symbol,
-    ACTIONS(336), 1,
-      anon_sym_LPAREN,
-    STATE(110), 1,
-      sym_comment,
-  [3487] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    STATE(111), 1,
-      sym_comment,
-    ACTIONS(338), 2,
       anon_sym_COMMA,
+    ACTIONS(336), 1,
       anon_sym_RPAREN,
-  [3501] = 5,
+    STATE(105), 1,
+      sym_comment,
+    STATE(113), 1,
+      aux_sym_type_repeat1,
+  [3557] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
+    ACTIONS(310), 1,
+      sym_symbol,
+    ACTIONS(312), 1,
+      anon_sym_LPAREN,
+    STATE(77), 1,
+      sym_type,
+    STATE(106), 1,
+      sym_comment,
+  [3576] = 6,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(338), 1,
+      anon_sym_COMMA,
     ACTIONS(340), 1,
+      anon_sym_RPAREN,
+    STATE(99), 1,
+      aux_sym_tuple_repeat1,
+    STATE(107), 1,
+      sym_comment,
+  [3595] = 6,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(299), 1,
       sym_symbol,
     ACTIONS(342), 1,
+      anon_sym_LBRACE,
+    STATE(47), 1,
+      sym_atom,
+    STATE(108), 1,
+      sym_comment,
+  [3614] = 6,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(330), 1,
+      anon_sym_COMMA,
+    ACTIONS(344), 1,
+      anon_sym_COLON,
+    STATE(102), 1,
+      aux_sym_aggregate_repeat1,
+    STATE(109), 1,
+      sym_comment,
+  [3633] = 6,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(326), 1,
+      anon_sym_COMMA,
+    ACTIONS(346), 1,
+      anon_sym_RPAREN,
+    STATE(91), 1,
+      aux_sym_import_repeat2,
+    STATE(110), 1,
+      sym_comment,
+  [3652] = 6,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(326), 1,
+      anon_sym_COMMA,
+    ACTIONS(348), 1,
+      anon_sym_RPAREN,
+    STATE(111), 1,
+      sym_comment,
+    STATE(116), 1,
+      aux_sym_import_repeat2,
+  [3671] = 6,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(276), 1,
+      sym_symbol,
+    ACTIONS(278), 1,
       anon_sym_LPAREN,
     STATE(112), 1,
       sym_comment,
-  [3517] = 5,
+    STATE(125), 1,
+      sym_type,
+  [3690] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(344), 1,
-      anon_sym_DOT,
-    STATE(113), 1,
+    ACTIONS(350), 1,
+      anon_sym_COMMA,
+    ACTIONS(353), 1,
+      anon_sym_RPAREN,
+    STATE(113), 2,
       sym_comment,
-    STATE(120), 1,
-      aux_sym_import_repeat1,
-  [3533] = 4,
+      aux_sym_type_repeat1,
+  [3707] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
+    ACTIONS(310), 1,
+      sym_symbol,
+    ACTIONS(312), 1,
+      anon_sym_LPAREN,
+    STATE(66), 1,
+      sym_type,
     STATE(114), 1,
       sym_comment,
-    ACTIONS(346), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [3547] = 5,
+  [3726] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(348), 1,
+    ACTIONS(355), 1,
       sym_symbol,
-    ACTIONS(350), 1,
+    ACTIONS(357), 1,
+      anon_sym_output,
+    ACTIONS(359), 1,
       anon_sym_decision,
     STATE(115), 1,
       sym_comment,
-  [3563] = 5,
+  [3745] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(352), 1,
-      anon_sym_DOT,
-    STATE(113), 1,
-      aux_sym_import_repeat1,
+    ACTIONS(326), 1,
+      anon_sym_COMMA,
+    ACTIONS(361), 1,
+      anon_sym_RPAREN,
+    STATE(91), 1,
+      aux_sym_import_repeat2,
     STATE(116), 1,
       sym_comment,
-  [3579] = 4,
+  [3764] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
+    ACTIONS(334), 1,
+      anon_sym_COMMA,
+    ACTIONS(363), 1,
+      anon_sym_RPAREN,
+    STATE(113), 1,
+      aux_sym_type_repeat1,
     STATE(117), 1,
       sym_comment,
-    ACTIONS(216), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [3593] = 4,
+  [3783] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
+    ACTIONS(276), 1,
+      sym_symbol,
+    ACTIONS(278), 1,
+      anon_sym_LPAREN,
     STATE(118), 1,
       sym_comment,
-    ACTIONS(242), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [3607] = 4,
+    STATE(133), 1,
+      sym_type,
+  [3802] = 6,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
+    ACTIONS(310), 1,
+      sym_symbol,
+    ACTIONS(312), 1,
+      anon_sym_LPAREN,
+    STATE(71), 1,
+      sym_type,
     STATE(119), 1,
       sym_comment,
-    ACTIONS(244), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [3621] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(354), 1,
-      anon_sym_DOT,
-    STATE(120), 2,
-      sym_comment,
-      aux_sym_import_repeat1,
-  [3635] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(357), 1,
-      anon_sym_COMMA,
-    STATE(107), 1,
-      aux_sym_type_repeat1,
-    STATE(121), 1,
-      sym_comment,
-  [3651] = 5,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(359), 1,
-      sym_symbol,
-    ACTIONS(361), 1,
-      anon_sym_decision,
-    STATE(122), 1,
-      sym_comment,
-  [3667] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(363), 1,
-      anon_sym_LPAREN,
-    STATE(123), 1,
-      sym_comment,
-  [3680] = 4,
+  [3821] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
     ACTIONS(365), 1,
-      sym_symbol,
-    STATE(124), 1,
+      anon_sym_DOT,
+    STATE(120), 1,
       sym_comment,
-  [3693] = 4,
+    STATE(127), 1,
+      aux_sym_import_repeat1,
+  [3837] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
     ACTIONS(367), 1,
       sym_symbol,
-    STATE(125), 1,
-      sym_comment,
-  [3706] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
     ACTIONS(369), 1,
-      sym_symbol,
-    STATE(126), 1,
+      anon_sym_LPAREN,
+    STATE(121), 1,
       sym_comment,
-  [3719] = 4,
+  [3853] = 4,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(371), 1,
-      anon_sym_RBRACE,
-    STATE(127), 1,
+    STATE(122), 1,
       sym_comment,
-  [3732] = 4,
+    ACTIONS(371), 2,
+      anon_sym_COMMA,
+      anon_sym_COLON,
+  [3867] = 4,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(373), 1,
-      anon_sym_COLON_DASH,
-    STATE(128), 1,
+    STATE(123), 1,
       sym_comment,
-  [3745] = 4,
+    ACTIONS(373), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [3881] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
     ACTIONS(375), 1,
       sym_symbol,
-    STATE(129), 1,
-      sym_comment,
-  [3758] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
     ACTIONS(377), 1,
-      sym_symbol,
-    STATE(130), 1,
+      anon_sym_decision,
+    STATE(124), 1,
       sym_comment,
-  [3771] = 4,
+  [3897] = 4,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(379), 1,
-      anon_sym_DOT,
-    STATE(131), 1,
+    STATE(125), 1,
       sym_comment,
-  [3784] = 4,
+    ACTIONS(379), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [3911] = 5,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
     ACTIONS(381), 1,
-      anon_sym_RPAREN,
-    STATE(132), 1,
-      sym_comment,
-  [3797] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
+      sym_symbol,
     ACTIONS(383), 1,
-      anon_sym_DOT,
-    STATE(133), 1,
-      sym_comment,
-  [3810] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(385), 1,
-      anon_sym_DOT,
-    STATE(134), 1,
-      sym_comment,
-  [3823] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(387), 1,
-      sym_symbol,
-    STATE(135), 1,
-      sym_comment,
-  [3836] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(389), 1,
-      sym_symbol,
-    STATE(136), 1,
-      sym_comment,
-  [3849] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(391), 1,
-      anon_sym_EQ,
-    STATE(137), 1,
-      sym_comment,
-  [3862] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(393), 1,
-      anon_sym_DOT,
-    STATE(138), 1,
-      sym_comment,
-  [3875] = 4,
-    ACTIONS(5), 1,
-      sym__whitespace,
-    ACTIONS(395), 1,
-      anon_sym_SEMI,
-    ACTIONS(397), 1,
-      sym_commentInner,
-    STATE(139), 1,
-      sym_comment,
-  [3888] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(399), 1,
-      sym_symbol,
-    STATE(140), 1,
-      sym_comment,
-  [3901] = 4,
-    ACTIONS(3), 1,
-      anon_sym_SEMI,
-    ACTIONS(27), 1,
-      sym__whitespace,
-    ACTIONS(401), 1,
-      ts_builtin_sym_end,
-    STATE(141), 1,
-      sym_comment,
-  [3914] = 4,
-    ACTIONS(5), 1,
-      sym__whitespace,
-    ACTIONS(395), 1,
-      anon_sym_SEMI,
-    ACTIONS(403), 1,
-      sym_commentInner,
-    STATE(142), 1,
+      anon_sym_LPAREN,
+    STATE(126), 1,
       sym_comment,
   [3927] = 4,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(405), 1,
+    ACTIONS(385), 1,
+      anon_sym_DOT,
+    STATE(127), 2,
+      sym_comment,
+      aux_sym_import_repeat1,
+  [3941] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(128), 1,
+      sym_comment,
+    ACTIONS(236), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [3955] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(129), 1,
+      sym_comment,
+    ACTIONS(256), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [3969] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    STATE(130), 1,
+      sym_comment,
+    ACTIONS(258), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [3983] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(388), 1,
+      anon_sym_COMMA,
+    STATE(105), 1,
+      aux_sym_type_repeat1,
+    STATE(131), 1,
+      sym_comment,
+  [3999] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(390), 1,
       sym_symbol,
+    ACTIONS(392), 1,
+      anon_sym_decision,
+    STATE(132), 1,
+      sym_comment,
+  [4015] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(394), 1,
+      anon_sym_COMMA,
+    STATE(117), 1,
+      aux_sym_type_repeat1,
+    STATE(133), 1,
+      sym_comment,
+  [4031] = 5,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(396), 1,
+      anon_sym_DOT,
+    STATE(120), 1,
+      aux_sym_import_repeat1,
+    STATE(134), 1,
+      sym_comment,
+  [4047] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(398), 1,
+      sym_symbol,
+    STATE(135), 1,
+      sym_comment,
+  [4060] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(400), 1,
+      anon_sym_RBRACE,
+    STATE(136), 1,
+      sym_comment,
+  [4073] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(402), 1,
+      sym_symbol,
+    STATE(137), 1,
+      sym_comment,
+  [4086] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(404), 1,
+      sym_symbol,
+    STATE(138), 1,
+      sym_comment,
+  [4099] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(406), 1,
+      sym_symbol,
+    STATE(139), 1,
+      sym_comment,
+  [4112] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(408), 1,
+      sym_symbol,
+    STATE(140), 1,
+      sym_comment,
+  [4125] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(410), 1,
+      anon_sym_RPAREN,
+    STATE(141), 1,
+      sym_comment,
+  [4138] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(412), 1,
+      anon_sym_DOT,
+    STATE(142), 1,
+      sym_comment,
+  [4151] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(414), 1,
+      anon_sym_DOT,
     STATE(143), 1,
       sym_comment,
-  [3940] = 4,
+  [4164] = 4,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(407), 1,
-      sym_symbol,
+    ACTIONS(416), 1,
+      anon_sym_COLON_DASH,
     STATE(144), 1,
       sym_comment,
-  [3953] = 4,
+  [4177] = 4,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(409), 1,
-      sym_symbol,
+    ACTIONS(418), 1,
+      anon_sym_RBRACE,
     STATE(145), 1,
       sym_comment,
-  [3966] = 4,
+  [4190] = 4,
     ACTIONS(3), 1,
       anon_sym_SEMI,
     ACTIONS(27), 1,
       sym__whitespace,
-    ACTIONS(210), 1,
-      anon_sym_DOT,
+    ACTIONS(420), 1,
+      anon_sym_LPAREN,
     STATE(146), 1,
       sym_comment,
-  [3979] = 1,
-    ACTIONS(256), 1,
+  [4203] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(422), 1,
+      anon_sym_EQ,
+    STATE(147), 1,
+      sym_comment,
+  [4216] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(424), 1,
+      sym_symbol,
+    STATE(148), 1,
+      sym_comment,
+  [4229] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(426), 1,
+      ts_builtin_sym_end,
+    STATE(149), 1,
+      sym_comment,
+  [4242] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(428), 1,
+      anon_sym_DOT,
+    STATE(150), 1,
+      sym_comment,
+  [4255] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(430), 1,
+      anon_sym_DOT,
+    STATE(151), 1,
+      sym_comment,
+  [4268] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(432), 1,
+      sym_symbol,
+    STATE(152), 1,
+      sym_comment,
+  [4281] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(434), 1,
+      sym_symbol,
+    STATE(153), 1,
+      sym_comment,
+  [4294] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(436), 1,
+      anon_sym_RBRACE,
+    STATE(154), 1,
+      sym_comment,
+  [4307] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(438), 1,
+      sym_variable,
+    STATE(155), 1,
+      sym_comment,
+  [4320] = 4,
+    ACTIONS(5), 1,
+      sym__whitespace,
+    ACTIONS(440), 1,
+      anon_sym_SEMI,
+    ACTIONS(442), 1,
+      sym_commentInner,
+    STATE(156), 1,
+      sym_comment,
+  [4333] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(444), 1,
+      sym_symbol,
+    STATE(157), 1,
+      sym_comment,
+  [4346] = 4,
+    ACTIONS(5), 1,
+      sym__whitespace,
+    ACTIONS(440), 1,
+      anon_sym_SEMI,
+    ACTIONS(446), 1,
+      sym_commentInner,
+    STATE(158), 1,
+      sym_comment,
+  [4359] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(448), 1,
+      sym_symbol,
+    STATE(159), 1,
+      sym_comment,
+  [4372] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(450), 1,
+      sym_symbol,
+    STATE(160), 1,
+      sym_comment,
+  [4385] = 4,
+    ACTIONS(3), 1,
+      anon_sym_SEMI,
+    ACTIONS(27), 1,
+      sym__whitespace,
+    ACTIONS(226), 1,
+      anon_sym_DOT,
+    STATE(161), 1,
+      sym_comment,
+  [4398] = 1,
+    ACTIONS(274), 1,
       ts_builtin_sym_end,
 };
 
@@ -4614,346 +5016,381 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(7)] = 284,
   [SMALL_STATE(8)] = 355,
   [SMALL_STATE(9)] = 426,
-  [SMALL_STATE(10)] = 494,
-  [SMALL_STATE(11)] = 560,
-  [SMALL_STATE(12)] = 628,
-  [SMALL_STATE(13)] = 696,
-  [SMALL_STATE(14)] = 764,
-  [SMALL_STATE(15)] = 832,
-  [SMALL_STATE(16)] = 900,
-  [SMALL_STATE(17)] = 968,
-  [SMALL_STATE(18)] = 1036,
-  [SMALL_STATE(19)] = 1104,
-  [SMALL_STATE(20)] = 1172,
-  [SMALL_STATE(21)] = 1240,
-  [SMALL_STATE(22)] = 1276,
-  [SMALL_STATE(23)] = 1308,
-  [SMALL_STATE(24)] = 1340,
-  [SMALL_STATE(25)] = 1372,
-  [SMALL_STATE(26)] = 1404,
-  [SMALL_STATE(27)] = 1436,
-  [SMALL_STATE(28)] = 1468,
-  [SMALL_STATE(29)] = 1500,
-  [SMALL_STATE(30)] = 1538,
-  [SMALL_STATE(31)] = 1570,
-  [SMALL_STATE(32)] = 1602,
-  [SMALL_STATE(33)] = 1634,
-  [SMALL_STATE(34)] = 1666,
-  [SMALL_STATE(35)] = 1704,
-  [SMALL_STATE(36)] = 1738,
-  [SMALL_STATE(37)] = 1770,
-  [SMALL_STATE(38)] = 1802,
-  [SMALL_STATE(39)] = 1844,
-  [SMALL_STATE(40)] = 1876,
-  [SMALL_STATE(41)] = 1908,
-  [SMALL_STATE(42)] = 1940,
-  [SMALL_STATE(43)] = 1972,
-  [SMALL_STATE(44)] = 2004,
-  [SMALL_STATE(45)] = 2036,
-  [SMALL_STATE(46)] = 2083,
-  [SMALL_STATE(47)] = 2127,
-  [SMALL_STATE(48)] = 2169,
-  [SMALL_STATE(49)] = 2210,
-  [SMALL_STATE(50)] = 2251,
-  [SMALL_STATE(51)] = 2290,
-  [SMALL_STATE(52)] = 2335,
-  [SMALL_STATE(53)] = 2378,
-  [SMALL_STATE(54)] = 2403,
-  [SMALL_STATE(55)] = 2425,
-  [SMALL_STATE(56)] = 2447,
-  [SMALL_STATE(57)] = 2466,
-  [SMALL_STATE(58)] = 2485,
-  [SMALL_STATE(59)] = 2504,
-  [SMALL_STATE(60)] = 2523,
-  [SMALL_STATE(61)] = 2542,
-  [SMALL_STATE(62)] = 2561,
-  [SMALL_STATE(63)] = 2580,
-  [SMALL_STATE(64)] = 2599,
-  [SMALL_STATE(65)] = 2618,
-  [SMALL_STATE(66)] = 2637,
-  [SMALL_STATE(67)] = 2656,
-  [SMALL_STATE(68)] = 2675,
-  [SMALL_STATE(69)] = 2694,
-  [SMALL_STATE(70)] = 2713,
-  [SMALL_STATE(71)] = 2732,
-  [SMALL_STATE(72)] = 2751,
-  [SMALL_STATE(73)] = 2770,
-  [SMALL_STATE(74)] = 2789,
-  [SMALL_STATE(75)] = 2808,
-  [SMALL_STATE(76)] = 2827,
-  [SMALL_STATE(77)] = 2846,
-  [SMALL_STATE(78)] = 2865,
-  [SMALL_STATE(79)] = 2884,
-  [SMALL_STATE(80)] = 2902,
-  [SMALL_STATE(81)] = 2922,
-  [SMALL_STATE(82)] = 2944,
-  [SMALL_STATE(83)] = 2966,
-  [SMALL_STATE(84)] = 2988,
-  [SMALL_STATE(85)] = 3005,
-  [SMALL_STATE(86)] = 3024,
-  [SMALL_STATE(87)] = 3043,
-  [SMALL_STATE(88)] = 3062,
-  [SMALL_STATE(89)] = 3081,
-  [SMALL_STATE(90)] = 3100,
-  [SMALL_STATE(91)] = 3119,
-  [SMALL_STATE(92)] = 3138,
-  [SMALL_STATE(93)] = 3157,
-  [SMALL_STATE(94)] = 3176,
-  [SMALL_STATE(95)] = 3193,
-  [SMALL_STATE(96)] = 3212,
-  [SMALL_STATE(97)] = 3231,
-  [SMALL_STATE(98)] = 3250,
-  [SMALL_STATE(99)] = 3269,
-  [SMALL_STATE(100)] = 3288,
-  [SMALL_STATE(101)] = 3307,
-  [SMALL_STATE(102)] = 3326,
-  [SMALL_STATE(103)] = 3345,
-  [SMALL_STATE(104)] = 3364,
-  [SMALL_STATE(105)] = 3381,
-  [SMALL_STATE(106)] = 3400,
-  [SMALL_STATE(107)] = 3417,
-  [SMALL_STATE(108)] = 3436,
-  [SMALL_STATE(109)] = 3455,
-  [SMALL_STATE(110)] = 3471,
-  [SMALL_STATE(111)] = 3487,
-  [SMALL_STATE(112)] = 3501,
-  [SMALL_STATE(113)] = 3517,
-  [SMALL_STATE(114)] = 3533,
-  [SMALL_STATE(115)] = 3547,
-  [SMALL_STATE(116)] = 3563,
-  [SMALL_STATE(117)] = 3579,
-  [SMALL_STATE(118)] = 3593,
-  [SMALL_STATE(119)] = 3607,
-  [SMALL_STATE(120)] = 3621,
-  [SMALL_STATE(121)] = 3635,
-  [SMALL_STATE(122)] = 3651,
-  [SMALL_STATE(123)] = 3667,
-  [SMALL_STATE(124)] = 3680,
-  [SMALL_STATE(125)] = 3693,
-  [SMALL_STATE(126)] = 3706,
-  [SMALL_STATE(127)] = 3719,
-  [SMALL_STATE(128)] = 3732,
-  [SMALL_STATE(129)] = 3745,
-  [SMALL_STATE(130)] = 3758,
-  [SMALL_STATE(131)] = 3771,
-  [SMALL_STATE(132)] = 3784,
-  [SMALL_STATE(133)] = 3797,
-  [SMALL_STATE(134)] = 3810,
-  [SMALL_STATE(135)] = 3823,
-  [SMALL_STATE(136)] = 3836,
-  [SMALL_STATE(137)] = 3849,
-  [SMALL_STATE(138)] = 3862,
-  [SMALL_STATE(139)] = 3875,
-  [SMALL_STATE(140)] = 3888,
-  [SMALL_STATE(141)] = 3901,
-  [SMALL_STATE(142)] = 3914,
-  [SMALL_STATE(143)] = 3927,
-  [SMALL_STATE(144)] = 3940,
-  [SMALL_STATE(145)] = 3953,
-  [SMALL_STATE(146)] = 3966,
-  [SMALL_STATE(147)] = 3979,
+  [SMALL_STATE(10)] = 497,
+  [SMALL_STATE(11)] = 568,
+  [SMALL_STATE(12)] = 636,
+  [SMALL_STATE(13)] = 702,
+  [SMALL_STATE(14)] = 770,
+  [SMALL_STATE(15)] = 838,
+  [SMALL_STATE(16)] = 906,
+  [SMALL_STATE(17)] = 974,
+  [SMALL_STATE(18)] = 1042,
+  [SMALL_STATE(19)] = 1110,
+  [SMALL_STATE(20)] = 1178,
+  [SMALL_STATE(21)] = 1246,
+  [SMALL_STATE(22)] = 1314,
+  [SMALL_STATE(23)] = 1382,
+  [SMALL_STATE(24)] = 1414,
+  [SMALL_STATE(25)] = 1446,
+  [SMALL_STATE(26)] = 1484,
+  [SMALL_STATE(27)] = 1516,
+  [SMALL_STATE(28)] = 1548,
+  [SMALL_STATE(29)] = 1580,
+  [SMALL_STATE(30)] = 1612,
+  [SMALL_STATE(31)] = 1644,
+  [SMALL_STATE(32)] = 1676,
+  [SMALL_STATE(33)] = 1708,
+  [SMALL_STATE(34)] = 1740,
+  [SMALL_STATE(35)] = 1772,
+  [SMALL_STATE(36)] = 1804,
+  [SMALL_STATE(37)] = 1842,
+  [SMALL_STATE(38)] = 1876,
+  [SMALL_STATE(39)] = 1908,
+  [SMALL_STATE(40)] = 1944,
+  [SMALL_STATE(41)] = 1986,
+  [SMALL_STATE(42)] = 2018,
+  [SMALL_STATE(43)] = 2050,
+  [SMALL_STATE(44)] = 2082,
+  [SMALL_STATE(45)] = 2114,
+  [SMALL_STATE(46)] = 2146,
+  [SMALL_STATE(47)] = 2178,
+  [SMALL_STATE(48)] = 2210,
+  [SMALL_STATE(49)] = 2242,
+  [SMALL_STATE(50)] = 2274,
+  [SMALL_STATE(51)] = 2306,
+  [SMALL_STATE(52)] = 2353,
+  [SMALL_STATE(53)] = 2397,
+  [SMALL_STATE(54)] = 2439,
+  [SMALL_STATE(55)] = 2484,
+  [SMALL_STATE(56)] = 2527,
+  [SMALL_STATE(57)] = 2566,
+  [SMALL_STATE(58)] = 2607,
+  [SMALL_STATE(59)] = 2648,
+  [SMALL_STATE(60)] = 2673,
+  [SMALL_STATE(61)] = 2695,
+  [SMALL_STATE(62)] = 2717,
+  [SMALL_STATE(63)] = 2736,
+  [SMALL_STATE(64)] = 2755,
+  [SMALL_STATE(65)] = 2774,
+  [SMALL_STATE(66)] = 2793,
+  [SMALL_STATE(67)] = 2812,
+  [SMALL_STATE(68)] = 2831,
+  [SMALL_STATE(69)] = 2850,
+  [SMALL_STATE(70)] = 2869,
+  [SMALL_STATE(71)] = 2888,
+  [SMALL_STATE(72)] = 2907,
+  [SMALL_STATE(73)] = 2926,
+  [SMALL_STATE(74)] = 2945,
+  [SMALL_STATE(75)] = 2964,
+  [SMALL_STATE(76)] = 2983,
+  [SMALL_STATE(77)] = 3002,
+  [SMALL_STATE(78)] = 3021,
+  [SMALL_STATE(79)] = 3040,
+  [SMALL_STATE(80)] = 3059,
+  [SMALL_STATE(81)] = 3078,
+  [SMALL_STATE(82)] = 3097,
+  [SMALL_STATE(83)] = 3116,
+  [SMALL_STATE(84)] = 3135,
+  [SMALL_STATE(85)] = 3154,
+  [SMALL_STATE(86)] = 3176,
+  [SMALL_STATE(87)] = 3194,
+  [SMALL_STATE(88)] = 3216,
+  [SMALL_STATE(89)] = 3236,
+  [SMALL_STATE(90)] = 3258,
+  [SMALL_STATE(91)] = 3280,
+  [SMALL_STATE(92)] = 3297,
+  [SMALL_STATE(93)] = 3316,
+  [SMALL_STATE(94)] = 3335,
+  [SMALL_STATE(95)] = 3354,
+  [SMALL_STATE(96)] = 3371,
+  [SMALL_STATE(97)] = 3390,
+  [SMALL_STATE(98)] = 3409,
+  [SMALL_STATE(99)] = 3428,
+  [SMALL_STATE(100)] = 3445,
+  [SMALL_STATE(101)] = 3464,
+  [SMALL_STATE(102)] = 3483,
+  [SMALL_STATE(103)] = 3500,
+  [SMALL_STATE(104)] = 3519,
+  [SMALL_STATE(105)] = 3538,
+  [SMALL_STATE(106)] = 3557,
+  [SMALL_STATE(107)] = 3576,
+  [SMALL_STATE(108)] = 3595,
+  [SMALL_STATE(109)] = 3614,
+  [SMALL_STATE(110)] = 3633,
+  [SMALL_STATE(111)] = 3652,
+  [SMALL_STATE(112)] = 3671,
+  [SMALL_STATE(113)] = 3690,
+  [SMALL_STATE(114)] = 3707,
+  [SMALL_STATE(115)] = 3726,
+  [SMALL_STATE(116)] = 3745,
+  [SMALL_STATE(117)] = 3764,
+  [SMALL_STATE(118)] = 3783,
+  [SMALL_STATE(119)] = 3802,
+  [SMALL_STATE(120)] = 3821,
+  [SMALL_STATE(121)] = 3837,
+  [SMALL_STATE(122)] = 3853,
+  [SMALL_STATE(123)] = 3867,
+  [SMALL_STATE(124)] = 3881,
+  [SMALL_STATE(125)] = 3897,
+  [SMALL_STATE(126)] = 3911,
+  [SMALL_STATE(127)] = 3927,
+  [SMALL_STATE(128)] = 3941,
+  [SMALL_STATE(129)] = 3955,
+  [SMALL_STATE(130)] = 3969,
+  [SMALL_STATE(131)] = 3983,
+  [SMALL_STATE(132)] = 3999,
+  [SMALL_STATE(133)] = 4015,
+  [SMALL_STATE(134)] = 4031,
+  [SMALL_STATE(135)] = 4047,
+  [SMALL_STATE(136)] = 4060,
+  [SMALL_STATE(137)] = 4073,
+  [SMALL_STATE(138)] = 4086,
+  [SMALL_STATE(139)] = 4099,
+  [SMALL_STATE(140)] = 4112,
+  [SMALL_STATE(141)] = 4125,
+  [SMALL_STATE(142)] = 4138,
+  [SMALL_STATE(143)] = 4151,
+  [SMALL_STATE(144)] = 4164,
+  [SMALL_STATE(145)] = 4177,
+  [SMALL_STATE(146)] = 4190,
+  [SMALL_STATE(147)] = 4203,
+  [SMALL_STATE(148)] = 4216,
+  [SMALL_STATE(149)] = 4229,
+  [SMALL_STATE(150)] = 4242,
+  [SMALL_STATE(151)] = 4255,
+  [SMALL_STATE(152)] = 4268,
+  [SMALL_STATE(153)] = 4281,
+  [SMALL_STATE(154)] = 4294,
+  [SMALL_STATE(155)] = 4307,
+  [SMALL_STATE(156)] = 4320,
+  [SMALL_STATE(157)] = 4333,
+  [SMALL_STATE(158)] = 4346,
+  [SMALL_STATE(159)] = 4359,
+  [SMALL_STATE(160)] = 4372,
+  [SMALL_STATE(161)] = 4385,
+  [SMALL_STATE(162)] = 4398,
 };
 
 static const TSParseActionEntry ts_parse_actions[] = {
   [0] = {.entry = {.count = 0, .reusable = false}},
   [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(),
-  [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
+  [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
   [5] = {.entry = {.count = 1, .reusable = false}}, SHIFT_EXTRA(),
   [7] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_file, 0, 0, 0),
-  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(142),
-  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
-  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
-  [15] = {.entry = {.count = 1, .reusable = true}}, SHIFT(136),
-  [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
-  [19] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
-  [21] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
+  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(158),
+  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
+  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
+  [15] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
+  [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(152),
+  [19] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
+  [21] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
   [23] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
-  [25] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
+  [25] = {.entry = {.count = 1, .reusable = true}}, SHIFT(146),
   [27] = {.entry = {.count = 1, .reusable = true}}, SHIFT_EXTRA(),
-  [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
+  [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
   [31] = {.entry = {.count = 1, .reusable = false}}, SHIFT(2),
-  [33] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
+  [33] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
   [35] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_value, 1, 0, 2),
-  [37] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
+  [37] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
   [39] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_value, 1, 0, 2),
-  [41] = {.entry = {.count = 1, .reusable = false}}, SHIFT(53),
-  [43] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
-  [45] = {.entry = {.count = 1, .reusable = false}}, SHIFT(39),
-  [47] = {.entry = {.count = 1, .reusable = false}}, SHIFT(40),
-  [49] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
-  [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
-  [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
-  [55] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_binary_expr, 3, 0, 23),
-  [57] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_binary_expr, 3, 0, 23),
-  [59] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
-  [61] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
-  [63] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 7),
-  [65] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 7),
-  [67] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 8),
-  [69] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 8),
-  [71] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 9),
-  [73] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 9),
-  [75] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 10),
-  [77] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 10),
-  [79] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 11),
-  [81] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 11),
-  [83] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 12),
-  [85] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 12),
-  [87] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_integer, 1, 0, 0),
-  [89] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_integer, 1, 0, 0),
-  [91] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_atom, 2, 0, 14),
-  [93] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_atom, 2, 0, 14),
-  [95] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
-  [97] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 1),
-  [99] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 1),
-  [101] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 2, 0, 15),
-  [103] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 2, 0, 15),
-  [105] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unary_expr, 2, 0, 17),
-  [107] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unary_expr, 2, 0, 17),
-  [109] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 3, 0, 22),
-  [111] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 3, 0, 22),
-  [113] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 3),
-  [115] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 3),
-  [117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
-  [119] = {.entry = {.count = 1, .reusable = false}}, SHIFT(14),
-  [121] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_value, 1, 0, 4),
-  [123] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_value, 1, 0, 4),
-  [125] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_value, 1, 0, 5),
-  [127] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_value, 1, 0, 5),
+  [41] = {.entry = {.count = 1, .reusable = false}}, SHIFT(59),
+  [43] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
+  [45] = {.entry = {.count = 1, .reusable = false}}, SHIFT(30),
+  [47] = {.entry = {.count = 1, .reusable = false}}, SHIFT(31),
+  [49] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
+  [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
+  [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
+  [55] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_integer, 1, 0, 0),
+  [57] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_integer, 1, 0, 0),
+  [59] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 7, 0, 59),
+  [61] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 7, 0, 59),
+  [63] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_atom, 2, 0, 14),
+  [65] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_atom, 2, 0, 14),
+  [67] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
+  [69] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
+  [71] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
+  [73] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unary_expr, 2, 0, 17),
+  [75] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unary_expr, 2, 0, 17),
+  [77] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 1),
+  [79] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 1),
+  [81] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 2, 0, 15),
+  [83] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 2, 0, 15),
+  [85] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 3),
+  [87] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 3),
+  [89] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_value, 1, 0, 4),
+  [91] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_value, 1, 0, 4),
+  [93] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_value, 1, 0, 5),
+  [95] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_value, 1, 0, 5),
+  [97] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_value, 1, 0, 6),
+  [99] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_value, 1, 0, 6),
+  [101] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 7),
+  [103] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 7),
+  [105] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 3, 0, 22),
+  [107] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 3, 0, 22),
+  [109] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 8),
+  [111] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 8),
+  [113] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_binary_expr, 3, 0, 23),
+  [115] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_binary_expr, 3, 0, 23),
+  [117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
+  [119] = {.entry = {.count = 1, .reusable = false}}, SHIFT(16),
+  [121] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 9),
+  [123] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 9),
+  [125] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 12),
+  [127] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 12),
   [129] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 4, 0, 34),
   [131] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple, 4, 0, 34),
-  [133] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 4, 0, 35),
-  [135] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple, 4, 0, 35),
-  [137] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_value, 1, 0, 6),
-  [139] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_value, 1, 0, 6),
-  [141] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 4, 0, 37),
-  [143] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 4, 0, 37),
-  [145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
-  [147] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_rule_body, 1, 0, 13),
-  [149] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rule_body, 1, 0, 13),
-  [151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
-  [153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
-  [155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
-  [157] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_rule_body_repeat1, 2, 0, 32),
-  [159] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_rule_body_repeat1, 2, 0, 32),
-  [161] = {.entry = {.count = 1, .reusable = false}}, SHIFT(74),
-  [163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
-  [165] = {.entry = {.count = 1, .reusable = false}}, SHIFT(66),
-  [167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
-  [169] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_tuple_repeat1, 2, 0, 34),
-  [171] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_file, 1, 0, 0),
-  [173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
-  [175] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0),
-  [177] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(142),
-  [180] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(52),
-  [183] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(9),
-  [186] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(136),
-  [189] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(124),
-  [192] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(82),
-  [195] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(130),
-  [198] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(3),
-  [201] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(123),
-  [204] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unary_op, 1, 0, 0),
-  [206] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unary_op, 1, 0, 0),
-  [208] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 5, 0, 39),
-  [210] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_import_repeat1, 2, 0, 25),
-  [212] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 4, 0, 26),
-  [214] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 7, 0, 50),
-  [216] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 1, 0, 18),
-  [218] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias, 4, 0, 24),
-  [220] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assumption, 3, 0, 20),
-  [222] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 4, 0, 29),
-  [224] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 4, 0, 28),
-  [226] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 3, 0, 19),
-  [228] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 5, 0, 40),
-  [230] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rule, 5, 0, 38),
+  [133] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 10),
+  [135] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 10),
+  [137] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple, 4, 0, 35),
+  [139] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple, 4, 0, 35),
+  [141] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expr, 1, 0, 11),
+  [143] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expr, 1, 0, 11),
+  [145] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 4, 0, 38),
+  [147] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 4, 0, 38),
+  [149] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 4, 0, 40),
+  [151] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 4, 0, 40),
+  [153] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 5, 0, 46),
+  [155] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 5, 0, 46),
+  [157] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_aggregate, 6, 0, 53),
+  [159] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_aggregate, 6, 0, 53),
+  [161] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
+  [163] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_rule_body, 1, 0, 13),
+  [165] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rule_body, 1, 0, 13),
+  [167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
+  [169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
+  [171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
+  [173] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_rule_body_repeat1, 2, 0, 32),
+  [175] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_rule_body_repeat1, 2, 0, 32),
+  [177] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_file, 1, 0, 0),
+  [179] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
+  [181] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0),
+  [183] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(158),
+  [186] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(55),
+  [189] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(11),
+  [192] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(139),
+  [195] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(152),
+  [198] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(87),
+  [201] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(159),
+  [204] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(3),
+  [207] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_file_repeat1, 2, 0, 0), SHIFT_REPEAT(146),
+  [210] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_tuple_repeat1, 2, 0, 34),
+  [212] = {.entry = {.count = 1, .reusable = false}}, SHIFT(64),
+  [214] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
+  [216] = {.entry = {.count = 1, .reusable = false}}, SHIFT(67),
+  [218] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
+  [220] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unary_op, 1, 0, 0),
+  [222] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_unary_op, 1, 0, 0),
+  [224] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 5, 0, 42),
+  [226] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_import_repeat1, 2, 0, 25),
+  [228] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 4, 0, 26),
+  [230] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 7, 0, 55),
   [232] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 4, 0, 30),
-  [234] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rule, 4, 0, 31),
-  [236] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 5, 0, 41),
-  [238] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 5, 0, 42),
-  [240] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 6, 0, 43),
-  [242] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 4, 0, 44),
-  [244] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 4, 0, 45),
-  [246] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 6, 0, 47),
-  [248] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rule, 6, 0, 48),
-  [250] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rule, 3, 0, 16),
-  [252] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assumption, 7, 0, 53),
-  [254] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 7, 0, 52),
-  [256] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comment, 2, 0, 0),
-  [258] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 8, 0, 54),
-  [260] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_rule_body_repeat1, 2, 0, 33), SHIFT_REPEAT(17),
-  [263] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_rule_body_repeat1, 2, 0, 33),
-  [265] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rule_body, 2, 0, 21),
-  [267] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
-  [269] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
-  [271] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
-  [273] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
-  [275] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
-  [277] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
-  [279] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
-  [281] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
-  [283] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_import_repeat2, 2, 0, 51), SHIFT_REPEAT(140),
-  [286] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_import_repeat2, 2, 0, 51),
-  [288] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
-  [290] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
-  [292] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_tuple_repeat1, 2, 0, 36), SHIFT_REPEAT(20),
-  [295] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_tuple_repeat1, 2, 0, 36),
-  [297] = {.entry = {.count = 1, .reusable = true}}, SHIFT(140),
-  [299] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
-  [301] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
-  [303] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
-  [305] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
-  [307] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
-  [309] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
-  [311] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
-  [313] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
-  [315] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
-  [317] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_type_repeat1, 2, 0, 46), SHIFT_REPEAT(103),
-  [320] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_repeat1, 2, 0, 46),
-  [322] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
-  [324] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
-  [326] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
-  [328] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
-  [330] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
-  [332] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
-  [334] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
-  [336] = {.entry = {.count = 1, .reusable = true}}, SHIFT(143),
-  [338] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_repeat1, 2, 0, 44),
-  [340] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
-  [342] = {.entry = {.count = 1, .reusable = true}}, SHIFT(144),
-  [344] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
-  [346] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_import_repeat2, 2, 0, 49),
-  [348] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
-  [350] = {.entry = {.count = 1, .reusable = true}}, SHIFT(135),
-  [352] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110),
-  [354] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_import_repeat1, 2, 0, 27), SHIFT_REPEAT(145),
-  [357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
-  [359] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
-  [361] = {.entry = {.count = 1, .reusable = true}}, SHIFT(125),
-  [363] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
-  [365] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
-  [367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
-  [369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
-  [371] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
-  [373] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
-  [375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
-  [377] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
-  [379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
-  [381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
-  [383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
-  [385] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
-  [387] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
-  [389] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
-  [391] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
-  [393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
-  [395] = {.entry = {.count = 1, .reusable = false}}, SHIFT(139),
-  [397] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147),
-  [399] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
-  [401] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [403] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
-  [405] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
-  [407] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
-  [409] = {.entry = {.count = 1, .reusable = true}}, SHIFT(146),
+  [234] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rule, 3, 0, 16),
+  [236] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 1, 0, 18),
+  [238] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 3, 0, 19),
+  [240] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rule, 4, 0, 31),
+  [242] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rule, 5, 0, 41),
+  [244] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assumption, 3, 0, 20),
+  [246] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 5, 0, 44),
+  [248] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 5, 0, 43),
+  [250] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 5, 0, 45),
+  [252] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias, 4, 0, 24),
+  [254] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 6, 0, 47),
+  [256] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 4, 0, 48),
+  [258] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 4, 0, 49),
+  [260] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 6, 0, 51),
+  [262] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rule, 6, 0, 52),
+  [264] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 8, 0, 60),
+  [266] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 7, 0, 57),
+  [268] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 4, 0, 28),
+  [270] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definition, 4, 0, 29),
+  [272] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assumption, 7, 0, 58),
+  [274] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comment, 2, 0, 0),
+  [276] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
+  [278] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
+  [280] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
+  [282] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_rule_body_repeat1, 2, 0, 33), SHIFT_REPEAT(22),
+  [285] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_rule_body_repeat1, 2, 0, 33),
+  [287] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
+  [289] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
+  [291] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
+  [293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(148),
+  [295] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rule_body, 2, 0, 21),
+  [297] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
+  [299] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
+  [301] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
+  [303] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
+  [305] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_import_repeat2, 2, 0, 56), SHIFT_REPEAT(157),
+  [308] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_import_repeat2, 2, 0, 56),
+  [310] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
+  [312] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
+  [314] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_tuple_repeat1, 2, 0, 36), SHIFT_REPEAT(21),
+  [317] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_tuple_repeat1, 2, 0, 36),
+  [319] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
+  [321] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_aggregate_repeat1, 2, 0, 39), SHIFT_REPEAT(155),
+  [324] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_aggregate_repeat1, 2, 0, 39),
+  [326] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
+  [328] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
+  [330] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
+  [332] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
+  [334] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112),
+  [336] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
+  [338] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21),
+  [340] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [342] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
+  [344] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
+  [346] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
+  [348] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
+  [350] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_type_repeat1, 2, 0, 50), SHIFT_REPEAT(112),
+  [353] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_repeat1, 2, 0, 50),
+  [355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
+  [357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(132),
+  [359] = {.entry = {.count = 1, .reusable = true}}, SHIFT(140),
+  [361] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
+  [363] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
+  [365] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
+  [367] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61),
+  [369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(135),
+  [371] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_aggregate_repeat1, 2, 0, 37),
+  [373] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_import_repeat2, 2, 0, 54),
+  [375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
+  [377] = {.entry = {.count = 1, .reusable = true}}, SHIFT(160),
+  [379] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_repeat1, 2, 0, 48),
+  [381] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
+  [383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
+  [385] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_import_repeat1, 2, 0, 27), SHIFT_REPEAT(138),
+  [388] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
+  [390] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
+  [392] = {.entry = {.count = 1, .reusable = true}}, SHIFT(153),
+  [394] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
+  [396] = {.entry = {.count = 1, .reusable = true}}, SHIFT(121),
+  [398] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
+  [400] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
+  [402] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
+  [404] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
+  [406] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147),
+  [408] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
+  [410] = {.entry = {.count = 1, .reusable = true}}, SHIFT(144),
+  [412] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
+  [414] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
+  [416] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
+  [418] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
+  [420] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
+  [422] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
+  [424] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
+  [426] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [428] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
+  [430] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
+  [432] = {.entry = {.count = 1, .reusable = true}}, SHIFT(134),
+  [434] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
+  [436] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
+  [438] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
+  [440] = {.entry = {.count = 1, .reusable = false}}, SHIFT(156),
+  [442] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
+  [444] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
+  [446] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
+  [448] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
+  [450] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
 };
 
 #ifdef __cplusplus