diff --git a/spec/fixtures/grammars/arithmetic.cc b/spec/fixtures/grammars/arithmetic.cc
index 7659b7e6..da723931 100644
--- a/spec/fixtures/grammars/arithmetic.cc
+++ b/spec/fixtures/grammars/arithmetic.cc
@@ -7,7 +7,8 @@ using tree_sitter::Grammar;
 using namespace tree_sitter::rules;
 
 extern const Grammar arithmetic = Grammar({
-    { "expression", choice({
+    { "program", sym("_expression") },
+    { "_expression", choice({
         sym("sum"),
         sym("difference"),
         sym("product"),
@@ -17,12 +18,12 @@ extern const Grammar arithmetic = Grammar({
         sym("number"),
         sym("variable") }) },
 
-    { "sum", infix_op("+", "expression", 1) },
-    { "difference", infix_op("-", "expression", 1) },
-    { "product", infix_op("*", "expression", 2) },
-    { "quotient", infix_op("/", "expression", 2) },
-    { "exponent", infix_op("^", "expression", 3) },
-    { "group", in_parens(err(sym("expression"))) },
+    { "sum", infix_op("+", "_expression", 1) },
+    { "difference", infix_op("-", "_expression", 1) },
+    { "product", infix_op("*", "_expression", 2) },
+    { "quotient", infix_op("/", "_expression", 2) },
+    { "exponent", infix_op("^", "_expression", 3) },
+    { "group", in_parens(err(sym("_expression"))) },
 
     { "number", pattern("\\d+") },
 
diff --git a/spec/fixtures/grammars/c.cc b/spec/fixtures/grammars/c.cc
index eab376f4..943e0772 100644
--- a/spec/fixtures/grammars/c.cc
+++ b/spec/fixtures/grammars/c.cc
@@ -15,7 +15,7 @@ extern const Grammar c = Grammar({
 
     { "function_definition", seq({
         optional(sym("declaration_specifiers")),
-        sym("type_specifier"),
+        sym("_type_specifier"),
         sym("declarator"),
         repeat(sym("declaration")),
         sym("compound_statement") }) },
@@ -31,15 +31,17 @@ extern const Grammar c = Grammar({
         str("auto"),
         str("register") }) },
 
-    { "type_specifier", choice({
+    { "_type_specifier", choice({
         sym("struct_specifier"),
-        seq({
-            repeat(choice({
-                str("signed"),
-                str("unsigned"),
-                str("long"),
-                str("short") })),
-            sym("identifier") }) }) },
+        sym("type_name") }) },
+
+    { "type_name", seq({
+        repeat(choice({
+            str("signed"),
+            str("unsigned"),
+            str("long"),
+            str("short") })),
+        sym("identifier") }) },
 
     { "struct_specifier", seq({
         str("struct"),
@@ -50,21 +52,21 @@ extern const Grammar c = Grammar({
             str("}") }) }) },
 
     { "struct_declaration", seq({
-        sym("type_specifier"),
+        sym("_type_specifier"),
         sym("declarator") }) },
 
     { "parameter_declaration", seq({
         optional(sym("declaration_specifiers")),
-        sym("type_specifier"),
+        sym("_type_specifier"),
         sym("declarator") }) },
 
     { "declaration", seq({
         optional(sym("declaration_specifiers")),
-        sym("type_specifier"),
-        comma_sep1(sym("init_declarator")),
+        sym("_type_specifier"),
+        comma_sep1(sym("_init_declarator")),
         str(";") }) },
 
-    { "init_declarator", choice({
+    { "_init_declarator", choice({
         sym("declarator"),
         seq({ sym("declarator"), str("="), sym("initializer") }) }) },
 
@@ -99,21 +101,21 @@ extern const Grammar c = Grammar({
 
     { "declarator", seq({
         repeat(sym("pointer")),
-        sym("direct_declarator") }) },
+        sym("_direct_declarator") }) },
 
-    { "direct_declarator", choice({
+    { "_direct_declarator", choice({
         sym("identifier"),
         seq({
             str("("),
             sym("declarator"),
             str(")") }),
         seq({
-            sym("direct_declarator"),
+            sym("_direct_declarator"),
             str("["),
             optional(sym("expression")),
             str("]") }),
         seq({
-            sym("direct_declarator"),
+            sym("_direct_declarator"),
             str("("),
             comma_sep(sym("parameter_declaration")),
             str(")") }) }) },
@@ -165,7 +167,7 @@ extern const Grammar c = Grammar({
     sym("comment"),
     pattern("[ \t\r\n]"),
 }).expected_conflicts({
-  { "type_specifier", "expression" },
+  { "type_name", "expression" },
 });
 
 }  // namespace tree_sitter_examples
diff --git a/spec/fixtures/grammars/golang.cc b/spec/fixtures/grammars/golang.cc
index a2ac52bc..e98870f3 100644
--- a/spec/fixtures/grammars/golang.cc
+++ b/spec/fixtures/grammars/golang.cc
@@ -16,7 +16,7 @@ extern const Grammar golang = Grammar({
     { "program", seq({
         sym("package_directive"),
         repeat(sym("imports_block")),
-        repeat(sym("declaration")) }) },
+        repeat(sym("_declaration")) }) },
     { "package_directive", seq({
         str("package"),
         sym("package_name") }) },
@@ -26,7 +26,7 @@ extern const Grammar golang = Grammar({
             in_parens(err(repeat(sym("package_import")))),
             sym("package_import") }) }) },
     { "package_import", sym("string") },
-    { "declaration", choice({
+    { "_declaration", choice({
         sym("type_declaration"),
         sym("var_declaration"),
         sym("func_declaration") }) },
@@ -35,23 +35,23 @@ extern const Grammar golang = Grammar({
     { "type_declaration", terminated(seq({
         str("type"),
         sym("type_name"),
-        sym("type_expression") })) },
+        sym("_type_expression") })) },
     { "var_declaration", terminated(seq({
         str("var"),
         sym("var_name"),
         choice({
             seq({
-                optional(sym("type_expression")),
+                optional(sym("_type_expression")),
                 str("="),
-                sym("expression") }),
-            sym("type_expression") }) })) },
+                sym("_expression") }),
+            sym("_type_expression") }) })) },
     { "func_declaration", terminated(seq({
         str("func"),
         sym("var_name"),
         sym("_func_signature"),
         sym("block_statement") })) },
-    { "block_statement", in_braces(err(repeat(sym("statement")))) },
-    { "type_expression", choice({
+    { "block_statement", in_braces(err(repeat(sym("_statement")))) },
+    { "_type_expression", choice({
         sym("pointer_type"),
         sym("slice_type"),
         sym("map_type"),
@@ -62,19 +62,19 @@ extern const Grammar golang = Grammar({
     // Type expressions
     { "pointer_type", seq({
         str("*"),
-        sym("type_expression") }) },
+        sym("_type_expression") }) },
     { "map_type", seq({
         str("map"),
-        in_brackets(sym("type_expression")),
-        sym("type_expression") }) },
+        in_brackets(sym("_type_expression")),
+        sym("_type_expression") }) },
     { "slice_type", seq({
         in_brackets(blank()),
-        sym("type_expression") }) },
+        sym("_type_expression") }) },
     { "struct_type", seq({
         str("struct"),
         in_braces(repeat(seq({
             sym("var_name"),
-            sym("type_expression") }))) }) },
+            sym("_type_expression") }))) }) },
     { "interface_type", seq({
         str("interface"),
         in_braces(repeat(seq({
@@ -82,42 +82,41 @@ extern const Grammar golang = Grammar({
             sym("_func_signature") }))) }) },
 
     // Statements
-    { "statement", choice({
+    { "_statement", choice({
         sym("expression_statement"),
         sym("return_statement"),
-        sym("declaration_statement"),
+        sym("var_declaration"),
+        sym("short_var_declaration"),
         sym("range_statement"),
         sym("if_statement") }) },
     { "return_statement", terminated(seq({
         str("return"),
-        comma_sep(sym("expression")) })) },
-    { "declaration_statement", choice({
-        sym("var_declaration"),
-        terminated(seq({
-            comma_sep(sym("var_name")),
-            str(":="),
-            sym("expression") })) }) },
+        comma_sep(sym("_expression")) })) },
+    { "short_var_declaration", terminated(seq({
+        comma_sep(sym("var_name")),
+        str(":="),
+        sym("_expression") })) },
     { "range_statement", seq({
         str("for"),
         sym("var_name"),
         optional(seq({ str(","), sym("var_name") })),
         str(":="),
         str("range"),
-        sym("expression"),
+        sym("_expression"),
         sym("block_statement") }) },
     { "if_statement", seq({
         str("if"),
-        sym("expression"),
+        sym("_expression"),
         sym("block_statement"),
         optional(seq({
             str("else"),
             choice({
                 sym("if_statement"),
                 sym("block_statement") }) })) }) },
-    { "expression_statement", terminated(sym("expression")) },
+    { "expression_statement", terminated(sym("_expression")) },
 
     // Value expressions
-    { "expression", choice({
+    { "_expression", choice({
         sym("call_expression"),
         sym("selector_expression"),
         sym("math_op"),
@@ -126,30 +125,30 @@ extern const Grammar golang = Grammar({
         sym("string"),
         sym("var_name") }) },
     { "call_expression", seq({
-        sym("expression"),
-        in_parens(comma_sep(sym("expression"))) }) },
+        sym("_expression"),
+        in_parens(comma_sep(sym("_expression"))) }) },
     { "selector_expression", seq({
-        sym("expression"),
+        sym("_expression"),
         str("."),
         sym("var_name") }) },
     { "math_op", choice({
-        infix_op("*", "expression", 2),
-        infix_op("/", "expression", 2),
-        infix_op("+", "expression", 1),
-        infix_op("-", "expression", 1) }) },
+        infix_op("*", "_expression", 2),
+        infix_op("/", "_expression", 2),
+        infix_op("+", "_expression", 1),
+        infix_op("-", "_expression", 1) }) },
     { "bool_op", choice({
-        infix_op("||", "expression", 1),
-        infix_op("&&", "expression", 2),
-        infix_op("==", "expression", 3),
-        infix_op("<=", "expression", 3),
-        infix_op("<", "expression", 3),
-        infix_op(">=", "expression", 3),
-        infix_op(">", "expression", 3),
-        prefix_op("!", "expression", 4) }) },
+        infix_op("||", "_expression", 1),
+        infix_op("&&", "_expression", 2),
+        infix_op("==", "_expression", 3),
+        infix_op("<=", "_expression", 3),
+        infix_op("<", "_expression", 3),
+        infix_op(">=", "_expression", 3),
+        infix_op(">", "_expression", 3),
+        prefix_op("!", "_expression", 4) }) },
     { "_func_signature", prec(10, seq({
         in_parens(comma_sep(seq({
             comma_sep1(sym("var_name")),
-            sym("type_expression") }))),
+            sym("_type_expression") }))),
         choice({
             in_parens(choice({
                 comma_sep1(seq({ sym("var_name"), sym("type_name") })),
diff --git a/spec/fixtures/grammars/json.cc b/spec/fixtures/grammars/json.cc
index 503a141d..f21445c4 100644
--- a/spec/fixtures/grammars/json.cc
+++ b/spec/fixtures/grammars/json.cc
@@ -7,7 +7,7 @@ using tree_sitter::Grammar;
 using namespace tree_sitter::rules;
 
 extern const Grammar json = Grammar({
-    { "value", choice({
+    { "_value", choice({
         sym("object"),
         sym("array"),
         sym("string"),
@@ -18,8 +18,8 @@ extern const Grammar json = Grammar({
     { "object", in_braces(comma_sep(err(seq({
         sym("string"),
         str(":"),
-        sym("value") })))) },
-    { "array", in_brackets(comma_sep(err(sym("value")))) },
+        sym("_value") })))) },
+    { "array", in_brackets(comma_sep(err(sym("_value")))) },
     { "string", pattern("\"([^\"]|\\\\\")*\"") },
     { "number", pattern("\\d+(\\.\\d+)?") },
     { "null", str("null") },
diff --git a/spec/fixtures/parsers/arithmetic.c b/spec/fixtures/parsers/arithmetic.c
index 2a48fd4b..148e6ef0 100644
--- a/spec/fixtures/parsers/arithmetic.c
+++ b/spec/fixtures/parsers/arithmetic.c
@@ -1,10 +1,11 @@
 #include "tree_sitter/parser.h"
 
-#define STATE_COUNT 32
-#define SYMBOL_COUNT 19
+#define STATE_COUNT 33
+#define SYMBOL_COUNT 20
 
 enum {
-    sym_expression = ts_builtin_sym_start,
+    sym_program = ts_builtin_sym_start,
+    sym__expression,
     sym_sum,
     sym_difference,
     sym_product,
@@ -24,7 +25,8 @@ enum {
 };
 
 static const char *ts_symbol_names[] = {
-    [sym_expression] = "expression",
+    [sym_program] = "program",
+    [sym__expression] = "_expression",
     [sym_sum] = "sum",
     [sym_difference] = "difference",
     [sym_product] = "product",
@@ -46,6 +48,7 @@ static const char *ts_symbol_names[] = {
 };
 
 static const int ts_hidden_symbol_flags[SYMBOL_COUNT] = {
+    [sym__expression] = 1,
     [aux_sym_STR_PLUS] = 1,
     [aux_sym_STR_DASH] = 1,
     [aux_sym_STR_STAR] = 1,
@@ -110,69 +113,67 @@ static TSTree *ts_lex(TSLexer *lexer, TSStateId lex_state) {
                 ADVANCE(7);
             if (lookahead == '#')
                 ADVANCE(2);
-            if (lookahead == '*')
-                ADVANCE(9);
-            if (lookahead == '+')
-                ADVANCE(10);
-            if (lookahead == '-')
-                ADVANCE(11);
-            if (lookahead == '/')
-                ADVANCE(12);
-            if (lookahead == '^')
-                ADVANCE(13);
             LEX_ERROR();
         case 8:
             ACCEPT_TOKEN(ts_builtin_sym_end);
         case 9:
-            ACCEPT_TOKEN(aux_sym_STR_STAR);
-        case 10:
-            ACCEPT_TOKEN(aux_sym_STR_PLUS);
-        case 11:
-            ACCEPT_TOKEN(aux_sym_STR_DASH);
-        case 12:
-            ACCEPT_TOKEN(aux_sym_STR_SLASH);
-        case 13:
-            ACCEPT_TOKEN(aux_sym_STR_CARET);
-        case 14:
-            START_TOKEN();
-            if ((lookahead == '\t') ||
-                (lookahead == '\n') ||
-                (lookahead == '\r') ||
-                (lookahead == ' '))
-                ADVANCE(14);
-            if (lookahead == '#')
-                ADVANCE(2);
-            if (lookahead == ')')
-                ADVANCE(15);
-            if (lookahead == '*')
-                ADVANCE(9);
-            if (lookahead == '+')
-                ADVANCE(10);
-            if (lookahead == '-')
-                ADVANCE(11);
-            if (lookahead == '/')
-                ADVANCE(12);
-            if (lookahead == '^')
-                ADVANCE(13);
-            LEX_ERROR();
-        case 15:
-            ACCEPT_TOKEN(aux_sym_STR_RPAREN);
-        case 16:
-            START_TOKEN();
-            if ((lookahead == '\t') ||
-                (lookahead == '\n') ||
-                (lookahead == '\r') ||
-                (lookahead == ' '))
-                ADVANCE(16);
-            if (lookahead == '#')
-                ADVANCE(2);
-            if (lookahead == ')')
-                ADVANCE(15);
-            LEX_ERROR();
-        case 17:
             START_TOKEN();
             if (lookahead == 0)
                 ADVANCE(8);
+            if ((lookahead == '\t') ||
+                (lookahead == '\n') ||
+                (lookahead == '\r') ||
+                (lookahead == ' '))
+                ADVANCE(9);
+            if (lookahead == '#')
+                ADVANCE(2);
+            if (lookahead == '*')
+                ADVANCE(10);
+            if (lookahead == '+')
+                ADVANCE(11);
+            if (lookahead == '-')
+                ADVANCE(12);
+            if (lookahead == '/')
+                ADVANCE(13);
+            if (lookahead == '^')
+                ADVANCE(14);
+            LEX_ERROR();
+        case 10:
+            ACCEPT_TOKEN(aux_sym_STR_STAR);
+        case 11:
+            ACCEPT_TOKEN(aux_sym_STR_PLUS);
+        case 12:
+            ACCEPT_TOKEN(aux_sym_STR_DASH);
+        case 13:
+            ACCEPT_TOKEN(aux_sym_STR_SLASH);
+        case 14:
+            ACCEPT_TOKEN(aux_sym_STR_CARET);
+        case 15:
+            START_TOKEN();
+            if ((lookahead == '\t') ||
+                (lookahead == '\n') ||
+                (lookahead == '\r') ||
+                (lookahead == ' '))
+                ADVANCE(15);
+            if (lookahead == '#')
+                ADVANCE(2);
+            if (lookahead == ')')
+                ADVANCE(16);
+            if (lookahead == '*')
+                ADVANCE(10);
+            if (lookahead == '+')
+                ADVANCE(11);
+            if (lookahead == '-')
+                ADVANCE(12);
+            if (lookahead == '/')
+                ADVANCE(13);
+            if (lookahead == '^')
+                ADVANCE(14);
+            LEX_ERROR();
+        case 16:
+            ACCEPT_TOKEN(aux_sym_STR_RPAREN);
+        case 17:
+            START_TOKEN();
             if ((lookahead == '\t') ||
                 (lookahead == '\n') ||
                 (lookahead == '\r') ||
@@ -180,18 +181,32 @@ static TSTree *ts_lex(TSLexer *lexer, TSStateId lex_state) {
                 ADVANCE(17);
             if (lookahead == '#')
                 ADVANCE(2);
+            if (lookahead == ')')
+                ADVANCE(16);
+            LEX_ERROR();
+        case 18:
+            START_TOKEN();
+            if (lookahead == 0)
+                ADVANCE(8);
+            if ((lookahead == '\t') ||
+                (lookahead == '\n') ||
+                (lookahead == '\r') ||
+                (lookahead == ' '))
+                ADVANCE(18);
+            if (lookahead == '#')
+                ADVANCE(2);
             if (lookahead == '(')
                 ADVANCE(3);
             if (lookahead == ')')
-                ADVANCE(15);
+                ADVANCE(16);
             if (lookahead == '*')
-                ADVANCE(9);
-            if (lookahead == '+')
                 ADVANCE(10);
-            if (lookahead == '-')
+            if (lookahead == '+')
                 ADVANCE(11);
-            if (lookahead == '/')
+            if (lookahead == '-')
                 ADVANCE(12);
+            if (lookahead == '/')
+                ADVANCE(13);
             if ('0' <= lookahead && lookahead <= '9')
                 ADVANCE(4);
             if (('A' <= lookahead && lookahead <= 'Z') ||
@@ -199,7 +214,7 @@ static TSTree *ts_lex(TSLexer *lexer, TSStateId lex_state) {
                 (945 <= lookahead && lookahead <= 969))
                 ADVANCE(5);
             if (lookahead == '^')
-                ADVANCE(13);
+                ADVANCE(14);
             LEX_ERROR();
         case ts_lex_state_error:
             START_TOKEN();
@@ -209,21 +224,21 @@ static TSTree *ts_lex(TSLexer *lexer, TSStateId lex_state) {
                 (lookahead == '\n') ||
                 (lookahead == '\r') ||
                 (lookahead == ' '))
-                ADVANCE(17);
+                ADVANCE(18);
             if (lookahead == '#')
                 ADVANCE(2);
             if (lookahead == '(')
                 ADVANCE(3);
             if (lookahead == ')')
-                ADVANCE(15);
+                ADVANCE(16);
             if (lookahead == '*')
-                ADVANCE(9);
-            if (lookahead == '+')
                 ADVANCE(10);
-            if (lookahead == '-')
+            if (lookahead == '+')
                 ADVANCE(11);
-            if (lookahead == '/')
+            if (lookahead == '-')
                 ADVANCE(12);
+            if (lookahead == '/')
+                ADVANCE(13);
             if ('0' <= lookahead && lookahead <= '9')
                 ADVANCE(4);
             if (('A' <= lookahead && lookahead <= 'Z') ||
@@ -231,7 +246,7 @@ static TSTree *ts_lex(TSLexer *lexer, TSStateId lex_state) {
                 (945 <= lookahead && lookahead <= 969))
                 ADVANCE(5);
             if (lookahead == '^')
-                ADVANCE(13);
+                ADVANCE(14);
             LEX_ERROR();
         default:
             LEX_ERROR();
@@ -241,36 +256,37 @@ static TSTree *ts_lex(TSLexer *lexer, TSStateId lex_state) {
 static TSStateId ts_lex_states[STATE_COUNT] = {
     [0] = 1,
     [1] = 7,
-    [2] = 7,
-    [3] = 1,
-    [4] = 14,
-    [5] = 14,
-    [6] = 16,
-    [7] = 1,
-    [8] = 14,
-    [9] = 16,
-    [10] = 14,
-    [11] = 1,
+    [2] = 9,
+    [3] = 9,
+    [4] = 1,
+    [5] = 15,
+    [6] = 15,
+    [7] = 17,
+    [8] = 1,
+    [9] = 15,
+    [10] = 17,
+    [11] = 15,
     [12] = 1,
     [13] = 1,
     [14] = 1,
     [15] = 1,
-    [16] = 14,
-    [17] = 14,
-    [18] = 14,
-    [19] = 14,
-    [20] = 14,
-    [21] = 7,
-    [22] = 1,
+    [16] = 1,
+    [17] = 15,
+    [18] = 15,
+    [19] = 15,
+    [20] = 15,
+    [21] = 15,
+    [22] = 9,
     [23] = 1,
     [24] = 1,
     [25] = 1,
     [26] = 1,
-    [27] = 7,
-    [28] = 7,
-    [29] = 7,
-    [30] = 7,
-    [31] = 7,
+    [27] = 1,
+    [28] = 9,
+    [29] = 9,
+    [30] = 9,
+    [31] = 9,
+    [32] = 9,
 };
 
 #pragma GCC diagnostic push
@@ -278,100 +294,105 @@ static TSStateId ts_lex_states[STATE_COUNT] = {
 
 static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
     [0] = {
-        [sym_expression] = ACTIONS(SHIFT(1)),
-        [sym_sum] = ACTIONS(SHIFT(2)),
-        [sym_difference] = ACTIONS(SHIFT(2)),
-        [sym_product] = ACTIONS(SHIFT(2)),
-        [sym_quotient] = ACTIONS(SHIFT(2)),
-        [sym_exponent] = ACTIONS(SHIFT(2)),
-        [sym_group] = ACTIONS(SHIFT(2)),
-        [sym_number] = ACTIONS(SHIFT(2)),
-        [sym_variable] = ACTIONS(SHIFT(2)),
+        [sym_program] = ACTIONS(SHIFT(1)),
+        [sym__expression] = ACTIONS(SHIFT(2)),
+        [sym_sum] = ACTIONS(SHIFT(3)),
+        [sym_difference] = ACTIONS(SHIFT(3)),
+        [sym_product] = ACTIONS(SHIFT(3)),
+        [sym_quotient] = ACTIONS(SHIFT(3)),
+        [sym_exponent] = ACTIONS(SHIFT(3)),
+        [sym_group] = ACTIONS(SHIFT(3)),
+        [sym_number] = ACTIONS(SHIFT(3)),
+        [sym_variable] = ACTIONS(SHIFT(3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(4)),
     },
     [1] = {
         [ts_builtin_sym_end] = ACTIONS(ACCEPT_INPUT()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(22)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(23)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(24)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(25)),
-        [aux_sym_STR_CARET] = ACTIONS(SHIFT(26)),
     },
     [2] = {
-        [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_expression, 1)),
+        [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_program, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_CARET] = ACTIONS(REDUCE(sym_expression, 1)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(23)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(24)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(25)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(26)),
+        [aux_sym_STR_CARET] = ACTIONS(SHIFT(27)),
     },
     [3] = {
-        [sym_expression] = ACTIONS(SHIFT(4)),
-        [sym_sum] = ACTIONS(SHIFT(5)),
-        [sym_difference] = ACTIONS(SHIFT(5)),
-        [sym_product] = ACTIONS(SHIFT(5)),
-        [sym_quotient] = ACTIONS(SHIFT(5)),
-        [sym_exponent] = ACTIONS(SHIFT(5)),
-        [sym_group] = ACTIONS(SHIFT(5)),
-        [ts_builtin_sym_error] = ACTIONS(SHIFT(6)),
-        [sym_number] = ACTIONS(SHIFT(5)),
-        [sym_variable] = ACTIONS(SHIFT(5)),
+        [ts_builtin_sym_end] = ACTIONS(REDUCE(sym__expression, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(7)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_CARET] = ACTIONS(REDUCE(sym__expression, 1)),
     },
     [4] = {
+        [sym__expression] = ACTIONS(SHIFT(5)),
+        [sym_sum] = ACTIONS(SHIFT(6)),
+        [sym_difference] = ACTIONS(SHIFT(6)),
+        [sym_product] = ACTIONS(SHIFT(6)),
+        [sym_quotient] = ACTIONS(SHIFT(6)),
+        [sym_exponent] = ACTIONS(SHIFT(6)),
+        [sym_group] = ACTIONS(SHIFT(6)),
+        [ts_builtin_sym_error] = ACTIONS(SHIFT(7)),
+        [sym_number] = ACTIONS(SHIFT(6)),
+        [sym_variable] = ACTIONS(SHIFT(6)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(12)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(13)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(14)),
-        [aux_sym_STR_CARET] = ACTIONS(SHIFT(15)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(8)),
     },
     [5] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_CARET] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_expression, 1)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(13)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(14)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(15)),
+        [aux_sym_STR_CARET] = ACTIONS(SHIFT(16)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(22)),
     },
     [6] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_CARET] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym__expression, 1)),
     },
     [7] = {
-        [sym_expression] = ACTIONS(SHIFT(8)),
-        [sym_sum] = ACTIONS(SHIFT(5)),
-        [sym_difference] = ACTIONS(SHIFT(5)),
-        [sym_product] = ACTIONS(SHIFT(5)),
-        [sym_quotient] = ACTIONS(SHIFT(5)),
-        [sym_exponent] = ACTIONS(SHIFT(5)),
-        [sym_group] = ACTIONS(SHIFT(5)),
-        [ts_builtin_sym_error] = ACTIONS(SHIFT(9)),
-        [sym_number] = ACTIONS(SHIFT(5)),
-        [sym_variable] = ACTIONS(SHIFT(5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(7)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(22)),
     },
     [8] = {
+        [sym__expression] = ACTIONS(SHIFT(9)),
+        [sym_sum] = ACTIONS(SHIFT(6)),
+        [sym_difference] = ACTIONS(SHIFT(6)),
+        [sym_product] = ACTIONS(SHIFT(6)),
+        [sym_quotient] = ACTIONS(SHIFT(6)),
+        [sym_exponent] = ACTIONS(SHIFT(6)),
+        [sym_group] = ACTIONS(SHIFT(6)),
+        [ts_builtin_sym_error] = ACTIONS(SHIFT(10)),
+        [sym_number] = ACTIONS(SHIFT(6)),
+        [sym_variable] = ACTIONS(SHIFT(6)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(12)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(13)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(14)),
-        [aux_sym_STR_CARET] = ACTIONS(SHIFT(15)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(8)),
     },
     [9] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(13)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(14)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(15)),
+        [aux_sym_STR_CARET] = ACTIONS(SHIFT(16)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(11)),
     },
     [10] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(11)),
+    },
+    [11] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_group, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym_group, 3)),
@@ -380,72 +401,72 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_CARET] = ACTIONS(REDUCE(sym_group, 3)),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_group, 3)),
     },
-    [11] = {
-        [sym_expression] = ACTIONS(SHIFT(20)),
-        [sym_sum] = ACTIONS(SHIFT(5)),
-        [sym_difference] = ACTIONS(SHIFT(5)),
-        [sym_product] = ACTIONS(SHIFT(5)),
-        [sym_quotient] = ACTIONS(SHIFT(5)),
-        [sym_exponent] = ACTIONS(SHIFT(5)),
-        [sym_group] = ACTIONS(SHIFT(5)),
-        [sym_number] = ACTIONS(SHIFT(5)),
-        [sym_variable] = ACTIONS(SHIFT(5)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(7)),
-    },
     [12] = {
-        [sym_expression] = ACTIONS(SHIFT(19)),
-        [sym_sum] = ACTIONS(SHIFT(5)),
-        [sym_difference] = ACTIONS(SHIFT(5)),
-        [sym_product] = ACTIONS(SHIFT(5)),
-        [sym_quotient] = ACTIONS(SHIFT(5)),
-        [sym_exponent] = ACTIONS(SHIFT(5)),
-        [sym_group] = ACTIONS(SHIFT(5)),
-        [sym_number] = ACTIONS(SHIFT(5)),
-        [sym_variable] = ACTIONS(SHIFT(5)),
+        [sym__expression] = ACTIONS(SHIFT(21)),
+        [sym_sum] = ACTIONS(SHIFT(6)),
+        [sym_difference] = ACTIONS(SHIFT(6)),
+        [sym_product] = ACTIONS(SHIFT(6)),
+        [sym_quotient] = ACTIONS(SHIFT(6)),
+        [sym_exponent] = ACTIONS(SHIFT(6)),
+        [sym_group] = ACTIONS(SHIFT(6)),
+        [sym_number] = ACTIONS(SHIFT(6)),
+        [sym_variable] = ACTIONS(SHIFT(6)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(7)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(8)),
     },
     [13] = {
-        [sym_expression] = ACTIONS(SHIFT(18)),
-        [sym_sum] = ACTIONS(SHIFT(5)),
-        [sym_difference] = ACTIONS(SHIFT(5)),
-        [sym_product] = ACTIONS(SHIFT(5)),
-        [sym_quotient] = ACTIONS(SHIFT(5)),
-        [sym_exponent] = ACTIONS(SHIFT(5)),
-        [sym_group] = ACTIONS(SHIFT(5)),
-        [sym_number] = ACTIONS(SHIFT(5)),
-        [sym_variable] = ACTIONS(SHIFT(5)),
+        [sym__expression] = ACTIONS(SHIFT(20)),
+        [sym_sum] = ACTIONS(SHIFT(6)),
+        [sym_difference] = ACTIONS(SHIFT(6)),
+        [sym_product] = ACTIONS(SHIFT(6)),
+        [sym_quotient] = ACTIONS(SHIFT(6)),
+        [sym_exponent] = ACTIONS(SHIFT(6)),
+        [sym_group] = ACTIONS(SHIFT(6)),
+        [sym_number] = ACTIONS(SHIFT(6)),
+        [sym_variable] = ACTIONS(SHIFT(6)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(7)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(8)),
     },
     [14] = {
-        [sym_expression] = ACTIONS(SHIFT(17)),
-        [sym_sum] = ACTIONS(SHIFT(5)),
-        [sym_difference] = ACTIONS(SHIFT(5)),
-        [sym_product] = ACTIONS(SHIFT(5)),
-        [sym_quotient] = ACTIONS(SHIFT(5)),
-        [sym_exponent] = ACTIONS(SHIFT(5)),
-        [sym_group] = ACTIONS(SHIFT(5)),
-        [sym_number] = ACTIONS(SHIFT(5)),
-        [sym_variable] = ACTIONS(SHIFT(5)),
+        [sym__expression] = ACTIONS(SHIFT(19)),
+        [sym_sum] = ACTIONS(SHIFT(6)),
+        [sym_difference] = ACTIONS(SHIFT(6)),
+        [sym_product] = ACTIONS(SHIFT(6)),
+        [sym_quotient] = ACTIONS(SHIFT(6)),
+        [sym_exponent] = ACTIONS(SHIFT(6)),
+        [sym_group] = ACTIONS(SHIFT(6)),
+        [sym_number] = ACTIONS(SHIFT(6)),
+        [sym_variable] = ACTIONS(SHIFT(6)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(7)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(8)),
     },
     [15] = {
-        [sym_expression] = ACTIONS(SHIFT(16)),
-        [sym_sum] = ACTIONS(SHIFT(5)),
-        [sym_difference] = ACTIONS(SHIFT(5)),
-        [sym_product] = ACTIONS(SHIFT(5)),
-        [sym_quotient] = ACTIONS(SHIFT(5)),
-        [sym_exponent] = ACTIONS(SHIFT(5)),
-        [sym_group] = ACTIONS(SHIFT(5)),
-        [sym_number] = ACTIONS(SHIFT(5)),
-        [sym_variable] = ACTIONS(SHIFT(5)),
+        [sym__expression] = ACTIONS(SHIFT(18)),
+        [sym_sum] = ACTIONS(SHIFT(6)),
+        [sym_difference] = ACTIONS(SHIFT(6)),
+        [sym_product] = ACTIONS(SHIFT(6)),
+        [sym_quotient] = ACTIONS(SHIFT(6)),
+        [sym_exponent] = ACTIONS(SHIFT(6)),
+        [sym_group] = ACTIONS(SHIFT(6)),
+        [sym_number] = ACTIONS(SHIFT(6)),
+        [sym_variable] = ACTIONS(SHIFT(6)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(7)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(8)),
     },
     [16] = {
+        [sym__expression] = ACTIONS(SHIFT(17)),
+        [sym_sum] = ACTIONS(SHIFT(6)),
+        [sym_difference] = ACTIONS(SHIFT(6)),
+        [sym_product] = ACTIONS(SHIFT(6)),
+        [sym_quotient] = ACTIONS(SHIFT(6)),
+        [sym_exponent] = ACTIONS(SHIFT(6)),
+        [sym_group] = ACTIONS(SHIFT(6)),
+        [sym_number] = ACTIONS(SHIFT(6)),
+        [sym_variable] = ACTIONS(SHIFT(6)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(8)),
+    },
+    [17] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_exponent, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_exponent, 3)),
@@ -454,43 +475,43 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_CARET] = ACTIONS(REDUCE_FRAGILE(sym_exponent, 3)),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE_FRAGILE(sym_exponent, 3)),
     },
-    [17] = {
+    [18] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_quotient, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_quotient, 3)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_quotient, 3)),
         [aux_sym_STR_SLASH] = ACTIONS(REDUCE_FRAGILE(sym_quotient, 3)),
-        [aux_sym_STR_CARET] = ACTIONS(SHIFT(15)),
+        [aux_sym_STR_CARET] = ACTIONS(SHIFT(16)),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE_FRAGILE(sym_quotient, 3)),
     },
-    [18] = {
+    [19] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_product, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_product, 3)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_product, 3)),
         [aux_sym_STR_SLASH] = ACTIONS(REDUCE_FRAGILE(sym_product, 3)),
-        [aux_sym_STR_CARET] = ACTIONS(SHIFT(15)),
+        [aux_sym_STR_CARET] = ACTIONS(SHIFT(16)),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE_FRAGILE(sym_product, 3)),
     },
-    [19] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_difference, 3)),
-        [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_difference, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(13)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(14)),
-        [aux_sym_STR_CARET] = ACTIONS(SHIFT(15)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE_FRAGILE(sym_difference, 3)),
-    },
     [20] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_sum, 3)),
-        [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_sum, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(13)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(14)),
-        [aux_sym_STR_CARET] = ACTIONS(SHIFT(15)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE_FRAGILE(sym_sum, 3)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_difference, 3)),
+        [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_difference, 3)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(14)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(15)),
+        [aux_sym_STR_CARET] = ACTIONS(SHIFT(16)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE_FRAGILE(sym_difference, 3)),
     },
     [21] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_sum, 3)),
+        [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_sum, 3)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(14)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(15)),
+        [aux_sym_STR_CARET] = ACTIONS(SHIFT(16)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE_FRAGILE(sym_sum, 3)),
+    },
+    [22] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_group, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_group, 3)),
@@ -499,72 +520,72 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym_group, 3)),
         [aux_sym_STR_CARET] = ACTIONS(REDUCE(sym_group, 3)),
     },
-    [22] = {
-        [sym_expression] = ACTIONS(SHIFT(31)),
-        [sym_sum] = ACTIONS(SHIFT(2)),
-        [sym_difference] = ACTIONS(SHIFT(2)),
-        [sym_product] = ACTIONS(SHIFT(2)),
-        [sym_quotient] = ACTIONS(SHIFT(2)),
-        [sym_exponent] = ACTIONS(SHIFT(2)),
-        [sym_group] = ACTIONS(SHIFT(2)),
-        [sym_number] = ACTIONS(SHIFT(2)),
-        [sym_variable] = ACTIONS(SHIFT(2)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(3)),
-    },
     [23] = {
-        [sym_expression] = ACTIONS(SHIFT(30)),
-        [sym_sum] = ACTIONS(SHIFT(2)),
-        [sym_difference] = ACTIONS(SHIFT(2)),
-        [sym_product] = ACTIONS(SHIFT(2)),
-        [sym_quotient] = ACTIONS(SHIFT(2)),
-        [sym_exponent] = ACTIONS(SHIFT(2)),
-        [sym_group] = ACTIONS(SHIFT(2)),
-        [sym_number] = ACTIONS(SHIFT(2)),
-        [sym_variable] = ACTIONS(SHIFT(2)),
+        [sym__expression] = ACTIONS(SHIFT(32)),
+        [sym_sum] = ACTIONS(SHIFT(3)),
+        [sym_difference] = ACTIONS(SHIFT(3)),
+        [sym_product] = ACTIONS(SHIFT(3)),
+        [sym_quotient] = ACTIONS(SHIFT(3)),
+        [sym_exponent] = ACTIONS(SHIFT(3)),
+        [sym_group] = ACTIONS(SHIFT(3)),
+        [sym_number] = ACTIONS(SHIFT(3)),
+        [sym_variable] = ACTIONS(SHIFT(3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(4)),
     },
     [24] = {
-        [sym_expression] = ACTIONS(SHIFT(29)),
-        [sym_sum] = ACTIONS(SHIFT(2)),
-        [sym_difference] = ACTIONS(SHIFT(2)),
-        [sym_product] = ACTIONS(SHIFT(2)),
-        [sym_quotient] = ACTIONS(SHIFT(2)),
-        [sym_exponent] = ACTIONS(SHIFT(2)),
-        [sym_group] = ACTIONS(SHIFT(2)),
-        [sym_number] = ACTIONS(SHIFT(2)),
-        [sym_variable] = ACTIONS(SHIFT(2)),
+        [sym__expression] = ACTIONS(SHIFT(31)),
+        [sym_sum] = ACTIONS(SHIFT(3)),
+        [sym_difference] = ACTIONS(SHIFT(3)),
+        [sym_product] = ACTIONS(SHIFT(3)),
+        [sym_quotient] = ACTIONS(SHIFT(3)),
+        [sym_exponent] = ACTIONS(SHIFT(3)),
+        [sym_group] = ACTIONS(SHIFT(3)),
+        [sym_number] = ACTIONS(SHIFT(3)),
+        [sym_variable] = ACTIONS(SHIFT(3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(4)),
     },
     [25] = {
-        [sym_expression] = ACTIONS(SHIFT(28)),
-        [sym_sum] = ACTIONS(SHIFT(2)),
-        [sym_difference] = ACTIONS(SHIFT(2)),
-        [sym_product] = ACTIONS(SHIFT(2)),
-        [sym_quotient] = ACTIONS(SHIFT(2)),
-        [sym_exponent] = ACTIONS(SHIFT(2)),
-        [sym_group] = ACTIONS(SHIFT(2)),
-        [sym_number] = ACTIONS(SHIFT(2)),
-        [sym_variable] = ACTIONS(SHIFT(2)),
+        [sym__expression] = ACTIONS(SHIFT(30)),
+        [sym_sum] = ACTIONS(SHIFT(3)),
+        [sym_difference] = ACTIONS(SHIFT(3)),
+        [sym_product] = ACTIONS(SHIFT(3)),
+        [sym_quotient] = ACTIONS(SHIFT(3)),
+        [sym_exponent] = ACTIONS(SHIFT(3)),
+        [sym_group] = ACTIONS(SHIFT(3)),
+        [sym_number] = ACTIONS(SHIFT(3)),
+        [sym_variable] = ACTIONS(SHIFT(3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(4)),
     },
     [26] = {
-        [sym_expression] = ACTIONS(SHIFT(27)),
-        [sym_sum] = ACTIONS(SHIFT(2)),
-        [sym_difference] = ACTIONS(SHIFT(2)),
-        [sym_product] = ACTIONS(SHIFT(2)),
-        [sym_quotient] = ACTIONS(SHIFT(2)),
-        [sym_exponent] = ACTIONS(SHIFT(2)),
-        [sym_group] = ACTIONS(SHIFT(2)),
-        [sym_number] = ACTIONS(SHIFT(2)),
-        [sym_variable] = ACTIONS(SHIFT(2)),
+        [sym__expression] = ACTIONS(SHIFT(29)),
+        [sym_sum] = ACTIONS(SHIFT(3)),
+        [sym_difference] = ACTIONS(SHIFT(3)),
+        [sym_product] = ACTIONS(SHIFT(3)),
+        [sym_quotient] = ACTIONS(SHIFT(3)),
+        [sym_exponent] = ACTIONS(SHIFT(3)),
+        [sym_group] = ACTIONS(SHIFT(3)),
+        [sym_number] = ACTIONS(SHIFT(3)),
+        [sym_variable] = ACTIONS(SHIFT(3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(4)),
     },
     [27] = {
+        [sym__expression] = ACTIONS(SHIFT(28)),
+        [sym_sum] = ACTIONS(SHIFT(3)),
+        [sym_difference] = ACTIONS(SHIFT(3)),
+        [sym_product] = ACTIONS(SHIFT(3)),
+        [sym_quotient] = ACTIONS(SHIFT(3)),
+        [sym_exponent] = ACTIONS(SHIFT(3)),
+        [sym_group] = ACTIONS(SHIFT(3)),
+        [sym_number] = ACTIONS(SHIFT(3)),
+        [sym_variable] = ACTIONS(SHIFT(3)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(4)),
+    },
+    [28] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE_FRAGILE(sym_exponent, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_exponent, 3)),
@@ -573,41 +594,41 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_SLASH] = ACTIONS(REDUCE_FRAGILE(sym_exponent, 3)),
         [aux_sym_STR_CARET] = ACTIONS(REDUCE_FRAGILE(sym_exponent, 3)),
     },
-    [28] = {
+    [29] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE_FRAGILE(sym_quotient, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_quotient, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_quotient, 3)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_quotient, 3)),
         [aux_sym_STR_SLASH] = ACTIONS(REDUCE_FRAGILE(sym_quotient, 3)),
-        [aux_sym_STR_CARET] = ACTIONS(SHIFT(26)),
+        [aux_sym_STR_CARET] = ACTIONS(SHIFT(27)),
     },
-    [29] = {
+    [30] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE_FRAGILE(sym_product, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_product, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_product, 3)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_product, 3)),
         [aux_sym_STR_SLASH] = ACTIONS(REDUCE_FRAGILE(sym_product, 3)),
-        [aux_sym_STR_CARET] = ACTIONS(SHIFT(26)),
+        [aux_sym_STR_CARET] = ACTIONS(SHIFT(27)),
     },
-    [30] = {
+    [31] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE_FRAGILE(sym_difference, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_difference, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_difference, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(24)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(25)),
-        [aux_sym_STR_CARET] = ACTIONS(SHIFT(26)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(25)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(26)),
+        [aux_sym_STR_CARET] = ACTIONS(SHIFT(27)),
     },
-    [31] = {
+    [32] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE_FRAGILE(sym_sum, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_sum, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_sum, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(24)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(25)),
-        [aux_sym_STR_CARET] = ACTIONS(SHIFT(26)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(25)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(26)),
+        [aux_sym_STR_CARET] = ACTIONS(SHIFT(27)),
     },
 };
 
diff --git a/spec/fixtures/parsers/c.c b/spec/fixtures/parsers/c.c
index 7ff5205f..9614c8d6 100644
--- a/spec/fixtures/parsers/c.c
+++ b/spec/fixtures/parsers/c.c
@@ -1,24 +1,25 @@
 #include "tree_sitter/parser.h"
 
-#define STATE_COUNT 268
-#define SYMBOL_COUNT 64
+#define STATE_COUNT 270
+#define SYMBOL_COUNT 65
 
 enum {
     sym_program = ts_builtin_sym_start,
     sym_function_definition,
     sym_declaration_specifiers,
     sym_storage_class_specifier,
-    sym_type_specifier,
+    sym__type_specifier,
+    sym_type_name,
     sym_struct_specifier,
     sym_struct_declaration,
     sym_parameter_declaration,
     sym_declaration,
-    sym_init_declarator,
+    sym__init_declarator,
     sym_initializer,
     sym_initializer_list,
     sym_designation,
     sym_declarator,
-    sym_direct_declarator,
+    sym__direct_declarator,
     sym_type_qualifier,
     sym_pointer,
     sym_compound_statement,
@@ -33,12 +34,12 @@ enum {
     sym_comment,
     aux_sym_function_definition_repeat1,
     aux_sym_declaration_specifiers_repeat1,
-    aux_sym_type_specifier_repeat1,
+    aux_sym_type_name_repeat1,
     aux_sym_struct_specifier_repeat1,
     aux_sym_declaration_repeat1,
     aux_sym_designation_repeat1,
     aux_sym_declarator_repeat1,
-    aux_sym_direct_declarator_repeat1,
+    aux_sym__direct_declarator_repeat1,
     aux_sym_compound_statement_repeat1,
     aux_sym_call_expression_repeat1,
     aux_sym_STR_typedef,
@@ -73,17 +74,18 @@ static const char *ts_symbol_names[] = {
     [sym_function_definition] = "function_definition",
     [sym_declaration_specifiers] = "declaration_specifiers",
     [sym_storage_class_specifier] = "storage_class_specifier",
-    [sym_type_specifier] = "type_specifier",
+    [sym__type_specifier] = "_type_specifier",
+    [sym_type_name] = "type_name",
     [sym_struct_specifier] = "struct_specifier",
     [sym_struct_declaration] = "struct_declaration",
     [sym_parameter_declaration] = "parameter_declaration",
     [sym_declaration] = "declaration",
-    [sym_init_declarator] = "init_declarator",
+    [sym__init_declarator] = "_init_declarator",
     [sym_initializer] = "initializer",
     [sym_initializer_list] = "initializer_list",
     [sym_designation] = "designation",
     [sym_declarator] = "declarator",
-    [sym_direct_declarator] = "direct_declarator",
+    [sym__direct_declarator] = "_direct_declarator",
     [sym_type_qualifier] = "type_qualifier",
     [sym_pointer] = "pointer",
     [sym_compound_statement] = "compound_statement",
@@ -100,12 +102,12 @@ static const char *ts_symbol_names[] = {
     [sym_comment] = "comment",
     [aux_sym_function_definition_repeat1] = "function_definition_repeat1",
     [aux_sym_declaration_specifiers_repeat1] = "declaration_specifiers_repeat1",
-    [aux_sym_type_specifier_repeat1] = "type_specifier_repeat1",
+    [aux_sym_type_name_repeat1] = "type_name_repeat1",
     [aux_sym_struct_specifier_repeat1] = "struct_specifier_repeat1",
     [aux_sym_declaration_repeat1] = "declaration_repeat1",
     [aux_sym_designation_repeat1] = "designation_repeat1",
     [aux_sym_declarator_repeat1] = "declarator_repeat1",
-    [aux_sym_direct_declarator_repeat1] = "direct_declarator_repeat1",
+    [aux_sym__direct_declarator_repeat1] = "_direct_declarator_repeat1",
     [aux_sym_compound_statement_repeat1] = "compound_statement_repeat1",
     [aux_sym_call_expression_repeat1] = "call_expression_repeat1",
     [aux_sym_STR_typedef] = "STR_typedef",
@@ -136,14 +138,17 @@ static const char *ts_symbol_names[] = {
 };
 
 static const int ts_hidden_symbol_flags[SYMBOL_COUNT] = {
+    [sym__type_specifier] = 1,
+    [sym__init_declarator] = 1,
+    [sym__direct_declarator] = 1,
     [aux_sym_function_definition_repeat1] = 1,
     [aux_sym_declaration_specifiers_repeat1] = 1,
-    [aux_sym_type_specifier_repeat1] = 1,
+    [aux_sym_type_name_repeat1] = 1,
     [aux_sym_struct_specifier_repeat1] = 1,
     [aux_sym_declaration_repeat1] = 1,
     [aux_sym_designation_repeat1] = 1,
     [aux_sym_declarator_repeat1] = 1,
-    [aux_sym_direct_declarator_repeat1] = 1,
+    [aux_sym__direct_declarator_repeat1] = 1,
     [aux_sym_compound_statement_repeat1] = 1,
     [aux_sym_call_expression_repeat1] = 1,
     [aux_sym_STR_typedef] = 1,
@@ -2013,267 +2018,269 @@ static TSStateId ts_lex_states[STATE_COUNT] = {
     [4] = 1,
     [5] = 85,
     [6] = 85,
-    [7] = 88,
-    [8] = 1,
-    [9] = 89,
-    [10] = 91,
-    [11] = 1,
-    [12] = 93,
-    [13] = 94,
-    [14] = 85,
+    [7] = 85,
+    [8] = 88,
+    [9] = 1,
+    [10] = 89,
+    [11] = 91,
+    [12] = 1,
+    [13] = 93,
+    [14] = 94,
     [15] = 85,
-    [16] = 94,
-    [17] = 88,
-    [18] = 96,
-    [19] = 91,
-    [20] = 85,
-    [21] = 93,
-    [22] = 94,
-    [23] = 96,
-    [24] = 85,
-    [25] = 85,
-    [26] = 94,
-    [27] = 96,
-    [28] = 85,
-    [29] = 85,
+    [16] = 85,
+    [17] = 94,
+    [18] = 85,
+    [19] = 88,
+    [20] = 96,
+    [21] = 91,
+    [22] = 85,
+    [23] = 93,
+    [24] = 94,
+    [25] = 96,
+    [26] = 85,
+    [27] = 85,
+    [28] = 94,
+    [29] = 96,
     [30] = 85,
-    [31] = 96,
-    [32] = 94,
-    [33] = 97,
-    [34] = 85,
+    [31] = 85,
+    [32] = 85,
+    [33] = 96,
+    [34] = 94,
     [35] = 97,
-    [36] = 99,
-    [37] = 85,
-    [38] = 85,
-    [39] = 100,
-    [40] = 102,
-    [41] = 102,
-    [42] = 99,
-    [43] = 85,
-    [44] = 100,
-    [45] = 102,
-    [46] = 102,
-    [47] = 103,
-    [48] = 113,
-    [49] = 82,
-    [50] = 85,
-    [51] = 114,
-    [52] = 100,
-    [53] = 1,
-    [54] = 102,
-    [55] = 114,
-    [56] = 100,
-    [57] = 102,
-    [58] = 114,
-    [59] = 116,
-    [60] = 116,
-    [61] = 99,
-    [62] = 85,
-    [63] = 100,
-    [64] = 116,
-    [65] = 116,
-    [66] = 103,
-    [67] = 113,
-    [68] = 114,
-    [69] = 100,
-    [70] = 116,
-    [71] = 116,
-    [72] = 117,
-    [73] = 117,
-    [74] = 119,
-    [75] = 120,
-    [76] = 120,
-    [77] = 117,
-    [78] = 117,
-    [79] = 121,
-    [80] = 121,
-    [81] = 117,
-    [82] = 100,
-    [83] = 120,
-    [84] = 119,
-    [85] = 117,
-    [86] = 120,
-    [87] = 120,
-    [88] = 121,
-    [89] = 121,
+    [36] = 85,
+    [37] = 97,
+    [38] = 99,
+    [39] = 85,
+    [40] = 85,
+    [41] = 100,
+    [42] = 102,
+    [43] = 102,
+    [44] = 99,
+    [45] = 85,
+    [46] = 100,
+    [47] = 102,
+    [48] = 102,
+    [49] = 103,
+    [50] = 113,
+    [51] = 82,
+    [52] = 85,
+    [53] = 114,
+    [54] = 100,
+    [55] = 1,
+    [56] = 102,
+    [57] = 114,
+    [58] = 100,
+    [59] = 102,
+    [60] = 114,
+    [61] = 116,
+    [62] = 116,
+    [63] = 99,
+    [64] = 85,
+    [65] = 100,
+    [66] = 116,
+    [67] = 116,
+    [68] = 103,
+    [69] = 113,
+    [70] = 114,
+    [71] = 100,
+    [72] = 116,
+    [73] = 116,
+    [74] = 117,
+    [75] = 117,
+    [76] = 119,
+    [77] = 120,
+    [78] = 120,
+    [79] = 117,
+    [80] = 117,
+    [81] = 121,
+    [82] = 121,
+    [83] = 117,
+    [84] = 100,
+    [85] = 120,
+    [86] = 119,
+    [87] = 117,
+    [88] = 120,
+    [89] = 120,
     [90] = 121,
     [91] = 121,
-    [92] = 100,
+    [92] = 121,
     [93] = 121,
-    [94] = 121,
+    [94] = 100,
     [95] = 121,
-    [96] = 100,
-    [97] = 117,
-    [98] = 85,
-    [99] = 114,
-    [100] = 117,
-    [101] = 97,
-    [102] = 97,
-    [103] = 103,
-    [104] = 113,
-    [105] = 114,
-    [106] = 100,
-    [107] = 97,
-    [108] = 97,
-    [109] = 117,
-    [110] = 99,
-    [111] = 94,
-    [112] = 96,
-    [113] = 85,
-    [114] = 88,
+    [96] = 121,
+    [97] = 121,
+    [98] = 100,
+    [99] = 117,
+    [100] = 85,
+    [101] = 114,
+    [102] = 117,
+    [103] = 97,
+    [104] = 97,
+    [105] = 103,
+    [106] = 113,
+    [107] = 114,
+    [108] = 100,
+    [109] = 97,
+    [110] = 97,
+    [111] = 117,
+    [112] = 99,
+    [113] = 94,
+    [114] = 96,
     [115] = 85,
-    [116] = 122,
-    [117] = 124,
-    [118] = 126,
-    [119] = 126,
-    [120] = 99,
-    [121] = 85,
-    [122] = 100,
-    [123] = 126,
-    [124] = 126,
-    [125] = 103,
-    [126] = 113,
-    [127] = 114,
-    [128] = 100,
-    [129] = 126,
-    [130] = 126,
-    [131] = 117,
-    [132] = 82,
-    [133] = 85,
-    [134] = 127,
-    [135] = 80,
-    [136] = 93,
-    [137] = 128,
-    [138] = 129,
-    [139] = 122,
-    [140] = 130,
-    [141] = 130,
-    [142] = 131,
-    [143] = 133,
-    [144] = 133,
-    [145] = 129,
-    [146] = 134,
-    [147] = 134,
-    [148] = 131,
-    [149] = 120,
-    [150] = 88,
-    [151] = 135,
-    [152] = 136,
-    [153] = 129,
-    [154] = 120,
-    [155] = 88,
-    [156] = 135,
-    [157] = 136,
-    [158] = 117,
-    [159] = 135,
-    [160] = 136,
-    [161] = 129,
-    [162] = 117,
-    [163] = 135,
-    [164] = 136,
-    [165] = 129,
-    [166] = 133,
-    [167] = 133,
-    [168] = 137,
+    [116] = 88,
+    [117] = 85,
+    [118] = 122,
+    [119] = 124,
+    [120] = 126,
+    [121] = 126,
+    [122] = 99,
+    [123] = 85,
+    [124] = 100,
+    [125] = 126,
+    [126] = 126,
+    [127] = 103,
+    [128] = 113,
+    [129] = 114,
+    [130] = 100,
+    [131] = 126,
+    [132] = 126,
+    [133] = 117,
+    [134] = 82,
+    [135] = 85,
+    [136] = 127,
+    [137] = 80,
+    [138] = 93,
+    [139] = 128,
+    [140] = 129,
+    [141] = 122,
+    [142] = 130,
+    [143] = 130,
+    [144] = 131,
+    [145] = 133,
+    [146] = 133,
+    [147] = 129,
+    [148] = 134,
+    [149] = 134,
+    [150] = 131,
+    [151] = 120,
+    [152] = 88,
+    [153] = 135,
+    [154] = 136,
+    [155] = 129,
+    [156] = 120,
+    [157] = 88,
+    [158] = 135,
+    [159] = 136,
+    [160] = 117,
+    [161] = 135,
+    [162] = 136,
+    [163] = 129,
+    [164] = 117,
+    [165] = 135,
+    [166] = 136,
+    [167] = 129,
+    [168] = 133,
     [169] = 133,
-    [170] = 129,
+    [170] = 137,
     [171] = 133,
-    [172] = 133,
-    [173] = 119,
-    [174] = 120,
-    [175] = 120,
-    [176] = 134,
-    [177] = 134,
-    [178] = 121,
+    [172] = 129,
+    [173] = 133,
+    [174] = 133,
+    [175] = 119,
+    [176] = 120,
+    [177] = 120,
+    [178] = 134,
     [179] = 134,
-    [180] = 100,
+    [180] = 121,
     [181] = 134,
-    [182] = 134,
-    [183] = 133,
-    [184] = 122,
-    [185] = 137,
+    [182] = 100,
+    [183] = 134,
+    [184] = 134,
+    [185] = 133,
     [186] = 122,
-    [187] = 119,
-    [188] = 120,
-    [189] = 120,
-    [190] = 130,
-    [191] = 130,
-    [192] = 121,
+    [187] = 137,
+    [188] = 122,
+    [189] = 119,
+    [190] = 120,
+    [191] = 120,
+    [192] = 130,
     [193] = 130,
-    [194] = 100,
+    [194] = 121,
     [195] = 130,
-    [196] = 130,
-    [197] = 82,
-    [198] = 85,
-    [199] = 128,
-    [200] = 138,
-    [201] = 138,
-    [202] = 128,
-    [203] = 139,
-    [204] = 96,
-    [205] = 80,
-    [206] = 80,
-    [207] = 128,
-    [208] = 119,
-    [209] = 120,
-    [210] = 120,
-    [211] = 138,
-    [212] = 138,
-    [213] = 121,
+    [196] = 100,
+    [197] = 130,
+    [198] = 130,
+    [199] = 82,
+    [200] = 85,
+    [201] = 128,
+    [202] = 138,
+    [203] = 138,
+    [204] = 128,
+    [205] = 139,
+    [206] = 96,
+    [207] = 80,
+    [208] = 80,
+    [209] = 128,
+    [210] = 119,
+    [211] = 120,
+    [212] = 120,
+    [213] = 138,
     [214] = 138,
-    [215] = 100,
+    [215] = 121,
     [216] = 138,
-    [217] = 138,
-    [218] = 96,
-    [219] = 122,
-    [220] = 140,
-    [221] = 141,
-    [222] = 141,
-    [223] = 99,
-    [224] = 85,
-    [225] = 100,
-    [226] = 141,
-    [227] = 141,
-    [228] = 103,
-    [229] = 113,
-    [230] = 114,
-    [231] = 100,
-    [232] = 141,
-    [233] = 141,
-    [234] = 117,
-    [235] = 142,
-    [236] = 85,
-    [237] = 128,
-    [238] = 122,
-    [239] = 142,
-    [240] = 128,
-    [241] = 85,
-    [242] = 122,
-    [243] = 142,
-    [244] = 128,
-    [245] = 80,
-    [246] = 93,
-    [247] = 122,
-    [248] = 142,
-    [249] = 127,
-    [250] = 127,
-    [251] = 85,
-    [252] = 122,
-    [253] = 142,
-    [254] = 127,
+    [217] = 100,
+    [218] = 138,
+    [219] = 138,
+    [220] = 96,
+    [221] = 122,
+    [222] = 140,
+    [223] = 141,
+    [224] = 141,
+    [225] = 99,
+    [226] = 85,
+    [227] = 100,
+    [228] = 141,
+    [229] = 141,
+    [230] = 103,
+    [231] = 113,
+    [232] = 114,
+    [233] = 100,
+    [234] = 141,
+    [235] = 141,
+    [236] = 117,
+    [237] = 142,
+    [238] = 85,
+    [239] = 128,
+    [240] = 122,
+    [241] = 142,
+    [242] = 128,
+    [243] = 85,
+    [244] = 122,
+    [245] = 142,
+    [246] = 128,
+    [247] = 80,
+    [248] = 93,
+    [249] = 122,
+    [250] = 142,
+    [251] = 127,
+    [252] = 127,
+    [253] = 85,
+    [254] = 122,
     [255] = 142,
-    [256] = 80,
-    [257] = 80,
-    [258] = 1,
-    [259] = 82,
-    [260] = 82,
-    [261] = 85,
-    [262] = 122,
-    [263] = 124,
-    [264] = 93,
-    [265] = 80,
-    [266] = 142,
+    [256] = 127,
+    [257] = 142,
+    [258] = 80,
+    [259] = 80,
+    [260] = 1,
+    [261] = 82,
+    [262] = 82,
+    [263] = 85,
+    [264] = 122,
+    [265] = 124,
+    [266] = 93,
     [267] = 80,
+    [268] = 142,
+    [269] = 80,
 };
 
 #pragma GCC diagnostic push
@@ -2285,26 +2292,27 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_function_definition] = ACTIONS(SHIFT(2)),
         [sym_declaration_specifiers] = ACTIONS(SHIFT(3)),
         [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
-        [sym_type_specifier] = ACTIONS(SHIFT(5)),
+        [sym__type_specifier] = ACTIONS(SHIFT(5)),
+        [sym_type_name] = ACTIONS(SHIFT(6)),
         [sym_struct_specifier] = ACTIONS(SHIFT(6)),
         [sym_declaration] = ACTIONS(SHIFT(2)),
         [sym_type_qualifier] = ACTIONS(SHIFT(4)),
-        [sym_identifier] = ACTIONS(SHIFT(6)),
+        [sym_identifier] = ACTIONS(SHIFT(7)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(7)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(10)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(8)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(11)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
     },
     [1] = {
         [ts_builtin_sym_end] = ACTIONS(ACCEPT_INPUT()),
@@ -2315,75 +2323,89 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
     [3] = {
-        [sym_type_specifier] = ACTIONS(SHIFT(261)),
+        [sym__type_specifier] = ACTIONS(SHIFT(263)),
+        [sym_type_name] = ACTIONS(SHIFT(6)),
         [sym_struct_specifier] = ACTIONS(SHIFT(6)),
-        [sym_identifier] = ACTIONS(SHIFT(6)),
+        [sym_identifier] = ACTIONS(SHIFT(7)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(7)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(10)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(8)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(11)),
     },
     [4] = {
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(258)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_declaration_specifiers, 1)),
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(260)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_declaration_specifiers, 1)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_declaration_specifiers, 1)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_declaration_specifiers, 1)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(258)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(260)),
         [sym_identifier] = ACTIONS(REDUCE(sym_declaration_specifiers, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_specifiers_repeat1] = ACTIONS(SHIFT(259)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_declaration_specifiers, 1)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
+        [aux_sym_declaration_specifiers_repeat1] = ACTIONS(SHIFT(261)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_declaration_specifiers, 1)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
         [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_declaration_specifiers, 1)),
         [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_declaration_specifiers, 1)),
         [aux_sym_STR_long] = ACTIONS(REDUCE(sym_declaration_specifiers, 1)),
         [aux_sym_STR_short] = ACTIONS(REDUCE(sym_declaration_specifiers, 1)),
         [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_declaration_specifiers, 1)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
     },
     [5] = {
-        [sym_init_declarator] = ACTIONS(SHIFT(116)),
-        [sym_declarator] = ACTIONS(SHIFT(117)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(118)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(119)),
+        [sym__init_declarator] = ACTIONS(SHIFT(118)),
+        [sym_declarator] = ACTIONS(SHIFT(119)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(120)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(121)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(120)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(121)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(122)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(123)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
     [6] = {
-        [sym_init_declarator] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [sym_declarator] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [sym_direct_declarator] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [sym_pointer] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_type_specifier, 1)),
+        [sym__init_declarator] = ACTIONS(REDUCE(sym__type_specifier, 1)),
+        [sym_declarator] = ACTIONS(REDUCE(sym__type_specifier, 1)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym__type_specifier, 1)),
+        [sym_pointer] = ACTIONS(REDUCE(sym__type_specifier, 1)),
+        [sym_identifier] = ACTIONS(REDUCE(sym__type_specifier, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_type_specifier, 1)),
+        [aux_sym_declarator_repeat1] = ACTIONS(REDUCE(sym__type_specifier, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__type_specifier, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym__type_specifier, 1)),
     },
     [7] = {
-        [sym_identifier] = ACTIONS(SHIFT(115)),
+        [sym__init_declarator] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [sym_declarator] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [sym_pointer] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [sym_identifier] = ACTIONS(REDUCE(sym_type_name, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declarator_repeat1] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_type_name, 1)),
     },
     [8] = {
+        [sym_identifier] = ACTIONS(SHIFT(117)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+    },
+    [9] = {
         [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
         [sym_type_qualifier] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
         [sym_identifier] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_declaration_specifiers_repeat1] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
         [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
         [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
         [aux_sym_STR_static] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
@@ -2398,29 +2420,30 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
         [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_storage_class_specifier, 1)),
     },
-    [9] = {
-        [sym_identifier] = ACTIONS(REDUCE(aux_sym_type_specifier_repeat1, 1)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(114)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-    },
     [10] = {
-        [sym_identifier] = ACTIONS(SHIFT(12)),
+        [sym_identifier] = ACTIONS(REDUCE(aux_sym_type_name_repeat1, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(13)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(116)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
     },
     [11] = {
+        [sym_identifier] = ACTIONS(SHIFT(13)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(14)),
+    },
+    [12] = {
         [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
         [sym_type_qualifier] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
         [sym_identifier] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_declaration_specifiers_repeat1] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
         [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
         [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
         [aux_sym_STR_static] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
@@ -2435,77 +2458,89 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
         [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_type_qualifier, 1)),
     },
-    [12] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(111)),
-    },
     [13] = {
-        [sym_type_specifier] = ACTIONS(SHIFT(14)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(15)),
-        [sym_struct_declaration] = ACTIONS(SHIFT(16)),
-        [sym_identifier] = ACTIONS(SHIFT(15)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(17)),
-        [aux_sym_struct_specifier_repeat1] = ACTIONS(SHIFT(18)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(19)),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(20)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(113)),
     },
     [14] = {
-        [sym_declarator] = ACTIONS(SHIFT(32)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(33)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(35)),
+        [sym__type_specifier] = ACTIONS(SHIFT(15)),
+        [sym_type_name] = ACTIONS(SHIFT(16)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(16)),
+        [sym_struct_declaration] = ACTIONS(SHIFT(17)),
+        [sym_identifier] = ACTIONS(SHIFT(18)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(36)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(37)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(19)),
+        [aux_sym_struct_specifier_repeat1] = ACTIONS(SHIFT(20)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(22)),
     },
     [15] = {
-        [sym_declarator] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [sym_direct_declarator] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [sym_pointer] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_type_specifier, 1)),
+        [sym_declarator] = ACTIONS(SHIFT(34)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(35)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(37)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_type_specifier, 1)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(38)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(39)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
     [16] = {
-        [sym_type_specifier] = ACTIONS(SHIFT(14)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(15)),
-        [sym_struct_declaration] = ACTIONS(SHIFT(16)),
-        [sym_identifier] = ACTIONS(SHIFT(15)),
+        [sym_declarator] = ACTIONS(REDUCE(sym__type_specifier, 1)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym__type_specifier, 1)),
+        [sym_pointer] = ACTIONS(REDUCE(sym__type_specifier, 1)),
+        [sym_identifier] = ACTIONS(REDUCE(sym__type_specifier, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(17)),
-        [aux_sym_struct_specifier_repeat1] = ACTIONS(SHIFT(31)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(19)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(aux_sym_struct_specifier_repeat1, 1)),
+        [aux_sym_declarator_repeat1] = ACTIONS(REDUCE(sym__type_specifier, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__type_specifier, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym__type_specifier, 1)),
     },
     [17] = {
-        [sym_identifier] = ACTIONS(SHIFT(30)),
+        [sym__type_specifier] = ACTIONS(SHIFT(15)),
+        [sym_type_name] = ACTIONS(SHIFT(16)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(16)),
+        [sym_struct_declaration] = ACTIONS(SHIFT(17)),
+        [sym_identifier] = ACTIONS(SHIFT(18)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(19)),
+        [aux_sym_struct_specifier_repeat1] = ACTIONS(SHIFT(33)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(aux_sym_struct_specifier_repeat1, 1)),
     },
     [18] = {
+        [sym_declarator] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [sym_pointer] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [sym_identifier] = ACTIONS(REDUCE(sym_type_name, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(29)),
+        [aux_sym_declarator_repeat1] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_type_name, 1)),
     },
     [19] = {
-        [sym_identifier] = ACTIONS(SHIFT(21)),
+        [sym_identifier] = ACTIONS(SHIFT(32)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(22)),
     },
     [20] = {
-        [sym_init_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(31)),
+    },
+    [21] = {
+        [sym_identifier] = ACTIONS(SHIFT(23)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(24)),
+    },
+    [22] = {
+        [sym__init_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
         [sym_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
-        [sym_direct_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
         [sym_pointer] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
         [sym_identifier] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -2513,32 +2548,33 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
     },
-    [21] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(26)),
-    },
-    [22] = {
-        [sym_type_specifier] = ACTIONS(SHIFT(14)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(15)),
-        [sym_struct_declaration] = ACTIONS(SHIFT(16)),
-        [sym_identifier] = ACTIONS(SHIFT(15)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(17)),
-        [aux_sym_struct_specifier_repeat1] = ACTIONS(SHIFT(23)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(19)),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(24)),
-    },
     [23] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(25)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(28)),
     },
     [24] = {
+        [sym__type_specifier] = ACTIONS(SHIFT(15)),
+        [sym_type_name] = ACTIONS(SHIFT(16)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(16)),
+        [sym_struct_declaration] = ACTIONS(SHIFT(17)),
+        [sym_identifier] = ACTIONS(SHIFT(18)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(19)),
+        [aux_sym_struct_specifier_repeat1] = ACTIONS(SHIFT(25)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(26)),
+    },
+    [25] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(27)),
+    },
+    [26] = {
         [sym_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
-        [sym_direct_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
         [sym_pointer] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
         [sym_identifier] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -2546,9 +2582,9 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_struct_specifier, 3)),
     },
-    [25] = {
+    [27] = {
         [sym_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
-        [sym_direct_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
         [sym_pointer] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
         [sym_identifier] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -2556,28 +2592,29 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
     },
-    [26] = {
-        [sym_type_specifier] = ACTIONS(SHIFT(14)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(15)),
-        [sym_struct_declaration] = ACTIONS(SHIFT(16)),
-        [sym_identifier] = ACTIONS(SHIFT(15)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(17)),
-        [aux_sym_struct_specifier_repeat1] = ACTIONS(SHIFT(27)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(19)),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(25)),
-    },
-    [27] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(28)),
-    },
     [28] = {
+        [sym__type_specifier] = ACTIONS(SHIFT(15)),
+        [sym_type_name] = ACTIONS(SHIFT(16)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(16)),
+        [sym_struct_declaration] = ACTIONS(SHIFT(17)),
+        [sym_identifier] = ACTIONS(SHIFT(18)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(19)),
+        [aux_sym_struct_specifier_repeat1] = ACTIONS(SHIFT(29)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(27)),
+    },
+    [29] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(30)),
+    },
+    [30] = {
         [sym_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
-        [sym_direct_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
         [sym_pointer] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
         [sym_identifier] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -2585,10 +2622,10 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
     },
-    [29] = {
-        [sym_init_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
+    [31] = {
+        [sym__init_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
         [sym_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
-        [sym_direct_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
         [sym_pointer] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
         [sym_identifier] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -2596,27 +2633,28 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_struct_specifier, 4)),
     },
-    [30] = {
-        [sym_declarator] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-        [sym_direct_declarator] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-        [sym_pointer] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_type_specifier, 2)),
+    [32] = {
+        [sym_declarator] = ACTIONS(REDUCE(sym_type_name, 2)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym_type_name, 2)),
+        [sym_pointer] = ACTIONS(REDUCE(sym_type_name, 2)),
+        [sym_identifier] = ACTIONS(REDUCE(sym_type_name, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_type_specifier, 2)),
+        [aux_sym_declarator_repeat1] = ACTIONS(REDUCE(sym_type_name, 2)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_type_name, 2)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_type_name, 2)),
     },
-    [31] = {
+    [33] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(aux_sym_struct_specifier_repeat1, 2)),
     },
-    [32] = {
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
+    [34] = {
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
         [sym_struct_declaration] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
         [sym_identifier] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
         [aux_sym_struct_specifier_repeat1] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
         [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
         [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
@@ -2625,13 +2663,14 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_struct_declaration, 2)),
     },
-    [33] = {
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_declarator, 1)),
+    [35] = {
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_declarator, 1)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_declarator, 1)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_declarator, 1)),
         [sym_struct_declaration] = ACTIONS(REDUCE(sym_declarator, 1)),
         [sym_identifier] = ACTIONS(REDUCE(sym_declarator, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_declarator, 1)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_struct_specifier_repeat1] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_declarator, 1)),
@@ -2639,53 +2678,54 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_short] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_declarator, 1)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(103)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(104)),
-    },
-    [34] = {
-        [sym_direct_declarator] = ACTIONS(REDUCE(aux_sym_declarator_repeat1, 1)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(REDUCE(aux_sym_declarator_repeat1, 1)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(110)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(aux_sym_declarator_repeat1, 1)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
-    },
-    [35] = {
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [sym_struct_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [sym_struct_declaration] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_struct_specifier_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_long] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_short] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(105)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(106)),
     },
     [36] = {
-        [sym_direct_declarator] = ACTIONS(SHIFT(102)),
-        [sym_identifier] = ACTIONS(SHIFT(35)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(aux_sym_declarator_repeat1, 1)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(REDUCE(aux_sym_declarator_repeat1, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(37)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(112)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(aux_sym_declarator_repeat1, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
     [37] = {
-        [sym_declarator] = ACTIONS(SHIFT(39)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(40)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(41)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [sym_type_name] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [sym_struct_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [sym_struct_declaration] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [sym_identifier] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(42)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(43)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_struct_specifier_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_long] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_short] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
     },
     [38] = {
-        [sym_direct_declarator] = ACTIONS(REDUCE(sym_pointer, 1)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(104)),
+        [sym_identifier] = ACTIONS(SHIFT(37)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(39)),
+    },
+    [39] = {
+        [sym_declarator] = ACTIONS(SHIFT(41)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(42)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(43)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(44)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(45)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
+    },
+    [40] = {
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym_pointer, 1)),
         [sym_pointer] = ACTIONS(REDUCE(sym_pointer, 1)),
         [sym_identifier] = ACTIONS(REDUCE(sym_pointer, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -2693,352 +2733,356 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_pointer, 1)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_pointer, 1)),
     },
-    [39] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(101)),
-    },
-    [40] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(47)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(48)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_declarator, 1)),
-    },
     [41] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(103)),
     },
     [42] = {
-        [sym_direct_declarator] = ACTIONS(SHIFT(46)),
-        [sym_identifier] = ACTIONS(SHIFT(41)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(43)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(49)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(50)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_declarator, 1)),
     },
     [43] = {
-        [sym_declarator] = ACTIONS(SHIFT(44)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(40)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(41)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(42)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(43)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
     },
     [44] = {
+        [sym__direct_declarator] = ACTIONS(SHIFT(48)),
+        [sym_identifier] = ACTIONS(SHIFT(43)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(45)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(45)),
     },
     [45] = {
+        [sym_declarator] = ACTIONS(SHIFT(46)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(42)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(43)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(44)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(45)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
     [46] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(47)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(48)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_declarator, 2)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(47)),
     },
     [47] = {
-        [sym_expression] = ACTIONS(SHIFT(100)),
-        [sym_math_expression] = ACTIONS(SHIFT(73)),
-        [sym_call_expression] = ACTIONS(SHIFT(73)),
-        [sym_string] = ACTIONS(SHIFT(73)),
-        [sym_identifier] = ACTIONS(SHIFT(73)),
-        [sym_number] = ACTIONS(SHIFT(73)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(45)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
     },
     [48] = {
-        [sym_declaration_specifiers] = ACTIONS(SHIFT(49)),
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
-        [sym_type_specifier] = ACTIONS(SHIFT(50)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(15)),
-        [sym_parameter_declaration] = ACTIONS(SHIFT(51)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
-        [sym_identifier] = ACTIONS(SHIFT(15)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(17)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(19)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(45)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(49)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(50)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_declarator, 2)),
     },
     [49] = {
-        [sym_type_specifier] = ACTIONS(SHIFT(98)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(15)),
-        [sym_identifier] = ACTIONS(SHIFT(15)),
+        [sym_expression] = ACTIONS(SHIFT(102)),
+        [sym_math_expression] = ACTIONS(SHIFT(75)),
+        [sym_call_expression] = ACTIONS(SHIFT(75)),
+        [sym_string] = ACTIONS(SHIFT(75)),
+        [sym_identifier] = ACTIONS(SHIFT(75)),
+        [sym_number] = ACTIONS(SHIFT(75)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(17)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(19)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(47)),
     },
     [50] = {
-        [sym_declarator] = ACTIONS(SHIFT(58)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(59)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(60)),
+        [sym_declaration_specifiers] = ACTIONS(SHIFT(51)),
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
+        [sym__type_specifier] = ACTIONS(SHIFT(52)),
+        [sym_type_name] = ACTIONS(SHIFT(16)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(16)),
+        [sym_parameter_declaration] = ACTIONS(SHIFT(53)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
+        [sym_identifier] = ACTIONS(SHIFT(18)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(61)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(62)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(19)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(47)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
     },
     [51] = {
+        [sym__type_specifier] = ACTIONS(SHIFT(100)),
+        [sym_type_name] = ACTIONS(SHIFT(16)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(16)),
+        [sym_identifier] = ACTIONS(SHIFT(18)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(SHIFT(52)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(53)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(54)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(19)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(21)),
     },
     [52] = {
+        [sym_declarator] = ACTIONS(SHIFT(60)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(61)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(62)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(57)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(63)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(64)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
     [53] = {
-        [sym_declaration_specifiers] = ACTIONS(SHIFT(49)),
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
-        [sym_type_specifier] = ACTIONS(SHIFT(50)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(15)),
-        [sym_parameter_declaration] = ACTIONS(SHIFT(55)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
-        [sym_identifier] = ACTIONS(SHIFT(15)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(17)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(19)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(SHIFT(54)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(55)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(56)),
     },
     [54] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(59)),
     },
     [55] = {
+        [sym_declaration_specifiers] = ACTIONS(SHIFT(51)),
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
+        [sym__type_specifier] = ACTIONS(SHIFT(52)),
+        [sym_type_name] = ACTIONS(SHIFT(16)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(16)),
+        [sym_parameter_declaration] = ACTIONS(SHIFT(57)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
+        [sym_identifier] = ACTIONS(SHIFT(18)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(SHIFT(56)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(53)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(aux_sym_direct_declarator_repeat1, 2)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(19)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
     },
     [56] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(aux_sym_direct_declarator_repeat1, 3)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
     },
     [57] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(SHIFT(58)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(55)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(aux_sym__direct_declarator_repeat1, 2)),
     },
     [58] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(REDUCE(sym_parameter_declaration, 2)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_parameter_declaration, 2)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_parameter_declaration, 2)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(aux_sym__direct_declarator_repeat1, 3)),
     },
     [59] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(REDUCE(sym_declarator, 1)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_declarator, 1)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(66)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(67)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_declarator, 1)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
     },
     [60] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(REDUCE(sym_parameter_declaration, 2)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_parameter_declaration, 2)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_parameter_declaration, 2)),
     },
     [61] = {
-        [sym_direct_declarator] = ACTIONS(SHIFT(65)),
-        [sym_identifier] = ACTIONS(SHIFT(60)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(62)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(REDUCE(sym_declarator, 1)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_declarator, 1)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(68)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(69)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_declarator, 1)),
     },
     [62] = {
-        [sym_declarator] = ACTIONS(SHIFT(63)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(40)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(41)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(42)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(43)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
     },
     [63] = {
+        [sym__direct_declarator] = ACTIONS(SHIFT(67)),
+        [sym_identifier] = ACTIONS(SHIFT(62)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(64)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(64)),
     },
     [64] = {
+        [sym_declarator] = ACTIONS(SHIFT(65)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(42)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(43)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(44)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(45)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
     [65] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(REDUCE(sym_declarator, 2)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_declarator, 2)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(66)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(67)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_declarator, 2)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(66)),
     },
     [66] = {
-        [sym_expression] = ACTIONS(SHIFT(72)),
-        [sym_math_expression] = ACTIONS(SHIFT(73)),
-        [sym_call_expression] = ACTIONS(SHIFT(73)),
-        [sym_string] = ACTIONS(SHIFT(73)),
-        [sym_identifier] = ACTIONS(SHIFT(73)),
-        [sym_number] = ACTIONS(SHIFT(73)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(64)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
     },
     [67] = {
-        [sym_declaration_specifiers] = ACTIONS(SHIFT(49)),
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
-        [sym_type_specifier] = ACTIONS(SHIFT(50)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(15)),
-        [sym_parameter_declaration] = ACTIONS(SHIFT(68)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
-        [sym_identifier] = ACTIONS(SHIFT(15)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(17)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(19)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(64)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(REDUCE(sym_declarator, 2)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_declarator, 2)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(68)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(69)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_declarator, 2)),
     },
     [68] = {
+        [sym_expression] = ACTIONS(SHIFT(74)),
+        [sym_math_expression] = ACTIONS(SHIFT(75)),
+        [sym_call_expression] = ACTIONS(SHIFT(75)),
+        [sym_string] = ACTIONS(SHIFT(75)),
+        [sym_identifier] = ACTIONS(SHIFT(75)),
+        [sym_number] = ACTIONS(SHIFT(75)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(SHIFT(69)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(53)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(70)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(66)),
     },
     [69] = {
+        [sym_declaration_specifiers] = ACTIONS(SHIFT(51)),
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
+        [sym__type_specifier] = ACTIONS(SHIFT(52)),
+        [sym_type_name] = ACTIONS(SHIFT(16)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(16)),
+        [sym_parameter_declaration] = ACTIONS(SHIFT(70)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
+        [sym_identifier] = ACTIONS(SHIFT(18)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(71)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(19)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(66)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
     },
     [70] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(SHIFT(71)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(55)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(72)),
     },
     [71] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(73)),
     },
     [72] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(70)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(74)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(75)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(76)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
     },
     [73] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+    },
+    [74] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(72)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(76)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(77)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(78)),
+    },
+    [75] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym_expression, 1)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_expression, 1)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_expression, 1)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
     },
-    [74] = {
-        [sym_expression] = ACTIONS(SHIFT(79)),
-        [sym_math_expression] = ACTIONS(SHIFT(80)),
-        [sym_call_expression] = ACTIONS(SHIFT(80)),
-        [sym_string] = ACTIONS(SHIFT(80)),
-        [sym_identifier] = ACTIONS(SHIFT(80)),
-        [sym_number] = ACTIONS(SHIFT(80)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(81)),
-    },
-    [75] = {
-        [sym_expression] = ACTIONS(SHIFT(78)),
-        [sym_math_expression] = ACTIONS(SHIFT(73)),
-        [sym_call_expression] = ACTIONS(SHIFT(73)),
-        [sym_string] = ACTIONS(SHIFT(73)),
-        [sym_identifier] = ACTIONS(SHIFT(73)),
-        [sym_number] = ACTIONS(SHIFT(73)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-    },
     [76] = {
-        [sym_expression] = ACTIONS(SHIFT(77)),
-        [sym_math_expression] = ACTIONS(SHIFT(73)),
-        [sym_call_expression] = ACTIONS(SHIFT(73)),
-        [sym_string] = ACTIONS(SHIFT(73)),
-        [sym_identifier] = ACTIONS(SHIFT(73)),
-        [sym_number] = ACTIONS(SHIFT(73)),
+        [sym_expression] = ACTIONS(SHIFT(81)),
+        [sym_math_expression] = ACTIONS(SHIFT(82)),
+        [sym_call_expression] = ACTIONS(SHIFT(82)),
+        [sym_string] = ACTIONS(SHIFT(82)),
+        [sym_identifier] = ACTIONS(SHIFT(82)),
+        [sym_number] = ACTIONS(SHIFT(82)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(83)),
     },
     [77] = {
+        [sym_expression] = ACTIONS(SHIFT(80)),
+        [sym_math_expression] = ACTIONS(SHIFT(75)),
+        [sym_call_expression] = ACTIONS(SHIFT(75)),
+        [sym_string] = ACTIONS(SHIFT(75)),
+        [sym_identifier] = ACTIONS(SHIFT(75)),
+        [sym_number] = ACTIONS(SHIFT(75)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(74)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(75)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [78] = {
+        [sym_expression] = ACTIONS(SHIFT(79)),
+        [sym_math_expression] = ACTIONS(SHIFT(75)),
+        [sym_call_expression] = ACTIONS(SHIFT(75)),
+        [sym_string] = ACTIONS(SHIFT(75)),
+        [sym_identifier] = ACTIONS(SHIFT(75)),
+        [sym_number] = ACTIONS(SHIFT(75)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(74)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [79] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_call_expression_repeat1] = ACTIONS(SHIFT(82)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(83)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(84)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(85)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(86)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(87)),
+        [aux_sym_STR_RBRACK] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(76)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(77)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [80] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RBRACK] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(76)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+    },
+    [81] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_call_expression_repeat1] = ACTIONS(SHIFT(84)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(85)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(86)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(87)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(88)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(89)),
+    },
+    [82] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_call_expression_repeat1] = ACTIONS(REDUCE(sym_expression, 1)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_expression, 1)),
@@ -3047,89 +3091,89 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_expression, 1)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
     },
-    [81] = {
+    [83] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 3)),
     },
-    [82] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(97)),
-    },
-    [83] = {
-        [sym_expression] = ACTIONS(SHIFT(95)),
-        [sym_math_expression] = ACTIONS(SHIFT(80)),
-        [sym_call_expression] = ACTIONS(SHIFT(80)),
-        [sym_string] = ACTIONS(SHIFT(80)),
-        [sym_identifier] = ACTIONS(SHIFT(80)),
-        [sym_number] = ACTIONS(SHIFT(80)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-    },
     [84] = {
-        [sym_expression] = ACTIONS(SHIFT(90)),
-        [sym_math_expression] = ACTIONS(SHIFT(80)),
-        [sym_call_expression] = ACTIONS(SHIFT(80)),
-        [sym_string] = ACTIONS(SHIFT(80)),
-        [sym_identifier] = ACTIONS(SHIFT(80)),
-        [sym_number] = ACTIONS(SHIFT(80)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(91)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(99)),
     },
     [85] = {
+        [sym_expression] = ACTIONS(SHIFT(97)),
+        [sym_math_expression] = ACTIONS(SHIFT(82)),
+        [sym_call_expression] = ACTIONS(SHIFT(82)),
+        [sym_string] = ACTIONS(SHIFT(82)),
+        [sym_identifier] = ACTIONS(SHIFT(82)),
+        [sym_number] = ACTIONS(SHIFT(82)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+    },
+    [86] = {
+        [sym_expression] = ACTIONS(SHIFT(92)),
+        [sym_math_expression] = ACTIONS(SHIFT(82)),
+        [sym_call_expression] = ACTIONS(SHIFT(82)),
+        [sym_string] = ACTIONS(SHIFT(82)),
+        [sym_identifier] = ACTIONS(SHIFT(82)),
+        [sym_number] = ACTIONS(SHIFT(82)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(93)),
+    },
+    [87] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 4)),
     },
-    [86] = {
-        [sym_expression] = ACTIONS(SHIFT(89)),
-        [sym_math_expression] = ACTIONS(SHIFT(80)),
-        [sym_call_expression] = ACTIONS(SHIFT(80)),
-        [sym_string] = ACTIONS(SHIFT(80)),
-        [sym_identifier] = ACTIONS(SHIFT(80)),
-        [sym_number] = ACTIONS(SHIFT(80)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-    },
-    [87] = {
-        [sym_expression] = ACTIONS(SHIFT(88)),
-        [sym_math_expression] = ACTIONS(SHIFT(80)),
-        [sym_call_expression] = ACTIONS(SHIFT(80)),
-        [sym_string] = ACTIONS(SHIFT(80)),
-        [sym_identifier] = ACTIONS(SHIFT(80)),
-        [sym_number] = ACTIONS(SHIFT(80)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-    },
     [88] = {
+        [sym_expression] = ACTIONS(SHIFT(91)),
+        [sym_math_expression] = ACTIONS(SHIFT(82)),
+        [sym_call_expression] = ACTIONS(SHIFT(82)),
+        [sym_string] = ACTIONS(SHIFT(82)),
+        [sym_identifier] = ACTIONS(SHIFT(82)),
+        [sym_number] = ACTIONS(SHIFT(82)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_call_expression_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(84)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(86)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [89] = {
+        [sym_expression] = ACTIONS(SHIFT(90)),
+        [sym_math_expression] = ACTIONS(SHIFT(82)),
+        [sym_call_expression] = ACTIONS(SHIFT(82)),
+        [sym_string] = ACTIONS(SHIFT(82)),
+        [sym_identifier] = ACTIONS(SHIFT(82)),
+        [sym_number] = ACTIONS(SHIFT(82)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+    },
+    [90] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_call_expression_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(84)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(86)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(88)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+    },
+    [91] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_call_expression_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(86)),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
-    [90] = {
+    [92] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_call_expression_repeat1] = ACTIONS(SHIFT(92)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(83)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(84)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(93)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(86)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(87)),
+        [aux_sym_call_expression_repeat1] = ACTIONS(SHIFT(94)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(85)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(86)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(95)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(88)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(89)),
     },
-    [91] = {
+    [93] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_call_expression_repeat1] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_call_expression, 3)),
@@ -3138,11 +3182,11 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 3)),
     },
-    [92] = {
+    [94] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(94)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(96)),
     },
-    [93] = {
+    [95] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_call_expression_repeat1] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_call_expression, 4)),
@@ -3151,7 +3195,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 4)),
     },
-    [94] = {
+    [96] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_call_expression_repeat1] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_call_expression, 5)),
@@ -3160,73 +3204,75 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 5)),
     },
-    [95] = {
+    [97] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_call_expression_repeat1] = ACTIONS(SHIFT(96)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(83)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(84)),
+        [aux_sym_call_expression_repeat1] = ACTIONS(SHIFT(98)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(85)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(86)),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(aux_sym_call_expression_repeat1, 2)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(86)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(87)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(88)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(89)),
     },
-    [96] = {
+    [98] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(aux_sym_call_expression_repeat1, 3)),
     },
-    [97] = {
+    [99] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 5)),
     },
-    [98] = {
-        [sym_declarator] = ACTIONS(SHIFT(99)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(59)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(60)),
+    [100] = {
+        [sym_declarator] = ACTIONS(SHIFT(101)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(61)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(62)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(61)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(62)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(63)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(64)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
-    [99] = {
+    [101] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(REDUCE(sym_parameter_declaration, 3)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(REDUCE(sym_parameter_declaration, 3)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_parameter_declaration, 3)),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_parameter_declaration, 3)),
     },
-    [100] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(54)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(74)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(75)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(76)),
-    },
-    [101] = {
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [sym_struct_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [sym_struct_declaration] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_struct_specifier_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_long] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_short] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-    },
     [102] = {
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_declarator, 2)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(56)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(76)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(77)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(78)),
+    },
+    [103] = {
+        [sym__type_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_type_name] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_struct_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_struct_declaration] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_identifier] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_struct_specifier_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_long] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_short] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+    },
+    [104] = {
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_declarator, 2)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_declarator, 2)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_declarator, 2)),
         [sym_struct_declaration] = ACTIONS(REDUCE(sym_declarator, 2)),
         [sym_identifier] = ACTIONS(REDUCE(sym_declarator, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_declarator, 2)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_struct_specifier_repeat1] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_declarator, 2)),
@@ -3234,124 +3280,128 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_short] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_declarator, 2)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(103)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(104)),
-    },
-    [103] = {
-        [sym_expression] = ACTIONS(SHIFT(109)),
-        [sym_math_expression] = ACTIONS(SHIFT(73)),
-        [sym_call_expression] = ACTIONS(SHIFT(73)),
-        [sym_string] = ACTIONS(SHIFT(73)),
-        [sym_identifier] = ACTIONS(SHIFT(73)),
-        [sym_number] = ACTIONS(SHIFT(73)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(101)),
-    },
-    [104] = {
-        [sym_declaration_specifiers] = ACTIONS(SHIFT(49)),
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
-        [sym_type_specifier] = ACTIONS(SHIFT(50)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(15)),
-        [sym_parameter_declaration] = ACTIONS(SHIFT(105)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
-        [sym_identifier] = ACTIONS(SHIFT(15)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(17)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(19)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(101)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(105)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(106)),
     },
     [105] = {
+        [sym_expression] = ACTIONS(SHIFT(111)),
+        [sym_math_expression] = ACTIONS(SHIFT(75)),
+        [sym_call_expression] = ACTIONS(SHIFT(75)),
+        [sym_string] = ACTIONS(SHIFT(75)),
+        [sym_identifier] = ACTIONS(SHIFT(75)),
+        [sym_number] = ACTIONS(SHIFT(75)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(SHIFT(106)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(53)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(107)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(103)),
     },
     [106] = {
+        [sym_declaration_specifiers] = ACTIONS(SHIFT(51)),
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
+        [sym__type_specifier] = ACTIONS(SHIFT(52)),
+        [sym_type_name] = ACTIONS(SHIFT(16)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(16)),
+        [sym_parameter_declaration] = ACTIONS(SHIFT(107)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
+        [sym_identifier] = ACTIONS(SHIFT(18)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(108)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(19)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(103)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
     },
     [107] = {
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [sym_struct_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [sym_struct_declaration] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_struct_specifier_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_long] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_short] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(SHIFT(108)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(55)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(109)),
     },
     [108] = {
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [sym_struct_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [sym_struct_declaration] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_struct_specifier_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_long] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_short] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(110)),
     },
     [109] = {
+        [sym__type_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [sym_type_name] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [sym_struct_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [sym_struct_declaration] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [sym_identifier] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(107)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(74)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(75)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(76)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_struct_specifier_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_long] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_short] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
     },
     [110] = {
-        [sym_direct_declarator] = ACTIONS(REDUCE(aux_sym_declarator_repeat1, 2)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym_type_name] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym_struct_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym_struct_declaration] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym_identifier] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_struct_specifier_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_long] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_short] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+    },
+    [111] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(109)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(76)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(77)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(78)),
+    },
+    [112] = {
+        [sym__direct_declarator] = ACTIONS(REDUCE(aux_sym_declarator_repeat1, 2)),
         [sym_identifier] = ACTIONS(REDUCE(aux_sym_declarator_repeat1, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(aux_sym_declarator_repeat1, 2)),
     },
-    [111] = {
-        [sym_type_specifier] = ACTIONS(SHIFT(14)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(15)),
-        [sym_struct_declaration] = ACTIONS(SHIFT(16)),
-        [sym_identifier] = ACTIONS(SHIFT(15)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(17)),
-        [aux_sym_struct_specifier_repeat1] = ACTIONS(SHIFT(112)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(19)),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(29)),
-    },
-    [112] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(113)),
-    },
     [113] = {
-        [sym_init_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
+        [sym__type_specifier] = ACTIONS(SHIFT(15)),
+        [sym_type_name] = ACTIONS(SHIFT(16)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(16)),
+        [sym_struct_declaration] = ACTIONS(SHIFT(17)),
+        [sym_identifier] = ACTIONS(SHIFT(18)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(19)),
+        [aux_sym_struct_specifier_repeat1] = ACTIONS(SHIFT(114)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(31)),
+    },
+    [114] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(115)),
+    },
+    [115] = {
+        [sym__init_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
         [sym_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
-        [sym_direct_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
         [sym_pointer] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
         [sym_identifier] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -3359,62 +3409,64 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_struct_specifier, 5)),
     },
-    [114] = {
-        [sym_identifier] = ACTIONS(REDUCE(aux_sym_type_specifier_repeat1, 2)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-    },
-    [115] = {
-        [sym_init_declarator] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-        [sym_declarator] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-        [sym_direct_declarator] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-        [sym_pointer] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_type_specifier, 2)),
-    },
     [116] = {
+        [sym_identifier] = ACTIONS(REDUCE(aux_sym_type_name_repeat1, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(255)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(236)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(256)),
     },
     [117] = {
-        [sym_declaration_specifiers] = ACTIONS(SHIFT(132)),
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
-        [sym_type_specifier] = ACTIONS(SHIFT(133)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(6)),
-        [sym_declaration] = ACTIONS(SHIFT(134)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
-        [sym_compound_statement] = ACTIONS(SHIFT(135)),
-        [sym_identifier] = ACTIONS(SHIFT(6)),
+        [sym__init_declarator] = ACTIONS(REDUCE(sym_type_name, 2)),
+        [sym_declarator] = ACTIONS(REDUCE(sym_type_name, 2)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym_type_name, 2)),
+        [sym_pointer] = ACTIONS(REDUCE(sym_type_name, 2)),
+        [sym_identifier] = ACTIONS(REDUCE(sym_type_name, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_function_definition_repeat1] = ACTIONS(SHIFT(136)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(7)),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_init_declarator, 1)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(10)),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(137)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_init_declarator, 1)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_init_declarator, 1)),
-        [aux_sym_STR_EQ] = ACTIONS(SHIFT(138)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
+        [aux_sym_declarator_repeat1] = ACTIONS(REDUCE(sym_type_name, 2)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_type_name, 2)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_type_name, 2)),
     },
     [118] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(257)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(238)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(258)),
+    },
+    [119] = {
+        [sym_declaration_specifiers] = ACTIONS(SHIFT(134)),
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
+        [sym__type_specifier] = ACTIONS(SHIFT(135)),
+        [sym_type_name] = ACTIONS(SHIFT(6)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(6)),
+        [sym_declaration] = ACTIONS(SHIFT(136)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
+        [sym_compound_statement] = ACTIONS(SHIFT(137)),
+        [sym_identifier] = ACTIONS(SHIFT(7)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_function_definition_repeat1] = ACTIONS(SHIFT(138)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(8)),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym__init_declarator, 1)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(11)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(139)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__init_declarator, 1)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__init_declarator, 1)),
+        [aux_sym_STR_EQ] = ACTIONS(SHIFT(140)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
+    },
+    [120] = {
         [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_declarator, 1)),
         [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_declarator, 1)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_declarator, 1)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_declarator, 1)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_declarator, 1)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_declarator, 1)),
         [sym_declaration] = ACTIONS(REDUCE(sym_declarator, 1)),
         [sym_type_qualifier] = ACTIONS(REDUCE(sym_declarator, 1)),
@@ -3422,7 +3474,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_identifier] = ACTIONS(REDUCE(sym_declarator, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym_declarator, 1)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_declarator, 1)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_declarator, 1)),
@@ -3438,102 +3490,105 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_declarator, 1)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(125)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(126)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(127)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(128)),
         [aux_sym_STR_const] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_declarator, 1)),
     },
-    [119] = {
-        [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [sym_struct_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [sym_declaration] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [sym_type_qualifier] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [sym_compound_statement] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_static] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_auto] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_register] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_long] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_short] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_const] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-    },
-    [120] = {
-        [sym_direct_declarator] = ACTIONS(SHIFT(124)),
-        [sym_identifier] = ACTIONS(SHIFT(119)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(121)),
-    },
     [121] = {
-        [sym_declarator] = ACTIONS(SHIFT(122)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(40)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(41)),
+        [sym_declaration_specifiers] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [sym_storage_class_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [sym_type_name] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [sym_struct_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [sym_declaration] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [sym_type_qualifier] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [sym_compound_statement] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [sym_identifier] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(42)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(43)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
+        [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_extern] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_static] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_auto] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_register] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_long] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_short] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_const] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
     },
     [122] = {
+        [sym__direct_declarator] = ACTIONS(SHIFT(126)),
+        [sym_identifier] = ACTIONS(SHIFT(121)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(123)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(123)),
     },
     [123] = {
-        [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [sym_struct_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [sym_declaration] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [sym_type_qualifier] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [sym_compound_statement] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
+        [sym_declarator] = ACTIONS(SHIFT(124)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(42)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(43)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_static] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_auto] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_register] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_long] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_short] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_const] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(44)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(45)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
     [124] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(125)),
+    },
+    [125] = {
+        [sym_declaration_specifiers] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_storage_class_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_type_name] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_struct_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_declaration] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_type_qualifier] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_compound_statement] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_identifier] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_extern] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_static] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_auto] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_register] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_long] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_short] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_const] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+    },
+    [126] = {
         [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_declarator, 2)),
         [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_declarator, 2)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_declarator, 2)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_declarator, 2)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_declarator, 2)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_declarator, 2)),
         [sym_declaration] = ACTIONS(REDUCE(sym_declarator, 2)),
         [sym_type_qualifier] = ACTIONS(REDUCE(sym_declarator, 2)),
@@ -3541,7 +3596,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_identifier] = ACTIONS(REDUCE(sym_declarator, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym_declarator, 2)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_declarator, 2)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_declarator, 2)),
@@ -3557,249 +3612,255 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_declarator, 2)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(125)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(126)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(127)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(128)),
         [aux_sym_STR_const] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_declarator, 2)),
     },
-    [125] = {
-        [sym_expression] = ACTIONS(SHIFT(131)),
-        [sym_math_expression] = ACTIONS(SHIFT(73)),
-        [sym_call_expression] = ACTIONS(SHIFT(73)),
-        [sym_string] = ACTIONS(SHIFT(73)),
-        [sym_identifier] = ACTIONS(SHIFT(73)),
-        [sym_number] = ACTIONS(SHIFT(73)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(123)),
-    },
-    [126] = {
-        [sym_declaration_specifiers] = ACTIONS(SHIFT(49)),
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
-        [sym_type_specifier] = ACTIONS(SHIFT(50)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(15)),
-        [sym_parameter_declaration] = ACTIONS(SHIFT(127)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
-        [sym_identifier] = ACTIONS(SHIFT(15)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(17)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(19)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(123)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
-    },
     [127] = {
+        [sym_expression] = ACTIONS(SHIFT(133)),
+        [sym_math_expression] = ACTIONS(SHIFT(75)),
+        [sym_call_expression] = ACTIONS(SHIFT(75)),
+        [sym_string] = ACTIONS(SHIFT(75)),
+        [sym_identifier] = ACTIONS(SHIFT(75)),
+        [sym_number] = ACTIONS(SHIFT(75)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(SHIFT(128)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(53)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(129)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(125)),
     },
     [128] = {
+        [sym_declaration_specifiers] = ACTIONS(SHIFT(51)),
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
+        [sym__type_specifier] = ACTIONS(SHIFT(52)),
+        [sym_type_name] = ACTIONS(SHIFT(16)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(16)),
+        [sym_parameter_declaration] = ACTIONS(SHIFT(129)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
+        [sym_identifier] = ACTIONS(SHIFT(18)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(130)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(19)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(125)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
     },
     [129] = {
-        [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [sym_struct_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [sym_declaration] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [sym_type_qualifier] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [sym_compound_statement] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_static] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_auto] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_register] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_long] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_short] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_const] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(SHIFT(130)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(55)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(131)),
     },
     [130] = {
-        [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [sym_struct_specifier] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [sym_declaration] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [sym_type_qualifier] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [sym_compound_statement] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_static] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_auto] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_register] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_long] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_short] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_const] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(132)),
     },
     [131] = {
+        [sym_declaration_specifiers] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [sym_storage_class_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [sym_type_name] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [sym_struct_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [sym_declaration] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [sym_type_qualifier] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [sym_compound_statement] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [sym_identifier] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(129)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(74)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(75)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(76)),
+        [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_extern] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_static] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_auto] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_register] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_long] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_short] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_const] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
     },
     [132] = {
-        [sym_type_specifier] = ACTIONS(SHIFT(251)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(6)),
-        [sym_identifier] = ACTIONS(SHIFT(6)),
+        [sym_declaration_specifiers] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym_storage_class_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym_type_name] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym_struct_specifier] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym_declaration] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym_type_qualifier] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym_compound_statement] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [sym_identifier] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(7)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(10)),
+        [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_extern] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_static] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_auto] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_register] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_signed] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_long] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_short] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_struct] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_const] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
     },
     [133] = {
-        [sym_init_declarator] = ACTIONS(SHIFT(247)),
-        [sym_declarator] = ACTIONS(SHIFT(220)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(221)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(222)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(223)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(224)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(131)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(76)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(77)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(78)),
     },
     [134] = {
-        [sym_declaration_specifiers] = ACTIONS(SHIFT(132)),
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
-        [sym_type_specifier] = ACTIONS(SHIFT(133)),
+        [sym__type_specifier] = ACTIONS(SHIFT(253)),
+        [sym_type_name] = ACTIONS(SHIFT(6)),
         [sym_struct_specifier] = ACTIONS(SHIFT(6)),
-        [sym_declaration] = ACTIONS(SHIFT(134)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
-        [sym_compound_statement] = ACTIONS(REDUCE(aux_sym_function_definition_repeat1, 1)),
-        [sym_identifier] = ACTIONS(SHIFT(6)),
+        [sym_identifier] = ACTIONS(SHIFT(7)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_function_definition_repeat1] = ACTIONS(SHIFT(246)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(7)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(10)),
-        [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(aux_sym_function_definition_repeat1, 1)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(8)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(11)),
     },
     [135] = {
+        [sym__init_declarator] = ACTIONS(SHIFT(249)),
+        [sym_declarator] = ACTIONS(SHIFT(222)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(223)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(224)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(225)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(226)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
+    },
+    [136] = {
+        [sym_declaration_specifiers] = ACTIONS(SHIFT(134)),
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
+        [sym__type_specifier] = ACTIONS(SHIFT(135)),
+        [sym_type_name] = ACTIONS(SHIFT(6)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(6)),
+        [sym_declaration] = ACTIONS(SHIFT(136)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
+        [sym_compound_statement] = ACTIONS(REDUCE(aux_sym_function_definition_repeat1, 1)),
+        [sym_identifier] = ACTIONS(SHIFT(7)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_function_definition_repeat1] = ACTIONS(SHIFT(248)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(8)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(11)),
+        [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(aux_sym_function_definition_repeat1, 1)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
+    },
+    [137] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_function_definition, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
-    [136] = {
-        [sym_compound_statement] = ACTIONS(SHIFT(245)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(137)),
-    },
-    [137] = {
-        [sym_declaration_specifiers] = ACTIONS(SHIFT(197)),
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
-        [sym_type_specifier] = ACTIONS(SHIFT(198)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(6)),
-        [sym_declaration] = ACTIONS(SHIFT(199)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
-        [sym_expression] = ACTIONS(SHIFT(200)),
-        [sym_math_expression] = ACTIONS(SHIFT(201)),
-        [sym_call_expression] = ACTIONS(SHIFT(201)),
-        [sym_statement] = ACTIONS(SHIFT(199)),
-        [sym_expression_statement] = ACTIONS(SHIFT(202)),
-        [sym_string] = ACTIONS(SHIFT(201)),
-        [sym_identifier] = ACTIONS(SHIFT(203)),
-        [sym_number] = ACTIONS(SHIFT(201)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(7)),
-        [aux_sym_compound_statement_repeat1] = ACTIONS(SHIFT(204)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(10)),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(205)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
-    },
     [138] = {
-        [sym_initializer] = ACTIONS(SHIFT(139)),
-        [sym_expression] = ACTIONS(SHIFT(140)),
-        [sym_math_expression] = ACTIONS(SHIFT(141)),
-        [sym_call_expression] = ACTIONS(SHIFT(141)),
-        [sym_string] = ACTIONS(SHIFT(141)),
-        [sym_identifier] = ACTIONS(SHIFT(141)),
-        [sym_number] = ACTIONS(SHIFT(141)),
+        [sym_compound_statement] = ACTIONS(SHIFT(247)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(142)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(139)),
     },
     [139] = {
+        [sym_declaration_specifiers] = ACTIONS(SHIFT(199)),
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
+        [sym__type_specifier] = ACTIONS(SHIFT(200)),
+        [sym_type_name] = ACTIONS(SHIFT(6)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(6)),
+        [sym_declaration] = ACTIONS(SHIFT(201)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
+        [sym_expression] = ACTIONS(SHIFT(202)),
+        [sym_math_expression] = ACTIONS(SHIFT(203)),
+        [sym_call_expression] = ACTIONS(SHIFT(203)),
+        [sym_statement] = ACTIONS(SHIFT(201)),
+        [sym_expression_statement] = ACTIONS(SHIFT(204)),
+        [sym_string] = ACTIONS(SHIFT(203)),
+        [sym_identifier] = ACTIONS(SHIFT(205)),
+        [sym_number] = ACTIONS(SHIFT(203)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_init_declarator, 3)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_init_declarator, 3)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_init_declarator, 3)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(8)),
+        [aux_sym_compound_statement_repeat1] = ACTIONS(SHIFT(206)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(11)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(207)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
     },
     [140] = {
+        [sym_initializer] = ACTIONS(SHIFT(141)),
+        [sym_expression] = ACTIONS(SHIFT(142)),
+        [sym_math_expression] = ACTIONS(SHIFT(143)),
+        [sym_call_expression] = ACTIONS(SHIFT(143)),
+        [sym_string] = ACTIONS(SHIFT(143)),
+        [sym_identifier] = ACTIONS(SHIFT(143)),
+        [sym_number] = ACTIONS(SHIFT(143)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(144)),
+    },
+    [141] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym__init_declarator, 3)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__init_declarator, 3)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__init_declarator, 3)),
+    },
+    [142] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_initializer, 1)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_initializer, 1)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_initializer, 1)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(187)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(188)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(189)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(189)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(190)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(191)),
     },
-    [141] = {
+    [143] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_expression, 1)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_expression, 1)),
@@ -3808,51 +3869,51 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_expression, 1)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
     },
-    [142] = {
-        [sym_initializer] = ACTIONS(SHIFT(143)),
-        [sym_initializer_list] = ACTIONS(SHIFT(144)),
-        [sym_designation] = ACTIONS(SHIFT(145)),
-        [sym_expression] = ACTIONS(SHIFT(146)),
-        [sym_math_expression] = ACTIONS(SHIFT(147)),
-        [sym_call_expression] = ACTIONS(SHIFT(147)),
-        [sym_string] = ACTIONS(SHIFT(147)),
-        [sym_identifier] = ACTIONS(SHIFT(147)),
-        [sym_number] = ACTIONS(SHIFT(147)),
+    [144] = {
+        [sym_initializer] = ACTIONS(SHIFT(145)),
+        [sym_initializer_list] = ACTIONS(SHIFT(146)),
+        [sym_designation] = ACTIONS(SHIFT(147)),
+        [sym_expression] = ACTIONS(SHIFT(148)),
+        [sym_math_expression] = ACTIONS(SHIFT(149)),
+        [sym_call_expression] = ACTIONS(SHIFT(149)),
+        [sym_string] = ACTIONS(SHIFT(149)),
+        [sym_identifier] = ACTIONS(SHIFT(149)),
+        [sym_number] = ACTIONS(SHIFT(149)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(148)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(149)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(150)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(150)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(151)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(152)),
     },
-    [143] = {
+    [145] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_initializer_list, 1)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_initializer_list, 1)),
     },
-    [144] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(184)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(185)),
-    },
-    [145] = {
-        [sym_initializer] = ACTIONS(SHIFT(183)),
-        [sym_expression] = ACTIONS(SHIFT(146)),
-        [sym_math_expression] = ACTIONS(SHIFT(147)),
-        [sym_call_expression] = ACTIONS(SHIFT(147)),
-        [sym_string] = ACTIONS(SHIFT(147)),
-        [sym_identifier] = ACTIONS(SHIFT(147)),
-        [sym_number] = ACTIONS(SHIFT(147)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(148)),
-    },
     [146] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(186)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(187)),
+    },
+    [147] = {
+        [sym_initializer] = ACTIONS(SHIFT(185)),
+        [sym_expression] = ACTIONS(SHIFT(148)),
+        [sym_math_expression] = ACTIONS(SHIFT(149)),
+        [sym_call_expression] = ACTIONS(SHIFT(149)),
+        [sym_string] = ACTIONS(SHIFT(149)),
+        [sym_identifier] = ACTIONS(SHIFT(149)),
+        [sym_number] = ACTIONS(SHIFT(149)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(150)),
+    },
+    [148] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_initializer, 1)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_initializer, 1)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(173)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(174)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(175)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(175)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(176)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(177)),
     },
-    [147] = {
+    [149] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_expression, 1)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_expression, 1)),
@@ -3860,46 +3921,46 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_expression, 1)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
     },
-    [148] = {
-        [sym_initializer] = ACTIONS(SHIFT(143)),
-        [sym_initializer_list] = ACTIONS(SHIFT(166)),
-        [sym_designation] = ACTIONS(SHIFT(145)),
-        [sym_expression] = ACTIONS(SHIFT(146)),
-        [sym_math_expression] = ACTIONS(SHIFT(147)),
-        [sym_call_expression] = ACTIONS(SHIFT(147)),
-        [sym_string] = ACTIONS(SHIFT(147)),
-        [sym_identifier] = ACTIONS(SHIFT(147)),
-        [sym_number] = ACTIONS(SHIFT(147)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(148)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(149)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(150)),
-    },
-    [149] = {
-        [sym_expression] = ACTIONS(SHIFT(162)),
-        [sym_math_expression] = ACTIONS(SHIFT(73)),
-        [sym_call_expression] = ACTIONS(SHIFT(73)),
-        [sym_string] = ACTIONS(SHIFT(73)),
-        [sym_identifier] = ACTIONS(SHIFT(73)),
-        [sym_number] = ACTIONS(SHIFT(73)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-    },
     [150] = {
-        [sym_identifier] = ACTIONS(SHIFT(151)),
+        [sym_initializer] = ACTIONS(SHIFT(145)),
+        [sym_initializer_list] = ACTIONS(SHIFT(168)),
+        [sym_designation] = ACTIONS(SHIFT(147)),
+        [sym_expression] = ACTIONS(SHIFT(148)),
+        [sym_math_expression] = ACTIONS(SHIFT(149)),
+        [sym_call_expression] = ACTIONS(SHIFT(149)),
+        [sym_string] = ACTIONS(SHIFT(149)),
+        [sym_identifier] = ACTIONS(SHIFT(149)),
+        [sym_number] = ACTIONS(SHIFT(149)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(150)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(151)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(152)),
     },
     [151] = {
+        [sym_expression] = ACTIONS(SHIFT(164)),
+        [sym_math_expression] = ACTIONS(SHIFT(75)),
+        [sym_call_expression] = ACTIONS(SHIFT(75)),
+        [sym_string] = ACTIONS(SHIFT(75)),
+        [sym_identifier] = ACTIONS(SHIFT(75)),
+        [sym_number] = ACTIONS(SHIFT(75)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_designation_repeat1] = ACTIONS(SHIFT(152)),
-        [aux_sym_STR_EQ] = ACTIONS(SHIFT(153)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(154)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(155)),
     },
     [152] = {
+        [sym_identifier] = ACTIONS(SHIFT(153)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_EQ] = ACTIONS(SHIFT(161)),
     },
     [153] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_designation_repeat1] = ACTIONS(SHIFT(154)),
+        [aux_sym_STR_EQ] = ACTIONS(SHIFT(155)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(156)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(157)),
+    },
+    [154] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_EQ] = ACTIONS(SHIFT(163)),
+    },
+    [155] = {
         [sym_initializer] = ACTIONS(REDUCE(sym_designation, 3)),
         [sym_expression] = ACTIONS(REDUCE(sym_designation, 3)),
         [sym_math_expression] = ACTIONS(REDUCE(sym_designation, 3)),
@@ -3910,49 +3971,49 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym_designation, 3)),
     },
-    [154] = {
-        [sym_expression] = ACTIONS(SHIFT(158)),
-        [sym_math_expression] = ACTIONS(SHIFT(73)),
-        [sym_call_expression] = ACTIONS(SHIFT(73)),
-        [sym_string] = ACTIONS(SHIFT(73)),
-        [sym_identifier] = ACTIONS(SHIFT(73)),
-        [sym_number] = ACTIONS(SHIFT(73)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-    },
-    [155] = {
-        [sym_identifier] = ACTIONS(SHIFT(156)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-    },
     [156] = {
+        [sym_expression] = ACTIONS(SHIFT(160)),
+        [sym_math_expression] = ACTIONS(SHIFT(75)),
+        [sym_call_expression] = ACTIONS(SHIFT(75)),
+        [sym_string] = ACTIONS(SHIFT(75)),
+        [sym_identifier] = ACTIONS(SHIFT(75)),
+        [sym_number] = ACTIONS(SHIFT(75)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_designation_repeat1] = ACTIONS(SHIFT(157)),
-        [aux_sym_STR_EQ] = ACTIONS(REDUCE(aux_sym_designation_repeat1, 2)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(154)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(155)),
     },
     [157] = {
+        [sym_identifier] = ACTIONS(SHIFT(158)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_EQ] = ACTIONS(REDUCE(aux_sym_designation_repeat1, 3)),
     },
     [158] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(159)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(74)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(75)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(76)),
+        [aux_sym_designation_repeat1] = ACTIONS(SHIFT(159)),
+        [aux_sym_STR_EQ] = ACTIONS(REDUCE(aux_sym_designation_repeat1, 2)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(156)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(157)),
     },
     [159] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_designation_repeat1] = ACTIONS(SHIFT(160)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(aux_sym_designation_repeat1, 3)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(154)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(155)),
     },
     [160] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_EQ] = ACTIONS(REDUCE(aux_sym_designation_repeat1, 4)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(161)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(76)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(77)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(78)),
     },
     [161] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_designation_repeat1] = ACTIONS(SHIFT(162)),
+        [aux_sym_STR_EQ] = ACTIONS(REDUCE(aux_sym_designation_repeat1, 3)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(156)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(157)),
+    },
+    [162] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_EQ] = ACTIONS(REDUCE(aux_sym_designation_repeat1, 4)),
+    },
+    [163] = {
         [sym_initializer] = ACTIONS(REDUCE(sym_designation, 4)),
         [sym_expression] = ACTIONS(REDUCE(sym_designation, 4)),
         [sym_math_expression] = ACTIONS(REDUCE(sym_designation, 4)),
@@ -3963,25 +4024,25 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym_designation, 4)),
     },
-    [162] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(163)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(74)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(75)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(76)),
-    },
-    [163] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_designation_repeat1] = ACTIONS(SHIFT(164)),
-        [aux_sym_STR_EQ] = ACTIONS(SHIFT(161)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(154)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(155)),
-    },
     [164] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_EQ] = ACTIONS(SHIFT(165)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(165)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(76)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(77)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(78)),
     },
     [165] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_designation_repeat1] = ACTIONS(SHIFT(166)),
+        [aux_sym_STR_EQ] = ACTIONS(SHIFT(163)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(156)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(157)),
+    },
+    [166] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_EQ] = ACTIONS(SHIFT(167)),
+    },
+    [167] = {
         [sym_initializer] = ACTIONS(REDUCE(sym_designation, 5)),
         [sym_expression] = ACTIONS(REDUCE(sym_designation, 5)),
         [sym_math_expression] = ACTIONS(REDUCE(sym_designation, 5)),
@@ -3992,111 +4053,111 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym_designation, 5)),
     },
-    [166] = {
+    [168] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(167)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(168)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(169)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(170)),
     },
-    [167] = {
+    [169] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_initializer, 3)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_initializer, 3)),
     },
-    [168] = {
-        [sym_initializer] = ACTIONS(SHIFT(169)),
-        [sym_designation] = ACTIONS(SHIFT(170)),
-        [sym_expression] = ACTIONS(SHIFT(146)),
-        [sym_math_expression] = ACTIONS(SHIFT(147)),
-        [sym_call_expression] = ACTIONS(SHIFT(147)),
-        [sym_string] = ACTIONS(SHIFT(147)),
-        [sym_identifier] = ACTIONS(SHIFT(147)),
-        [sym_number] = ACTIONS(SHIFT(147)),
+    [170] = {
+        [sym_initializer] = ACTIONS(SHIFT(171)),
+        [sym_designation] = ACTIONS(SHIFT(172)),
+        [sym_expression] = ACTIONS(SHIFT(148)),
+        [sym_math_expression] = ACTIONS(SHIFT(149)),
+        [sym_call_expression] = ACTIONS(SHIFT(149)),
+        [sym_string] = ACTIONS(SHIFT(149)),
+        [sym_identifier] = ACTIONS(SHIFT(149)),
+        [sym_number] = ACTIONS(SHIFT(149)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(148)),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(171)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(149)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(150)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(150)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(173)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(151)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(152)),
     },
-    [169] = {
+    [171] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_initializer_list, 3)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_initializer_list, 3)),
     },
-    [170] = {
-        [sym_initializer] = ACTIONS(SHIFT(172)),
-        [sym_expression] = ACTIONS(SHIFT(146)),
-        [sym_math_expression] = ACTIONS(SHIFT(147)),
-        [sym_call_expression] = ACTIONS(SHIFT(147)),
-        [sym_string] = ACTIONS(SHIFT(147)),
-        [sym_identifier] = ACTIONS(SHIFT(147)),
-        [sym_number] = ACTIONS(SHIFT(147)),
+    [172] = {
+        [sym_initializer] = ACTIONS(SHIFT(174)),
+        [sym_expression] = ACTIONS(SHIFT(148)),
+        [sym_math_expression] = ACTIONS(SHIFT(149)),
+        [sym_call_expression] = ACTIONS(SHIFT(149)),
+        [sym_string] = ACTIONS(SHIFT(149)),
+        [sym_identifier] = ACTIONS(SHIFT(149)),
+        [sym_number] = ACTIONS(SHIFT(149)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(148)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(150)),
     },
-    [171] = {
+    [173] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_initializer, 4)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_initializer, 4)),
     },
-    [172] = {
+    [174] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_initializer_list, 4)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_initializer_list, 4)),
     },
-    [173] = {
-        [sym_expression] = ACTIONS(SHIFT(178)),
-        [sym_math_expression] = ACTIONS(SHIFT(80)),
-        [sym_call_expression] = ACTIONS(SHIFT(80)),
-        [sym_string] = ACTIONS(SHIFT(80)),
-        [sym_identifier] = ACTIONS(SHIFT(80)),
-        [sym_number] = ACTIONS(SHIFT(80)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(179)),
-    },
-    [174] = {
-        [sym_expression] = ACTIONS(SHIFT(177)),
-        [sym_math_expression] = ACTIONS(SHIFT(147)),
-        [sym_call_expression] = ACTIONS(SHIFT(147)),
-        [sym_string] = ACTIONS(SHIFT(147)),
-        [sym_identifier] = ACTIONS(SHIFT(147)),
-        [sym_number] = ACTIONS(SHIFT(147)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-    },
     [175] = {
-        [sym_expression] = ACTIONS(SHIFT(176)),
-        [sym_math_expression] = ACTIONS(SHIFT(147)),
-        [sym_call_expression] = ACTIONS(SHIFT(147)),
-        [sym_string] = ACTIONS(SHIFT(147)),
-        [sym_identifier] = ACTIONS(SHIFT(147)),
-        [sym_number] = ACTIONS(SHIFT(147)),
+        [sym_expression] = ACTIONS(SHIFT(180)),
+        [sym_math_expression] = ACTIONS(SHIFT(82)),
+        [sym_call_expression] = ACTIONS(SHIFT(82)),
+        [sym_string] = ACTIONS(SHIFT(82)),
+        [sym_identifier] = ACTIONS(SHIFT(82)),
+        [sym_number] = ACTIONS(SHIFT(82)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(181)),
     },
     [176] = {
+        [sym_expression] = ACTIONS(SHIFT(179)),
+        [sym_math_expression] = ACTIONS(SHIFT(149)),
+        [sym_call_expression] = ACTIONS(SHIFT(149)),
+        [sym_string] = ACTIONS(SHIFT(149)),
+        [sym_identifier] = ACTIONS(SHIFT(149)),
+        [sym_number] = ACTIONS(SHIFT(149)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(173)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(174)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [177] = {
+        [sym_expression] = ACTIONS(SHIFT(178)),
+        [sym_math_expression] = ACTIONS(SHIFT(149)),
+        [sym_call_expression] = ACTIONS(SHIFT(149)),
+        [sym_string] = ACTIONS(SHIFT(149)),
+        [sym_identifier] = ACTIONS(SHIFT(149)),
+        [sym_number] = ACTIONS(SHIFT(149)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(173)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [178] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_call_expression_repeat1] = ACTIONS(SHIFT(180)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(83)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(84)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(181)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(86)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(87)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(175)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(176)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [179] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(175)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+    },
+    [180] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_call_expression_repeat1] = ACTIONS(SHIFT(182)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(85)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(86)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(183)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(88)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(89)),
+    },
+    [181] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_call_expression, 3)),
@@ -4104,11 +4165,11 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 3)),
     },
-    [180] = {
+    [182] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(182)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(184)),
     },
-    [181] = {
+    [183] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_call_expression, 4)),
@@ -4116,7 +4177,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 4)),
     },
-    [182] = {
+    [184] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_call_expression, 5)),
@@ -4124,94 +4185,94 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 5)),
     },
-    [183] = {
+    [185] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_initializer_list, 2)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_initializer_list, 2)),
     },
-    [184] = {
+    [186] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_initializer, 3)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_initializer, 3)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_initializer, 3)),
     },
-    [185] = {
-        [sym_initializer] = ACTIONS(SHIFT(169)),
-        [sym_designation] = ACTIONS(SHIFT(170)),
-        [sym_expression] = ACTIONS(SHIFT(146)),
-        [sym_math_expression] = ACTIONS(SHIFT(147)),
-        [sym_call_expression] = ACTIONS(SHIFT(147)),
-        [sym_string] = ACTIONS(SHIFT(147)),
-        [sym_identifier] = ACTIONS(SHIFT(147)),
-        [sym_number] = ACTIONS(SHIFT(147)),
+    [187] = {
+        [sym_initializer] = ACTIONS(SHIFT(171)),
+        [sym_designation] = ACTIONS(SHIFT(172)),
+        [sym_expression] = ACTIONS(SHIFT(148)),
+        [sym_math_expression] = ACTIONS(SHIFT(149)),
+        [sym_call_expression] = ACTIONS(SHIFT(149)),
+        [sym_string] = ACTIONS(SHIFT(149)),
+        [sym_identifier] = ACTIONS(SHIFT(149)),
+        [sym_number] = ACTIONS(SHIFT(149)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(148)),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(186)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(149)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(150)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(150)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(188)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(151)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(152)),
     },
-    [186] = {
+    [188] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_initializer, 4)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_initializer, 4)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_initializer, 4)),
     },
-    [187] = {
-        [sym_expression] = ACTIONS(SHIFT(192)),
-        [sym_math_expression] = ACTIONS(SHIFT(80)),
-        [sym_call_expression] = ACTIONS(SHIFT(80)),
-        [sym_string] = ACTIONS(SHIFT(80)),
-        [sym_identifier] = ACTIONS(SHIFT(80)),
-        [sym_number] = ACTIONS(SHIFT(80)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(193)),
-    },
-    [188] = {
-        [sym_expression] = ACTIONS(SHIFT(191)),
-        [sym_math_expression] = ACTIONS(SHIFT(141)),
-        [sym_call_expression] = ACTIONS(SHIFT(141)),
-        [sym_string] = ACTIONS(SHIFT(141)),
-        [sym_identifier] = ACTIONS(SHIFT(141)),
-        [sym_number] = ACTIONS(SHIFT(141)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-    },
     [189] = {
-        [sym_expression] = ACTIONS(SHIFT(190)),
-        [sym_math_expression] = ACTIONS(SHIFT(141)),
-        [sym_call_expression] = ACTIONS(SHIFT(141)),
-        [sym_string] = ACTIONS(SHIFT(141)),
-        [sym_identifier] = ACTIONS(SHIFT(141)),
-        [sym_number] = ACTIONS(SHIFT(141)),
+        [sym_expression] = ACTIONS(SHIFT(194)),
+        [sym_math_expression] = ACTIONS(SHIFT(82)),
+        [sym_call_expression] = ACTIONS(SHIFT(82)),
+        [sym_string] = ACTIONS(SHIFT(82)),
+        [sym_identifier] = ACTIONS(SHIFT(82)),
+        [sym_number] = ACTIONS(SHIFT(82)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(195)),
     },
     [190] = {
+        [sym_expression] = ACTIONS(SHIFT(193)),
+        [sym_math_expression] = ACTIONS(SHIFT(143)),
+        [sym_call_expression] = ACTIONS(SHIFT(143)),
+        [sym_string] = ACTIONS(SHIFT(143)),
+        [sym_identifier] = ACTIONS(SHIFT(143)),
+        [sym_number] = ACTIONS(SHIFT(143)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(187)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(188)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [191] = {
+        [sym_expression] = ACTIONS(SHIFT(192)),
+        [sym_math_expression] = ACTIONS(SHIFT(143)),
+        [sym_call_expression] = ACTIONS(SHIFT(143)),
+        [sym_string] = ACTIONS(SHIFT(143)),
+        [sym_identifier] = ACTIONS(SHIFT(143)),
+        [sym_number] = ACTIONS(SHIFT(143)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(187)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [192] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_call_expression_repeat1] = ACTIONS(SHIFT(194)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(83)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(84)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(195)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(86)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(87)),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(189)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(190)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [193] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(189)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+    },
+    [194] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_call_expression_repeat1] = ACTIONS(SHIFT(196)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(85)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(86)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(197)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(88)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(89)),
+    },
+    [195] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_call_expression, 3)),
@@ -4220,11 +4281,11 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 3)),
     },
-    [194] = {
+    [196] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(196)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(198)),
     },
-    [195] = {
+    [197] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_call_expression, 4)),
@@ -4233,7 +4294,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 4)),
     },
-    [196] = {
+    [198] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_call_expression, 5)),
@@ -4242,80 +4303,83 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 5)),
     },
-    [197] = {
-        [sym_type_specifier] = ACTIONS(SHIFT(241)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(6)),
-        [sym_identifier] = ACTIONS(SHIFT(6)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(7)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(10)),
-    },
-    [198] = {
-        [sym_init_declarator] = ACTIONS(SHIFT(219)),
-        [sym_declarator] = ACTIONS(SHIFT(220)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(221)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(222)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(223)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(224)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
-    },
     [199] = {
-        [sym_declaration_specifiers] = ACTIONS(SHIFT(197)),
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
-        [sym_type_specifier] = ACTIONS(SHIFT(198)),
+        [sym__type_specifier] = ACTIONS(SHIFT(243)),
+        [sym_type_name] = ACTIONS(SHIFT(6)),
         [sym_struct_specifier] = ACTIONS(SHIFT(6)),
-        [sym_declaration] = ACTIONS(SHIFT(199)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
-        [sym_expression] = ACTIONS(SHIFT(200)),
-        [sym_math_expression] = ACTIONS(SHIFT(201)),
-        [sym_call_expression] = ACTIONS(SHIFT(201)),
-        [sym_statement] = ACTIONS(SHIFT(199)),
-        [sym_expression_statement] = ACTIONS(SHIFT(202)),
-        [sym_string] = ACTIONS(SHIFT(201)),
-        [sym_identifier] = ACTIONS(SHIFT(203)),
-        [sym_number] = ACTIONS(SHIFT(201)),
+        [sym_identifier] = ACTIONS(SHIFT(7)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(7)),
-        [aux_sym_compound_statement_repeat1] = ACTIONS(SHIFT(218)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(10)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(aux_sym_compound_statement_repeat1, 1)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(8)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(11)),
     },
     [200] = {
+        [sym__init_declarator] = ACTIONS(SHIFT(221)),
+        [sym_declarator] = ACTIONS(SHIFT(222)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(223)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(224)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(207)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(208)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(209)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(210)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(225)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(226)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
     [201] = {
+        [sym_declaration_specifiers] = ACTIONS(SHIFT(199)),
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
+        [sym__type_specifier] = ACTIONS(SHIFT(200)),
+        [sym_type_name] = ACTIONS(SHIFT(6)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(6)),
+        [sym_declaration] = ACTIONS(SHIFT(201)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
+        [sym_expression] = ACTIONS(SHIFT(202)),
+        [sym_math_expression] = ACTIONS(SHIFT(203)),
+        [sym_call_expression] = ACTIONS(SHIFT(203)),
+        [sym_statement] = ACTIONS(SHIFT(201)),
+        [sym_expression_statement] = ACTIONS(SHIFT(204)),
+        [sym_string] = ACTIONS(SHIFT(203)),
+        [sym_identifier] = ACTIONS(SHIFT(205)),
+        [sym_number] = ACTIONS(SHIFT(203)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(8)),
+        [aux_sym_compound_statement_repeat1] = ACTIONS(SHIFT(220)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(11)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(aux_sym_compound_statement_repeat1, 1)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
+    },
+    [202] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(209)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(210)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(211)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(212)),
+    },
+    [203] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_expression, 1)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_expression, 1)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_expression, 1)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
     },
-    [202] = {
+    [204] = {
         [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_statement, 1)),
         [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_statement, 1)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_statement, 1)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_statement, 1)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_statement, 1)),
         [sym_declaration] = ACTIONS(REDUCE(sym_statement, 1)),
         [sym_type_qualifier] = ACTIONS(REDUCE(sym_statement, 1)),
@@ -4328,7 +4392,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_identifier] = ACTIONS(REDUCE(sym_statement, 1)),
         [sym_number] = ACTIONS(REDUCE(sym_statement, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_statement, 1)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_statement, 1)),
         [aux_sym_compound_statement_repeat1] = ACTIONS(REDUCE(sym_statement, 1)),
         [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_statement, 1)),
         [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_statement, 1)),
@@ -4345,35 +4409,36 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_statement, 1)),
         [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_statement, 1)),
     },
-    [203] = {
-        [sym_init_declarator] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [sym_declarator] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [sym_direct_declarator] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [sym_pointer] = ACTIONS(REDUCE(sym_type_specifier, 1)),
-        [sym_identifier] = ACTIONS(REDUCE(sym_type_specifier, 1)),
+    [205] = {
+        [sym__init_declarator] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [sym_declarator] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [sym__direct_declarator] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [sym_pointer] = ACTIONS(REDUCE(sym_type_name, 1)),
+        [sym_identifier] = ACTIONS(REDUCE(sym_type_name, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(REDUCE(sym_type_specifier, 1)),
+        [aux_sym_declarator_repeat1] = ACTIONS(REDUCE(sym_type_name, 1)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_type_specifier, 1), REDUCE(sym_expression, 1)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_type_specifier, 1), REDUCE(sym_expression, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_type_name, 1), REDUCE(sym_expression, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_type_name, 1), REDUCE(sym_expression, 1)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
     },
-    [204] = {
+    [206] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(206)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(208)),
     },
-    [205] = {
+    [207] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_compound_statement, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
-    [206] = {
+    [208] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_compound_statement, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
-    [207] = {
+    [209] = {
         [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_expression_statement, 2)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_expression_statement, 2)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_expression_statement, 2)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_declaration] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_type_qualifier] = ACTIONS(REDUCE(sym_expression_statement, 2)),
@@ -4386,7 +4451,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_identifier] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_number] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_expression_statement, 2)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [aux_sym_compound_statement_repeat1] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_expression_statement, 2)),
@@ -4403,244 +4468,246 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_expression_statement, 2)),
     },
-    [208] = {
-        [sym_expression] = ACTIONS(SHIFT(213)),
-        [sym_math_expression] = ACTIONS(SHIFT(80)),
-        [sym_call_expression] = ACTIONS(SHIFT(80)),
-        [sym_string] = ACTIONS(SHIFT(80)),
-        [sym_identifier] = ACTIONS(SHIFT(80)),
-        [sym_number] = ACTIONS(SHIFT(80)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(214)),
-    },
-    [209] = {
-        [sym_expression] = ACTIONS(SHIFT(212)),
-        [sym_math_expression] = ACTIONS(SHIFT(201)),
-        [sym_call_expression] = ACTIONS(SHIFT(201)),
-        [sym_string] = ACTIONS(SHIFT(201)),
-        [sym_identifier] = ACTIONS(SHIFT(201)),
-        [sym_number] = ACTIONS(SHIFT(201)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-    },
     [210] = {
-        [sym_expression] = ACTIONS(SHIFT(211)),
-        [sym_math_expression] = ACTIONS(SHIFT(201)),
-        [sym_call_expression] = ACTIONS(SHIFT(201)),
-        [sym_string] = ACTIONS(SHIFT(201)),
-        [sym_identifier] = ACTIONS(SHIFT(201)),
-        [sym_number] = ACTIONS(SHIFT(201)),
+        [sym_expression] = ACTIONS(SHIFT(215)),
+        [sym_math_expression] = ACTIONS(SHIFT(82)),
+        [sym_call_expression] = ACTIONS(SHIFT(82)),
+        [sym_string] = ACTIONS(SHIFT(82)),
+        [sym_identifier] = ACTIONS(SHIFT(82)),
+        [sym_number] = ACTIONS(SHIFT(82)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(216)),
     },
     [211] = {
+        [sym_expression] = ACTIONS(SHIFT(214)),
+        [sym_math_expression] = ACTIONS(SHIFT(203)),
+        [sym_call_expression] = ACTIONS(SHIFT(203)),
+        [sym_string] = ACTIONS(SHIFT(203)),
+        [sym_identifier] = ACTIONS(SHIFT(203)),
+        [sym_number] = ACTIONS(SHIFT(203)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(208)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(209)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [212] = {
+        [sym_expression] = ACTIONS(SHIFT(213)),
+        [sym_math_expression] = ACTIONS(SHIFT(203)),
+        [sym_call_expression] = ACTIONS(SHIFT(203)),
+        [sym_string] = ACTIONS(SHIFT(203)),
+        [sym_identifier] = ACTIONS(SHIFT(203)),
+        [sym_number] = ACTIONS(SHIFT(203)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(208)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [213] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_call_expression_repeat1] = ACTIONS(SHIFT(215)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(83)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(84)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(216)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(86)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(87)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(210)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(211)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
     },
     [214] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(210)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_expression, 3)),
+    },
+    [215] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_call_expression_repeat1] = ACTIONS(SHIFT(217)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(85)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(86)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(218)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(88)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(89)),
+    },
+    [216] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 3)),
     },
-    [215] = {
+    [217] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(217)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(219)),
     },
-    [216] = {
+    [218] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 4)),
     },
-    [217] = {
+    [219] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_call_expression, 5)),
     },
-    [218] = {
+    [220] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(aux_sym_compound_statement_repeat1, 2)),
     },
-    [219] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(235)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(236)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(237)),
-    },
-    [220] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_init_declarator, 1)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_init_declarator, 1)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_init_declarator, 1)),
-        [aux_sym_STR_EQ] = ACTIONS(SHIFT(138)),
-    },
     [221] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(237)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(238)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(239)),
+    },
+    [222] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym__init_declarator, 1)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__init_declarator, 1)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__init_declarator, 1)),
+        [aux_sym_STR_EQ] = ACTIONS(SHIFT(140)),
+    },
+    [223] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_declarator, 1)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_declarator, 1)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(229)),
-    },
-    [222] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 1)),
-    },
-    [223] = {
-        [sym_direct_declarator] = ACTIONS(SHIFT(227)),
-        [sym_identifier] = ACTIONS(SHIFT(222)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(224)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(230)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(231)),
     },
     [224] = {
-        [sym_declarator] = ACTIONS(SHIFT(225)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(40)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(41)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(42)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(43)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 1)),
     },
     [225] = {
+        [sym__direct_declarator] = ACTIONS(SHIFT(229)),
+        [sym_identifier] = ACTIONS(SHIFT(224)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(226)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(226)),
     },
     [226] = {
+        [sym_declarator] = ACTIONS(SHIFT(227)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(42)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(43)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 3)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(44)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(45)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
     [227] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(228)),
+    },
+    [228] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 3)),
+    },
+    [229] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_declarator, 2)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_declarator, 2)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(229)),
-    },
-    [228] = {
-        [sym_expression] = ACTIONS(SHIFT(234)),
-        [sym_math_expression] = ACTIONS(SHIFT(73)),
-        [sym_call_expression] = ACTIONS(SHIFT(73)),
-        [sym_string] = ACTIONS(SHIFT(73)),
-        [sym_identifier] = ACTIONS(SHIFT(73)),
-        [sym_number] = ACTIONS(SHIFT(73)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(226)),
-    },
-    [229] = {
-        [sym_declaration_specifiers] = ACTIONS(SHIFT(49)),
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
-        [sym_type_specifier] = ACTIONS(SHIFT(50)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(15)),
-        [sym_parameter_declaration] = ACTIONS(SHIFT(230)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
-        [sym_identifier] = ACTIONS(SHIFT(15)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(17)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(19)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(226)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(230)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(231)),
     },
     [230] = {
+        [sym_expression] = ACTIONS(SHIFT(236)),
+        [sym_math_expression] = ACTIONS(SHIFT(75)),
+        [sym_call_expression] = ACTIONS(SHIFT(75)),
+        [sym_string] = ACTIONS(SHIFT(75)),
+        [sym_identifier] = ACTIONS(SHIFT(75)),
+        [sym_number] = ACTIONS(SHIFT(75)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_direct_declarator_repeat1] = ACTIONS(SHIFT(231)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(53)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(232)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(228)),
     },
     [231] = {
+        [sym_declaration_specifiers] = ACTIONS(SHIFT(51)),
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
+        [sym__type_specifier] = ACTIONS(SHIFT(52)),
+        [sym_type_name] = ACTIONS(SHIFT(16)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(16)),
+        [sym_parameter_declaration] = ACTIONS(SHIFT(232)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
+        [sym_identifier] = ACTIONS(SHIFT(18)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(233)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(19)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(21)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(228)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
     },
     [232] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 4)),
+        [aux_sym__direct_declarator_repeat1] = ACTIONS(SHIFT(233)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(55)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(234)),
     },
     [233] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_direct_declarator, 5)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(235)),
     },
     [234] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(232)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(74)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(75)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(76)),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 4)),
     },
     [235] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(240)),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__direct_declarator, 5)),
     },
     [236] = {
-        [sym_init_declarator] = ACTIONS(SHIFT(238)),
-        [sym_declarator] = ACTIONS(SHIFT(220)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(221)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(222)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(223)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(224)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(234)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(76)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(77)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(78)),
     },
     [237] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(242)),
+    },
+    [238] = {
+        [sym__init_declarator] = ACTIONS(SHIFT(240)),
+        [sym_declarator] = ACTIONS(SHIFT(222)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(223)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(224)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(225)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(226)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
+    },
+    [239] = {
         [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_declaration, 3)),
         [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_declaration, 3)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_declaration, 3)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_declaration, 3)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_declaration, 3)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_declaration, 3)),
         [sym_declaration] = ACTIONS(REDUCE(sym_declaration, 3)),
         [sym_type_qualifier] = ACTIONS(REDUCE(sym_declaration, 3)),
@@ -4653,7 +4720,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_identifier] = ACTIONS(REDUCE(sym_declaration, 3)),
         [sym_number] = ACTIONS(REDUCE(sym_declaration, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_declaration, 3)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_declaration, 3)),
         [aux_sym_compound_statement_repeat1] = ACTIONS(REDUCE(sym_declaration, 3)),
         [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_declaration, 3)),
         [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_declaration, 3)),
@@ -4670,20 +4737,21 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_declaration, 3)),
         [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_declaration, 3)),
     },
-    [238] = {
+    [240] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(239)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(236)),
+        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(241)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(238)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(aux_sym_declaration_repeat1, 2)),
     },
-    [239] = {
+    [241] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(aux_sym_declaration_repeat1, 3)),
     },
-    [240] = {
+    [242] = {
         [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_declaration, 4)),
         [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_declaration, 4)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_declaration, 4)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_declaration, 4)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_declaration, 4)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_declaration, 4)),
         [sym_declaration] = ACTIONS(REDUCE(sym_declaration, 4)),
         [sym_type_qualifier] = ACTIONS(REDUCE(sym_declaration, 4)),
@@ -4696,7 +4764,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_identifier] = ACTIONS(REDUCE(sym_declaration, 4)),
         [sym_number] = ACTIONS(REDUCE(sym_declaration, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_declaration, 4)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_declaration, 4)),
         [aux_sym_compound_statement_repeat1] = ACTIONS(REDUCE(sym_declaration, 4)),
         [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_declaration, 4)),
         [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_declaration, 4)),
@@ -4713,31 +4781,32 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_declaration, 4)),
         [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_declaration, 4)),
     },
-    [241] = {
-        [sym_init_declarator] = ACTIONS(SHIFT(242)),
-        [sym_declarator] = ACTIONS(SHIFT(220)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(221)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(222)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(223)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(224)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
-    },
-    [242] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(243)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(236)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(240)),
-    },
     [243] = {
+        [sym__init_declarator] = ACTIONS(SHIFT(244)),
+        [sym_declarator] = ACTIONS(SHIFT(222)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(223)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(224)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(244)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(225)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(226)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
     [244] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(245)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(238)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(242)),
+    },
+    [245] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(246)),
+    },
+    [246] = {
         [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_declaration, 5)),
         [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_declaration, 5)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_declaration, 5)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_declaration, 5)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_declaration, 5)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_declaration, 5)),
         [sym_declaration] = ACTIONS(REDUCE(sym_declaration, 5)),
         [sym_type_qualifier] = ACTIONS(REDUCE(sym_declaration, 5)),
@@ -4750,7 +4819,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_identifier] = ACTIONS(REDUCE(sym_declaration, 5)),
         [sym_number] = ACTIONS(REDUCE(sym_declaration, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_declaration, 5)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_declaration, 5)),
         [aux_sym_compound_statement_repeat1] = ACTIONS(REDUCE(sym_declaration, 5)),
         [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_declaration, 5)),
         [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_declaration, 5)),
@@ -4767,29 +4836,30 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_declaration, 5)),
         [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_declaration, 5)),
     },
-    [245] = {
+    [247] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_function_definition, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
-    [246] = {
+    [248] = {
         [sym_compound_statement] = ACTIONS(REDUCE(aux_sym_function_definition_repeat1, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(aux_sym_function_definition_repeat1, 2)),
     },
-    [247] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(248)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(236)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(249)),
-    },
-    [248] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(250)),
-    },
     [249] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(250)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(238)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(251)),
+    },
+    [250] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(252)),
+    },
+    [251] = {
         [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_declaration, 3)),
         [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_declaration, 3)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_declaration, 3)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_declaration, 3)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_declaration, 3)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_declaration, 3)),
         [sym_declaration] = ACTIONS(REDUCE(sym_declaration, 3)),
         [sym_type_qualifier] = ACTIONS(REDUCE(sym_declaration, 3)),
@@ -4797,7 +4867,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_identifier] = ACTIONS(REDUCE(sym_declaration, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym_declaration, 3)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_declaration, 3)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_declaration, 3)),
         [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_declaration, 3)),
         [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_declaration, 3)),
         [aux_sym_STR_static] = ACTIONS(REDUCE(sym_declaration, 3)),
@@ -4813,10 +4883,11 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_declaration, 3)),
         [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_declaration, 3)),
     },
-    [250] = {
+    [252] = {
         [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_declaration, 4)),
         [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_declaration, 4)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_declaration, 4)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_declaration, 4)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_declaration, 4)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_declaration, 4)),
         [sym_declaration] = ACTIONS(REDUCE(sym_declaration, 4)),
         [sym_type_qualifier] = ACTIONS(REDUCE(sym_declaration, 4)),
@@ -4824,7 +4895,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_identifier] = ACTIONS(REDUCE(sym_declaration, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym_declaration, 4)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_declaration, 4)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_declaration, 4)),
         [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_declaration, 4)),
         [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_declaration, 4)),
         [aux_sym_STR_static] = ACTIONS(REDUCE(sym_declaration, 4)),
@@ -4840,31 +4911,32 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_declaration, 4)),
         [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_declaration, 4)),
     },
-    [251] = {
-        [sym_init_declarator] = ACTIONS(SHIFT(252)),
-        [sym_declarator] = ACTIONS(SHIFT(220)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(221)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(222)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(223)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(224)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
-    },
-    [252] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(236)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(250)),
-    },
     [253] = {
+        [sym__init_declarator] = ACTIONS(SHIFT(254)),
+        [sym_declarator] = ACTIONS(SHIFT(222)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(223)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(224)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(254)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(225)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(226)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
     [254] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(255)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(238)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(252)),
+    },
+    [255] = {
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(256)),
+    },
+    [256] = {
         [sym_declaration_specifiers] = ACTIONS(REDUCE(sym_declaration, 5)),
         [sym_storage_class_specifier] = ACTIONS(REDUCE(sym_declaration, 5)),
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_declaration, 5)),
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_declaration, 5)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_declaration, 5)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_declaration, 5)),
         [sym_declaration] = ACTIONS(REDUCE(sym_declaration, 5)),
         [sym_type_qualifier] = ACTIONS(REDUCE(sym_declaration, 5)),
@@ -4872,7 +4944,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_identifier] = ACTIONS(REDUCE(sym_declaration, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_function_definition_repeat1] = ACTIONS(REDUCE(sym_declaration, 5)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_declaration, 5)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_declaration, 5)),
         [aux_sym_STR_typedef] = ACTIONS(REDUCE(sym_declaration, 5)),
         [aux_sym_STR_extern] = ACTIONS(REDUCE(sym_declaration, 5)),
         [aux_sym_STR_static] = ACTIONS(REDUCE(sym_declaration, 5)),
@@ -4888,127 +4960,131 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_restrict] = ACTIONS(REDUCE(sym_declaration, 5)),
         [aux_sym_STR_volatile] = ACTIONS(REDUCE(sym_declaration, 5)),
     },
-    [255] = {
+    [257] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(257)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(259)),
     },
-    [256] = {
+    [258] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_declaration, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
-    [257] = {
+    [259] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_declaration, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
-    [258] = {
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(258)),
-        [sym_type_specifier] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 1)),
+    [260] = {
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(260)),
+        [sym__type_specifier] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 1)),
+        [sym_type_name] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 1)),
         [sym_struct_specifier] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 1)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(258)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(260)),
         [sym_identifier] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_specifiers_repeat1] = ACTIONS(SHIFT(260)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 1)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
+        [aux_sym_declaration_specifiers_repeat1] = ACTIONS(SHIFT(262)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 1)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
         [aux_sym_STR_signed] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 1)),
         [aux_sym_STR_unsigned] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 1)),
         [aux_sym_STR_long] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 1)),
         [aux_sym_STR_short] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 1)),
         [aux_sym_STR_struct] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 1)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
     },
-    [259] = {
-        [sym_type_specifier] = ACTIONS(REDUCE(sym_declaration_specifiers, 2)),
+    [261] = {
+        [sym__type_specifier] = ACTIONS(REDUCE(sym_declaration_specifiers, 2)),
+        [sym_type_name] = ACTIONS(REDUCE(sym_declaration_specifiers, 2)),
         [sym_struct_specifier] = ACTIONS(REDUCE(sym_declaration_specifiers, 2)),
         [sym_identifier] = ACTIONS(REDUCE(sym_declaration_specifiers, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(sym_declaration_specifiers, 2)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(sym_declaration_specifiers, 2)),
         [aux_sym_STR_signed] = ACTIONS(REDUCE(sym_declaration_specifiers, 2)),
         [aux_sym_STR_unsigned] = ACTIONS(REDUCE(sym_declaration_specifiers, 2)),
         [aux_sym_STR_long] = ACTIONS(REDUCE(sym_declaration_specifiers, 2)),
         [aux_sym_STR_short] = ACTIONS(REDUCE(sym_declaration_specifiers, 2)),
         [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_declaration_specifiers, 2)),
     },
-    [260] = {
-        [sym_type_specifier] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 2)),
+    [262] = {
+        [sym__type_specifier] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 2)),
+        [sym_type_name] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 2)),
         [sym_struct_specifier] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 2)),
         [sym_identifier] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 2)),
+        [aux_sym_type_name_repeat1] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 2)),
         [aux_sym_STR_signed] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 2)),
         [aux_sym_STR_unsigned] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 2)),
         [aux_sym_STR_long] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 2)),
         [aux_sym_STR_short] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 2)),
         [aux_sym_STR_struct] = ACTIONS(REDUCE(aux_sym_declaration_specifiers_repeat1, 2)),
     },
-    [261] = {
-        [sym_init_declarator] = ACTIONS(SHIFT(262)),
-        [sym_declarator] = ACTIONS(SHIFT(263)),
-        [sym_direct_declarator] = ACTIONS(SHIFT(118)),
-        [sym_pointer] = ACTIONS(SHIFT(34)),
-        [sym_identifier] = ACTIONS(SHIFT(119)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(120)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(121)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(38)),
-    },
-    [262] = {
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(266)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(236)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(257)),
-    },
     [263] = {
-        [sym_declaration_specifiers] = ACTIONS(SHIFT(132)),
-        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
-        [sym_type_specifier] = ACTIONS(SHIFT(133)),
-        [sym_struct_specifier] = ACTIONS(SHIFT(6)),
-        [sym_declaration] = ACTIONS(SHIFT(134)),
-        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
-        [sym_compound_statement] = ACTIONS(SHIFT(245)),
-        [sym_identifier] = ACTIONS(SHIFT(6)),
+        [sym__init_declarator] = ACTIONS(SHIFT(264)),
+        [sym_declarator] = ACTIONS(SHIFT(265)),
+        [sym__direct_declarator] = ACTIONS(SHIFT(120)),
+        [sym_pointer] = ACTIONS(SHIFT(36)),
+        [sym_identifier] = ACTIONS(SHIFT(121)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_function_definition_repeat1] = ACTIONS(SHIFT(264)),
-        [aux_sym_type_specifier_repeat1] = ACTIONS(SHIFT(7)),
-        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym_init_declarator, 1)),
-        [aux_sym_STR_typedef] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_extern] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_static] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_auto] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_register] = ACTIONS(SHIFT(8)),
-        [aux_sym_STR_signed] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_long] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_short] = ACTIONS(SHIFT(9)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(10)),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(137)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_init_declarator, 1)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_init_declarator, 1)),
-        [aux_sym_STR_EQ] = ACTIONS(SHIFT(138)),
-        [aux_sym_STR_const] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_restrict] = ACTIONS(SHIFT(11)),
-        [aux_sym_STR_volatile] = ACTIONS(SHIFT(11)),
+        [aux_sym_declarator_repeat1] = ACTIONS(SHIFT(122)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(123)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(40)),
     },
     [264] = {
-        [sym_compound_statement] = ACTIONS(SHIFT(265)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(137)),
+        [aux_sym_declaration_repeat1] = ACTIONS(SHIFT(268)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(238)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(259)),
     },
     [265] = {
+        [sym_declaration_specifiers] = ACTIONS(SHIFT(134)),
+        [sym_storage_class_specifier] = ACTIONS(SHIFT(4)),
+        [sym__type_specifier] = ACTIONS(SHIFT(135)),
+        [sym_type_name] = ACTIONS(SHIFT(6)),
+        [sym_struct_specifier] = ACTIONS(SHIFT(6)),
+        [sym_declaration] = ACTIONS(SHIFT(136)),
+        [sym_type_qualifier] = ACTIONS(SHIFT(4)),
+        [sym_compound_statement] = ACTIONS(SHIFT(247)),
+        [sym_identifier] = ACTIONS(SHIFT(7)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_function_definition_repeat1] = ACTIONS(SHIFT(266)),
+        [aux_sym_type_name_repeat1] = ACTIONS(SHIFT(8)),
+        [aux_sym_declaration_repeat1] = ACTIONS(REDUCE(sym__init_declarator, 1)),
+        [aux_sym_STR_typedef] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_extern] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_static] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_auto] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_register] = ACTIONS(SHIFT(9)),
+        [aux_sym_STR_signed] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_unsigned] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_long] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_short] = ACTIONS(SHIFT(10)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(11)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(139)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__init_declarator, 1)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__init_declarator, 1)),
+        [aux_sym_STR_EQ] = ACTIONS(SHIFT(140)),
+        [aux_sym_STR_const] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_restrict] = ACTIONS(SHIFT(12)),
+        [aux_sym_STR_volatile] = ACTIONS(SHIFT(12)),
+    },
+    [266] = {
+        [sym_compound_statement] = ACTIONS(SHIFT(267)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(139)),
+    },
+    [267] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_function_definition, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
-    [266] = {
+    [268] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(267)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(269)),
     },
-    [267] = {
+    [269] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_declaration, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
diff --git a/spec/fixtures/parsers/golang.c b/spec/fixtures/parsers/golang.c
index fedcf49c..1931c098 100644
--- a/spec/fixtures/parsers/golang.c
+++ b/spec/fixtures/parsers/golang.c
@@ -1,6 +1,6 @@
 #include "tree_sitter/parser.h"
 
-#define STATE_COUNT 431
+#define STATE_COUNT 430
 #define SYMBOL_COUNT 84
 
 enum {
@@ -8,24 +8,24 @@ enum {
     sym_package_directive,
     sym_imports_block,
     sym_package_import,
-    sym_declaration,
+    sym__declaration,
     sym_type_declaration,
     sym_var_declaration,
     sym_func_declaration,
     sym_block_statement,
-    sym_type_expression,
+    sym__type_expression,
     sym_pointer_type,
     sym_map_type,
     sym_slice_type,
     sym_struct_type,
     sym_interface_type,
-    sym_statement,
+    sym__statement,
     sym_return_statement,
-    sym_declaration_statement,
+    sym_short_var_declaration,
     sym_range_statement,
     sym_if_statement,
     sym_expression_statement,
-    sym_expression,
+    sym__expression,
     sym_call_expression,
     sym_selector_expression,
     sym_math_op,
@@ -46,7 +46,7 @@ enum {
     aux_sym_struct_type_repeat1,
     aux_sym_interface_type_repeat1,
     aux_sym_return_statement_repeat1,
-    aux_sym_declaration_statement_repeat1,
+    aux_sym_short_var_declaration_repeat1,
     aux_sym__func_signature_repeat1,
     aux_sym__func_signature_repeat2,
     aux_sym__func_signature_repeat3,
@@ -93,24 +93,24 @@ static const char *ts_symbol_names[] = {
     [sym_package_directive] = "package_directive",
     [sym_imports_block] = "imports_block",
     [sym_package_import] = "package_import",
-    [sym_declaration] = "declaration",
+    [sym__declaration] = "_declaration",
     [sym_type_declaration] = "type_declaration",
     [sym_var_declaration] = "var_declaration",
     [sym_func_declaration] = "func_declaration",
     [sym_block_statement] = "block_statement",
-    [sym_type_expression] = "type_expression",
+    [sym__type_expression] = "_type_expression",
     [sym_pointer_type] = "pointer_type",
     [sym_map_type] = "map_type",
     [sym_slice_type] = "slice_type",
     [sym_struct_type] = "struct_type",
     [sym_interface_type] = "interface_type",
-    [sym_statement] = "statement",
+    [sym__statement] = "_statement",
     [sym_return_statement] = "return_statement",
-    [sym_declaration_statement] = "declaration_statement",
+    [sym_short_var_declaration] = "short_var_declaration",
     [sym_range_statement] = "range_statement",
     [sym_if_statement] = "if_statement",
     [sym_expression_statement] = "expression_statement",
-    [sym_expression] = "expression",
+    [sym__expression] = "_expression",
     [sym_call_expression] = "call_expression",
     [sym_selector_expression] = "selector_expression",
     [sym_math_op] = "math_op",
@@ -133,7 +133,7 @@ static const char *ts_symbol_names[] = {
     [aux_sym_struct_type_repeat1] = "struct_type_repeat1",
     [aux_sym_interface_type_repeat1] = "interface_type_repeat1",
     [aux_sym_return_statement_repeat1] = "return_statement_repeat1",
-    [aux_sym_declaration_statement_repeat1] = "declaration_statement_repeat1",
+    [aux_sym_short_var_declaration_repeat1] = "short_var_declaration_repeat1",
     [aux_sym__func_signature_repeat1] = "_func_signature_repeat1",
     [aux_sym__func_signature_repeat2] = "_func_signature_repeat2",
     [aux_sym__func_signature_repeat3] = "_func_signature_repeat3",
@@ -176,6 +176,10 @@ static const char *ts_symbol_names[] = {
 };
 
 static const int ts_hidden_symbol_flags[SYMBOL_COUNT] = {
+    [sym__declaration] = 1,
+    [sym__type_expression] = 1,
+    [sym__statement] = 1,
+    [sym__expression] = 1,
     [sym__func_signature] = 1,
     [sym__line_break] = 1,
     [sym__identifier] = 1,
@@ -186,7 +190,7 @@ static const int ts_hidden_symbol_flags[SYMBOL_COUNT] = {
     [aux_sym_struct_type_repeat1] = 1,
     [aux_sym_interface_type_repeat1] = 1,
     [aux_sym_return_statement_repeat1] = 1,
-    [aux_sym_declaration_statement_repeat1] = 1,
+    [aux_sym_short_var_declaration_repeat1] = 1,
     [aux_sym__func_signature_repeat1] = 1,
     [aux_sym__func_signature_repeat2] = 1,
     [aux_sym__func_signature_repeat3] = 1,
@@ -2509,237 +2513,236 @@ static TSStateId ts_lex_states[STATE_COUNT] = {
     [197] = 83,
     [198] = 83,
     [199] = 83,
-    [200] = 83,
+    [200] = 104,
     [201] = 104,
-    [202] = 104,
-    [203] = 119,
-    [204] = 79,
-    [205] = 119,
-    [206] = 32,
-    [207] = 81,
-    [208] = 120,
-    [209] = 121,
-    [210] = 32,
+    [202] = 119,
+    [203] = 79,
+    [204] = 119,
+    [205] = 32,
+    [206] = 81,
+    [207] = 120,
+    [208] = 121,
+    [209] = 32,
+    [210] = 121,
     [211] = 121,
-    [212] = 121,
+    [212] = 104,
     [213] = 104,
-    [214] = 104,
+    [214] = 122,
     [215] = 122,
     [216] = 122,
-    [217] = 122,
-    [218] = 121,
-    [219] = 122,
-    [220] = 123,
-    [221] = 128,
-    [222] = 83,
-    [223] = 121,
-    [224] = 32,
+    [217] = 121,
+    [218] = 122,
+    [219] = 123,
+    [220] = 128,
+    [221] = 83,
+    [222] = 121,
+    [223] = 32,
+    [224] = 121,
     [225] = 121,
     [226] = 121,
     [227] = 121,
-    [228] = 121,
+    [228] = 122,
     [229] = 122,
     [230] = 122,
     [231] = 122,
     [232] = 122,
     [233] = 122,
-    [234] = 122,
-    [235] = 79,
+    [234] = 79,
+    [235] = 123,
     [236] = 123,
-    [237] = 123,
+    [237] = 129,
     [238] = 129,
     [239] = 129,
-    [240] = 129,
-    [241] = 122,
-    [242] = 121,
-    [243] = 129,
-    [244] = 72,
-    [245] = 128,
-    [246] = 122,
+    [240] = 122,
+    [241] = 121,
+    [242] = 129,
+    [243] = 72,
+    [244] = 128,
+    [245] = 122,
+    [246] = 121,
     [247] = 121,
-    [248] = 121,
-    [249] = 32,
+    [248] = 32,
+    [249] = 121,
     [250] = 121,
     [251] = 121,
     [252] = 121,
-    [253] = 121,
+    [253] = 129,
     [254] = 129,
     [255] = 129,
     [256] = 129,
     [257] = 129,
     [258] = 129,
-    [259] = 129,
-    [260] = 72,
+    [259] = 72,
+    [260] = 129,
     [261] = 129,
     [262] = 129,
-    [263] = 129,
-    [264] = 72,
+    [263] = 72,
+    [264] = 129,
     [265] = 129,
-    [266] = 129,
-    [267] = 122,
-    [268] = 130,
+    [266] = 122,
+    [267] = 130,
+    [268] = 83,
     [269] = 83,
-    [270] = 83,
-    [271] = 79,
+    [270] = 79,
+    [271] = 83,
     [272] = 83,
-    [273] = 83,
+    [273] = 133,
     [274] = 133,
-    [275] = 133,
-    [276] = 32,
-    [277] = 134,
-    [278] = 121,
-    [279] = 122,
-    [280] = 83,
+    [275] = 32,
+    [276] = 134,
+    [277] = 121,
+    [278] = 122,
+    [279] = 83,
+    [280] = 140,
     [281] = 140,
-    [282] = 140,
-    [283] = 134,
-    [284] = 121,
-    [285] = 122,
-    [286] = 83,
-    [287] = 104,
-    [288] = 141,
-    [289] = 128,
-    [290] = 121,
-    [291] = 32,
+    [282] = 134,
+    [283] = 121,
+    [284] = 122,
+    [285] = 83,
+    [286] = 104,
+    [287] = 141,
+    [288] = 128,
+    [289] = 121,
+    [290] = 32,
+    [291] = 121,
     [292] = 121,
     [293] = 121,
     [294] = 121,
-    [295] = 121,
+    [295] = 104,
     [296] = 104,
     [297] = 104,
     [298] = 104,
     [299] = 104,
     [300] = 104,
-    [301] = 104,
-    [302] = 129,
-    [303] = 104,
-    [304] = 72,
+    [301] = 129,
+    [302] = 104,
+    [303] = 72,
+    [304] = 104,
     [305] = 104,
-    [306] = 104,
+    [306] = 142,
     [307] = 142,
-    [308] = 142,
-    [309] = 143,
-    [310] = 142,
-    [311] = 121,
-    [312] = 142,
-    [313] = 144,
-    [314] = 81,
-    [315] = 128,
+    [308] = 143,
+    [309] = 142,
+    [310] = 121,
+    [311] = 142,
+    [312] = 144,
+    [313] = 81,
+    [314] = 128,
+    [315] = 121,
     [316] = 121,
-    [317] = 121,
-    [318] = 32,
+    [317] = 32,
+    [318] = 121,
     [319] = 121,
     [320] = 121,
     [321] = 121,
-    [322] = 121,
+    [322] = 142,
     [323] = 142,
     [324] = 142,
     [325] = 142,
     [326] = 142,
     [327] = 142,
-    [328] = 142,
-    [329] = 81,
-    [330] = 142,
-    [331] = 129,
-    [332] = 142,
-    [333] = 72,
+    [328] = 81,
+    [329] = 142,
+    [330] = 129,
+    [331] = 142,
+    [332] = 72,
+    [333] = 142,
     [334] = 142,
-    [335] = 142,
-    [336] = 143,
+    [335] = 143,
+    [336] = 145,
     [337] = 145,
-    [338] = 145,
+    [338] = 147,
     [339] = 147,
     [340] = 147,
-    [341] = 147,
-    [342] = 121,
-    [343] = 73,
-    [344] = 74,
-    [345] = 75,
+    [341] = 121,
+    [342] = 73,
+    [343] = 74,
+    [344] = 75,
+    [345] = 43,
     [346] = 43,
-    [347] = 43,
-    [348] = 77,
-    [349] = 79,
+    [347] = 77,
+    [348] = 79,
+    [349] = 147,
     [350] = 147,
-    [351] = 147,
-    [352] = 77,
-    [353] = 79,
+    [351] = 77,
+    [352] = 79,
+    [353] = 147,
     [354] = 147,
-    [355] = 147,
-    [356] = 73,
-    [357] = 147,
-    [358] = 73,
-    [359] = 75,
-    [360] = 73,
+    [355] = 73,
+    [356] = 147,
+    [357] = 73,
+    [358] = 75,
+    [359] = 73,
+    [360] = 147,
     [361] = 147,
-    [362] = 147,
-    [363] = 104,
-    [364] = 141,
-    [365] = 148,
-    [366] = 121,
-    [367] = 104,
-    [368] = 141,
-    [369] = 81,
-    [370] = 140,
-    [371] = 32,
-    [372] = 121,
-    [373] = 104,
-    [374] = 141,
+    [362] = 104,
+    [363] = 141,
+    [364] = 148,
+    [365] = 121,
+    [366] = 104,
+    [367] = 141,
+    [368] = 81,
+    [369] = 140,
+    [370] = 32,
+    [371] = 121,
+    [372] = 104,
+    [373] = 141,
+    [374] = 133,
     [375] = 133,
-    [376] = 133,
-    [377] = 140,
-    [378] = 121,
-    [379] = 104,
+    [376] = 140,
+    [377] = 121,
+    [378] = 104,
+    [379] = 141,
     [380] = 141,
-    [381] = 141,
-    [382] = 79,
-    [383] = 149,
-    [384] = 145,
-    [385] = 147,
-    [386] = 121,
-    [387] = 104,
-    [388] = 150,
-    [389] = 151,
-    [390] = 121,
-    [391] = 104,
-    [392] = 150,
+    [381] = 79,
+    [382] = 149,
+    [383] = 145,
+    [384] = 147,
+    [385] = 121,
+    [386] = 104,
+    [387] = 150,
+    [388] = 151,
+    [389] = 121,
+    [390] = 104,
+    [391] = 150,
+    [392] = 73,
     [393] = 73,
-    [394] = 73,
+    [394] = 81,
     [395] = 81,
     [396] = 81,
-    [397] = 81,
-    [398] = 73,
-    [399] = 74,
-    [400] = 75,
+    [397] = 73,
+    [398] = 74,
+    [399] = 75,
+    [400] = 43,
     [401] = 43,
-    [402] = 43,
-    [403] = 77,
-    [404] = 79,
+    [402] = 77,
+    [403] = 79,
+    [404] = 81,
     [405] = 81,
-    [406] = 81,
-    [407] = 77,
-    [408] = 79,
+    [406] = 77,
+    [407] = 79,
+    [408] = 81,
     [409] = 81,
-    [410] = 81,
-    [411] = 73,
-    [412] = 81,
-    [413] = 73,
-    [414] = 75,
-    [415] = 73,
+    [410] = 73,
+    [411] = 81,
+    [412] = 73,
+    [413] = 75,
+    [414] = 73,
+    [415] = 81,
     [416] = 81,
-    [417] = 81,
-    [418] = 149,
+    [417] = 149,
+    [418] = 14,
     [419] = 14,
-    [420] = 14,
+    [420] = 152,
     [421] = 152,
-    [422] = 152,
-    [423] = 72,
-    [424] = 152,
+    [422] = 72,
+    [423] = 152,
+    [424] = 14,
     [425] = 14,
-    [426] = 14,
-    [427] = 72,
+    [426] = 72,
+    [427] = 12,
     [428] = 12,
-    [429] = 12,
-    [430] = 34,
+    [429] = 34,
 };
 
 #pragma GCC diagnostic push
@@ -2760,7 +2763,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
     },
     [2] = {
         [sym_imports_block] = ACTIONS(SHIFT(6)),
-        [sym_declaration] = ACTIONS(SHIFT(7)),
+        [sym__declaration] = ACTIONS(SHIFT(7)),
         [sym_type_declaration] = ACTIONS(SHIFT(8)),
         [sym_var_declaration] = ACTIONS(SHIFT(8)),
         [sym_func_declaration] = ACTIONS(SHIFT(8)),
@@ -2782,7 +2785,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
     },
     [4] = {
         [sym_imports_block] = ACTIONS(REDUCE(sym_package_directive, 2)),
-        [sym_declaration] = ACTIONS(REDUCE(sym_package_directive, 2)),
+        [sym__declaration] = ACTIONS(REDUCE(sym_package_directive, 2)),
         [sym_type_declaration] = ACTIONS(REDUCE(sym_package_directive, 2)),
         [sym_var_declaration] = ACTIONS(REDUCE(sym_package_directive, 2)),
         [sym_func_declaration] = ACTIONS(REDUCE(sym_package_directive, 2)),
@@ -2798,7 +2801,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
     },
     [5] = {
         [sym_imports_block] = ACTIONS(REDUCE(sym_package_name, 1)),
-        [sym_declaration] = ACTIONS(REDUCE(sym_package_name, 1)),
+        [sym__declaration] = ACTIONS(REDUCE(sym_package_name, 1)),
         [sym_type_declaration] = ACTIONS(REDUCE(sym_package_name, 1)),
         [sym_var_declaration] = ACTIONS(REDUCE(sym_package_name, 1)),
         [sym_func_declaration] = ACTIONS(REDUCE(sym_package_name, 1)),
@@ -2814,14 +2817,14 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
     },
     [6] = {
         [sym_imports_block] = ACTIONS(SHIFT(6)),
-        [sym_declaration] = ACTIONS(REDUCE(aux_sym_program_repeat1, 1)),
+        [sym__declaration] = ACTIONS(REDUCE(aux_sym_program_repeat1, 1)),
         [sym_type_declaration] = ACTIONS(REDUCE(aux_sym_program_repeat1, 1)),
         [sym_var_declaration] = ACTIONS(REDUCE(aux_sym_program_repeat1, 1)),
         [sym_func_declaration] = ACTIONS(REDUCE(aux_sym_program_repeat1, 1)),
         [ts_builtin_sym_end] = ACTIONS(REDUCE(aux_sym_program_repeat1, 1)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_program_repeat1] = ACTIONS(SHIFT(430)),
+        [aux_sym_program_repeat1] = ACTIONS(SHIFT(429)),
         [aux_sym_program_repeat2] = ACTIONS(REDUCE(aux_sym_program_repeat1, 1)),
         [aux_sym_STR_import] = ACTIONS(SHIFT(11)),
         [aux_sym_STR_type] = ACTIONS(REDUCE(aux_sym_program_repeat1, 1)),
@@ -2829,40 +2832,40 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_func] = ACTIONS(REDUCE(aux_sym_program_repeat1, 1)),
     },
     [7] = {
-        [sym_declaration] = ACTIONS(SHIFT(7)),
+        [sym__declaration] = ACTIONS(SHIFT(7)),
         [sym_type_declaration] = ACTIONS(SHIFT(8)),
         [sym_var_declaration] = ACTIONS(SHIFT(8)),
         [sym_func_declaration] = ACTIONS(SHIFT(8)),
         [ts_builtin_sym_end] = ACTIONS(REDUCE(aux_sym_program_repeat2, 1)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_program_repeat2] = ACTIONS(SHIFT(429)),
+        [aux_sym_program_repeat2] = ACTIONS(SHIFT(428)),
         [aux_sym_STR_type] = ACTIONS(SHIFT(12)),
         [aux_sym_STR_var] = ACTIONS(SHIFT(13)),
         [aux_sym_STR_func] = ACTIONS(SHIFT(14)),
     },
     [8] = {
-        [sym_declaration] = ACTIONS(REDUCE(sym_declaration, 1)),
-        [sym_type_declaration] = ACTIONS(REDUCE(sym_declaration, 1)),
-        [sym_var_declaration] = ACTIONS(REDUCE(sym_declaration, 1)),
-        [sym_func_declaration] = ACTIONS(REDUCE(sym_declaration, 1)),
-        [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_declaration, 1)),
+        [sym__declaration] = ACTIONS(REDUCE(sym__declaration, 1)),
+        [sym_type_declaration] = ACTIONS(REDUCE(sym__declaration, 1)),
+        [sym_var_declaration] = ACTIONS(REDUCE(sym__declaration, 1)),
+        [sym_func_declaration] = ACTIONS(REDUCE(sym__declaration, 1)),
+        [ts_builtin_sym_end] = ACTIONS(REDUCE(sym__declaration, 1)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_program_repeat2] = ACTIONS(REDUCE(sym_declaration, 1)),
-        [aux_sym_STR_type] = ACTIONS(REDUCE(sym_declaration, 1)),
-        [aux_sym_STR_var] = ACTIONS(REDUCE(sym_declaration, 1)),
-        [aux_sym_STR_func] = ACTIONS(REDUCE(sym_declaration, 1)),
+        [aux_sym_program_repeat2] = ACTIONS(REDUCE(sym__declaration, 1)),
+        [aux_sym_STR_type] = ACTIONS(REDUCE(sym__declaration, 1)),
+        [aux_sym_STR_var] = ACTIONS(REDUCE(sym__declaration, 1)),
+        [aux_sym_STR_func] = ACTIONS(REDUCE(sym__declaration, 1)),
     },
     [9] = {
-        [sym_declaration] = ACTIONS(SHIFT(7)),
+        [sym__declaration] = ACTIONS(SHIFT(7)),
         [sym_type_declaration] = ACTIONS(SHIFT(8)),
         [sym_var_declaration] = ACTIONS(SHIFT(8)),
         [sym_func_declaration] = ACTIONS(SHIFT(8)),
         [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_program, 2)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_program_repeat2] = ACTIONS(SHIFT(428)),
+        [aux_sym_program_repeat2] = ACTIONS(SHIFT(427)),
         [aux_sym_STR_type] = ACTIONS(SHIFT(12)),
         [aux_sym_STR_var] = ACTIONS(SHIFT(13)),
         [aux_sym_STR_func] = ACTIONS(SHIFT(14)),
@@ -2873,22 +2876,22 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
     [11] = {
-        [sym_package_import] = ACTIONS(SHIFT(419)),
+        [sym_package_import] = ACTIONS(SHIFT(418)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(420)),
+        [sym_string] = ACTIONS(SHIFT(419)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(421)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(420)),
     },
     [12] = {
-        [sym_type_name] = ACTIONS(SHIFT(393)),
+        [sym_type_name] = ACTIONS(SHIFT(392)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(394)),
+        [sym__identifier] = ACTIONS(SHIFT(393)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
     [13] = {
-        [sym_var_name] = ACTIONS(SHIFT(384)),
+        [sym_var_name] = ACTIONS(SHIFT(383)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(338)),
+        [sym__identifier] = ACTIONS(SHIFT(337)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
     [14] = {
@@ -2923,7 +2926,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(21)),
     },
     [19] = {
-        [sym_type_expression] = ACTIONS(SHIFT(44)),
+        [sym__type_expression] = ACTIONS(SHIFT(44)),
         [sym_pointer_type] = ACTIONS(SHIFT(45)),
         [sym_map_type] = ACTIONS(SHIFT(45)),
         [sym_slice_type] = ACTIONS(SHIFT(45)),
@@ -2933,7 +2936,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym__identifier] = ACTIONS(SHIFT(46)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_statement_repeat1] = ACTIONS(SHIFT(47)),
+        [aux_sym_short_var_declaration_repeat1] = ACTIONS(SHIFT(47)),
         [aux_sym_STR_STAR] = ACTIONS(SHIFT(48)),
         [aux_sym_STR_map] = ACTIONS(SHIFT(49)),
         [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(50)),
@@ -2942,7 +2945,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_COMMA] = ACTIONS(SHIFT(53)),
     },
     [20] = {
-        [sym_type_expression] = ACTIONS(REDUCE(sym_var_name, 1)),
+        [sym__type_expression] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_pointer_type] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_map_type] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_slice_type] = ACTIONS(REDUCE(sym_var_name, 1)),
@@ -2952,7 +2955,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym__identifier] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_statement_repeat1] = ACTIONS(REDUCE(sym_var_name, 1)),
+        [aux_sym_short_var_declaration_repeat1] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_map] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(sym_var_name, 1)),
@@ -3117,9 +3120,9 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
     [45] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym__func_signature_repeat1] = ACTIONS(REDUCE(sym_type_expression, 1)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_type_expression, 1)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_type_expression, 1)),
+        [aux_sym__func_signature_repeat1] = ACTIONS(REDUCE(sym__type_expression, 1)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym__type_expression, 1)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__type_expression, 1)),
     },
     [46] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
@@ -3129,7 +3132,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_type_name, 1)),
     },
     [47] = {
-        [sym_type_expression] = ACTIONS(SHIFT(170)),
+        [sym__type_expression] = ACTIONS(SHIFT(170)),
         [sym_pointer_type] = ACTIONS(SHIFT(45)),
         [sym_map_type] = ACTIONS(SHIFT(45)),
         [sym_slice_type] = ACTIONS(SHIFT(45)),
@@ -3146,7 +3149,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_interface] = ACTIONS(SHIFT(52)),
     },
     [48] = {
-        [sym_type_expression] = ACTIONS(SHIFT(169)),
+        [sym__type_expression] = ACTIONS(SHIFT(169)),
         [sym_pointer_type] = ACTIONS(SHIFT(45)),
         [sym_map_type] = ACTIONS(SHIFT(45)),
         [sym_slice_type] = ACTIONS(SHIFT(45)),
@@ -3189,40 +3192,40 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
     [54] = {
-        [sym_type_expression] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
-        [sym_pointer_type] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
-        [sym_map_type] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
-        [sym_slice_type] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
-        [sym_struct_type] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
-        [sym_interface_type] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
-        [sym_type_name] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
+        [sym__type_expression] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
+        [sym_pointer_type] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
+        [sym_map_type] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
+        [sym_slice_type] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
+        [sym_struct_type] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
+        [sym_interface_type] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
+        [sym_type_name] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
+        [sym__identifier] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_statement_repeat1] = ACTIONS(SHIFT(55)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
-        [aux_sym_STR_map] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
-        [aux_sym_STR_struct] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
-        [aux_sym_STR_interface] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
+        [aux_sym_short_var_declaration_repeat1] = ACTIONS(SHIFT(55)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
+        [aux_sym_STR_map] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
+        [aux_sym_STR_struct] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
+        [aux_sym_STR_interface] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
         [aux_sym_STR_COMMA] = ACTIONS(SHIFT(53)),
     },
     [55] = {
-        [sym_type_expression] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
-        [sym_pointer_type] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
-        [sym_map_type] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
-        [sym_slice_type] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
-        [sym_struct_type] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
-        [sym_interface_type] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
-        [sym_type_name] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
+        [sym__type_expression] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
+        [sym_pointer_type] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
+        [sym_map_type] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
+        [sym_slice_type] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
+        [sym_struct_type] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
+        [sym_interface_type] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
+        [sym_type_name] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
+        [sym__identifier] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
-        [aux_sym_STR_map] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
-        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
-        [aux_sym_STR_struct] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
-        [aux_sym_STR_interface] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
+        [aux_sym_STR_map] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
+        [aux_sym_STR_LBRACK] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
+        [aux_sym_STR_struct] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
+        [aux_sym_STR_interface] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
     },
     [56] = {
         [sym_var_name] = ACTIONS(SHIFT(57)),
@@ -3273,7 +3276,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(64)),
     },
     [63] = {
-        [sym_type_expression] = ACTIONS(SHIFT(75)),
+        [sym__type_expression] = ACTIONS(SHIFT(75)),
         [sym_pointer_type] = ACTIONS(SHIFT(45)),
         [sym_map_type] = ACTIONS(SHIFT(45)),
         [sym_slice_type] = ACTIONS(SHIFT(45)),
@@ -3283,7 +3286,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym__identifier] = ACTIONS(SHIFT(46)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_statement_repeat1] = ACTIONS(SHIFT(76)),
+        [aux_sym_short_var_declaration_repeat1] = ACTIONS(SHIFT(76)),
         [aux_sym_STR_STAR] = ACTIONS(SHIFT(48)),
         [aux_sym_STR_map] = ACTIONS(SHIFT(49)),
         [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(50)),
@@ -3378,7 +3381,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_COMMA] = ACTIONS(SHIFT(80)),
     },
     [76] = {
-        [sym_type_expression] = ACTIONS(SHIFT(77)),
+        [sym__type_expression] = ACTIONS(SHIFT(77)),
         [sym_pointer_type] = ACTIONS(SHIFT(45)),
         [sym_map_type] = ACTIONS(SHIFT(45)),
         [sym_slice_type] = ACTIONS(SHIFT(45)),
@@ -3423,7 +3426,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
     [81] = {
-        [sym_type_expression] = ACTIONS(SHIFT(82)),
+        [sym__type_expression] = ACTIONS(SHIFT(82)),
         [sym_pointer_type] = ACTIONS(SHIFT(45)),
         [sym_map_type] = ACTIONS(SHIFT(45)),
         [sym_slice_type] = ACTIONS(SHIFT(45)),
@@ -3433,7 +3436,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym__identifier] = ACTIONS(SHIFT(46)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_statement_repeat1] = ACTIONS(SHIFT(83)),
+        [aux_sym_short_var_declaration_repeat1] = ACTIONS(SHIFT(83)),
         [aux_sym_STR_STAR] = ACTIONS(SHIFT(48)),
         [aux_sym_STR_map] = ACTIONS(SHIFT(49)),
         [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(50)),
@@ -3449,7 +3452,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_COMMA] = ACTIONS(SHIFT(80)),
     },
     [83] = {
-        [sym_type_expression] = ACTIONS(SHIFT(84)),
+        [sym__type_expression] = ACTIONS(SHIFT(84)),
         [sym_pointer_type] = ACTIONS(SHIFT(45)),
         [sym_map_type] = ACTIONS(SHIFT(45)),
         [sym_slice_type] = ACTIONS(SHIFT(45)),
@@ -3654,7 +3657,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(115)),
     },
     [112] = {
-        [sym_type_expression] = ACTIONS(SHIFT(117)),
+        [sym__type_expression] = ACTIONS(SHIFT(117)),
         [sym_pointer_type] = ACTIONS(SHIFT(118)),
         [sym_map_type] = ACTIONS(SHIFT(118)),
         [sym_slice_type] = ACTIONS(SHIFT(118)),
@@ -3671,7 +3674,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_interface] = ACTIONS(SHIFT(124)),
     },
     [113] = {
-        [sym_type_expression] = ACTIONS(REDUCE(sym_var_name, 1)),
+        [sym__type_expression] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_pointer_type] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_map_type] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_slice_type] = ACTIONS(REDUCE(sym_var_name, 1)),
@@ -3715,12 +3718,12 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(aux_sym_struct_type_repeat1, 2)),
     },
     [118] = {
-        [sym_var_name] = ACTIONS(REDUCE(sym_type_expression, 1)),
+        [sym_var_name] = ACTIONS(REDUCE(sym__type_expression, 1)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(REDUCE(sym_type_expression, 1)),
+        [sym__identifier] = ACTIONS(REDUCE(sym__type_expression, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_struct_type_repeat1] = ACTIONS(REDUCE(sym_type_expression, 1)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_type_expression, 1)),
+        [aux_sym_struct_type_repeat1] = ACTIONS(REDUCE(sym__type_expression, 1)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym__type_expression, 1)),
     },
     [119] = {
         [sym_var_name] = ACTIONS(REDUCE(sym_type_name, 1)),
@@ -3731,7 +3734,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_type_name, 1)),
     },
     [120] = {
-        [sym_type_expression] = ACTIONS(SHIFT(161)),
+        [sym__type_expression] = ACTIONS(SHIFT(161)),
         [sym_pointer_type] = ACTIONS(SHIFT(118)),
         [sym_map_type] = ACTIONS(SHIFT(118)),
         [sym_slice_type] = ACTIONS(SHIFT(118)),
@@ -3826,7 +3829,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_struct_type, 4)),
     },
     [133] = {
-        [sym_type_expression] = ACTIONS(SHIFT(134)),
+        [sym__type_expression] = ACTIONS(SHIFT(134)),
         [sym_pointer_type] = ACTIONS(SHIFT(118)),
         [sym_map_type] = ACTIONS(SHIFT(118)),
         [sym_slice_type] = ACTIONS(SHIFT(118)),
@@ -3851,7 +3854,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_slice_type, 3)),
     },
     [135] = {
-        [sym_type_expression] = ACTIONS(SHIFT(136)),
+        [sym__type_expression] = ACTIONS(SHIFT(136)),
         [sym_pointer_type] = ACTIONS(SHIFT(137)),
         [sym_map_type] = ACTIONS(SHIFT(137)),
         [sym_slice_type] = ACTIONS(SHIFT(137)),
@@ -3875,7 +3878,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
     [137] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym_type_expression, 1)),
+        [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym__type_expression, 1)),
     },
     [138] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
@@ -3883,7 +3886,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym_type_name, 1)),
     },
     [139] = {
-        [sym_type_expression] = ACTIONS(SHIFT(158)),
+        [sym__type_expression] = ACTIONS(SHIFT(158)),
         [sym_pointer_type] = ACTIONS(SHIFT(137)),
         [sym_map_type] = ACTIONS(SHIFT(137)),
         [sym_slice_type] = ACTIONS(SHIFT(137)),
@@ -3966,7 +3969,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym_struct_type, 4)),
     },
     [152] = {
-        [sym_type_expression] = ACTIONS(SHIFT(153)),
+        [sym__type_expression] = ACTIONS(SHIFT(153)),
         [sym_pointer_type] = ACTIONS(SHIFT(137)),
         [sym_map_type] = ACTIONS(SHIFT(137)),
         [sym_slice_type] = ACTIONS(SHIFT(137)),
@@ -3988,7 +3991,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym_slice_type, 3)),
     },
     [154] = {
-        [sym_type_expression] = ACTIONS(SHIFT(155)),
+        [sym__type_expression] = ACTIONS(SHIFT(155)),
         [sym_pointer_type] = ACTIONS(SHIFT(137)),
         [sym_map_type] = ACTIONS(SHIFT(137)),
         [sym_slice_type] = ACTIONS(SHIFT(137)),
@@ -4010,7 +4013,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(156)),
     },
     [156] = {
-        [sym_type_expression] = ACTIONS(SHIFT(157)),
+        [sym__type_expression] = ACTIONS(SHIFT(157)),
         [sym_pointer_type] = ACTIONS(SHIFT(137)),
         [sym_map_type] = ACTIONS(SHIFT(137)),
         [sym_slice_type] = ACTIONS(SHIFT(137)),
@@ -4037,7 +4040,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym_pointer_type, 2)),
     },
     [159] = {
-        [sym_type_expression] = ACTIONS(SHIFT(160)),
+        [sym__type_expression] = ACTIONS(SHIFT(160)),
         [sym_pointer_type] = ACTIONS(SHIFT(118)),
         [sym_map_type] = ACTIONS(SHIFT(118)),
         [sym_slice_type] = ACTIONS(SHIFT(118)),
@@ -4075,7 +4078,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(aux_sym_struct_type_repeat1, 3)),
     },
     [163] = {
-        [sym_type_expression] = ACTIONS(SHIFT(164)),
+        [sym__type_expression] = ACTIONS(SHIFT(164)),
         [sym_pointer_type] = ACTIONS(SHIFT(45)),
         [sym_map_type] = ACTIONS(SHIFT(45)),
         [sym_slice_type] = ACTIONS(SHIFT(45)),
@@ -4099,7 +4102,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_slice_type, 3)),
     },
     [165] = {
-        [sym_type_expression] = ACTIONS(SHIFT(166)),
+        [sym__type_expression] = ACTIONS(SHIFT(166)),
         [sym_pointer_type] = ACTIONS(SHIFT(137)),
         [sym_map_type] = ACTIONS(SHIFT(137)),
         [sym_slice_type] = ACTIONS(SHIFT(137)),
@@ -4121,7 +4124,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(167)),
     },
     [167] = {
-        [sym_type_expression] = ACTIONS(SHIFT(168)),
+        [sym__type_expression] = ACTIONS(SHIFT(168)),
         [sym_pointer_type] = ACTIONS(SHIFT(45)),
         [sym_map_type] = ACTIONS(SHIFT(45)),
         [sym_slice_type] = ACTIONS(SHIFT(45)),
@@ -4321,189 +4324,161 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_COMMA] = ACTIONS(SHIFT(38)),
     },
     [196] = {
-        [sym__line_break] = ACTIONS(SHIFT(383)),
+        [sym__line_break] = ACTIONS(SHIFT(382)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(383)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(382)),
     },
     [197] = {
         [sym_var_declaration] = ACTIONS(SHIFT(198)),
-        [sym_statement] = ACTIONS(SHIFT(199)),
-        [sym_return_statement] = ACTIONS(SHIFT(200)),
-        [sym_declaration_statement] = ACTIONS(SHIFT(200)),
-        [sym_range_statement] = ACTIONS(SHIFT(200)),
-        [sym_if_statement] = ACTIONS(SHIFT(200)),
-        [sym_expression_statement] = ACTIONS(SHIFT(200)),
-        [sym_expression] = ACTIONS(SHIFT(201)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(203)),
-        [ts_builtin_sym_error] = ACTIONS(SHIFT(204)),
+        [sym__statement] = ACTIONS(SHIFT(199)),
+        [sym_return_statement] = ACTIONS(SHIFT(198)),
+        [sym_short_var_declaration] = ACTIONS(SHIFT(198)),
+        [sym_range_statement] = ACTIONS(SHIFT(198)),
+        [sym_if_statement] = ACTIONS(SHIFT(198)),
+        [sym_expression_statement] = ACTIONS(SHIFT(198)),
+        [sym__expression] = ACTIONS(SHIFT(200)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(202)),
+        [ts_builtin_sym_error] = ACTIONS(SHIFT(203)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(205)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(204)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_block_statement_repeat1] = ACTIONS(SHIFT(204)),
-        [aux_sym_STR_var] = ACTIONS(SHIFT(206)),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(207)),
-        [aux_sym_STR_return] = ACTIONS(SHIFT(208)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(209)),
-        [aux_sym_STR_for] = ACTIONS(SHIFT(210)),
-        [aux_sym_STR_if] = ACTIONS(SHIFT(211)),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
+        [aux_sym_block_statement_repeat1] = ACTIONS(SHIFT(203)),
+        [aux_sym_STR_var] = ACTIONS(SHIFT(205)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(206)),
+        [aux_sym_STR_return] = ACTIONS(SHIFT(207)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(208)),
+        [aux_sym_STR_for] = ACTIONS(SHIFT(209)),
+        [aux_sym_STR_if] = ACTIONS(SHIFT(210)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
     },
     [198] = {
-        [sym_var_declaration] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_statement] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_return_statement] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_range_statement] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_if_statement] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_expression_statement] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_expression] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_call_expression] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_selector_expression] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_math_op] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_bool_op] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_var_name] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
+        [sym_var_declaration] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym__statement] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym_return_statement] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym_range_statement] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym_if_statement] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym_expression_statement] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym__expression] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym_call_expression] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym_selector_expression] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym_math_op] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym_bool_op] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym_var_name] = ACTIONS(REDUCE(sym__statement, 1)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym__identifier] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [sym_number] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
+        [sym_string] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym__identifier] = ACTIONS(REDUCE(sym__statement, 1)),
+        [sym_number] = ACTIONS(REDUCE(sym__statement, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_block_statement_repeat1] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [aux_sym_STR_var] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [aux_sym_STR_return] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [aux_sym_STR_for] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [aux_sym_STR_if] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
-        [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_declaration_statement, 1)),
+        [aux_sym_block_statement_repeat1] = ACTIONS(REDUCE(sym__statement, 1)),
+        [aux_sym_STR_var] = ACTIONS(REDUCE(sym__statement, 1)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym__statement, 1)),
+        [aux_sym_STR_return] = ACTIONS(REDUCE(sym__statement, 1)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym__statement, 1)),
+        [aux_sym_STR_for] = ACTIONS(REDUCE(sym__statement, 1)),
+        [aux_sym_STR_if] = ACTIONS(REDUCE(sym__statement, 1)),
+        [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym__statement, 1)),
     },
     [199] = {
         [sym_var_declaration] = ACTIONS(SHIFT(198)),
-        [sym_statement] = ACTIONS(SHIFT(199)),
-        [sym_return_statement] = ACTIONS(SHIFT(200)),
-        [sym_declaration_statement] = ACTIONS(SHIFT(200)),
-        [sym_range_statement] = ACTIONS(SHIFT(200)),
-        [sym_if_statement] = ACTIONS(SHIFT(200)),
-        [sym_expression_statement] = ACTIONS(SHIFT(200)),
-        [sym_expression] = ACTIONS(SHIFT(201)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(203)),
+        [sym__statement] = ACTIONS(SHIFT(199)),
+        [sym_return_statement] = ACTIONS(SHIFT(198)),
+        [sym_short_var_declaration] = ACTIONS(SHIFT(198)),
+        [sym_range_statement] = ACTIONS(SHIFT(198)),
+        [sym_if_statement] = ACTIONS(SHIFT(198)),
+        [sym_expression_statement] = ACTIONS(SHIFT(198)),
+        [sym__expression] = ACTIONS(SHIFT(200)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(202)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(205)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(204)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_block_statement_repeat1] = ACTIONS(SHIFT(382)),
-        [aux_sym_STR_var] = ACTIONS(SHIFT(206)),
+        [aux_sym_block_statement_repeat1] = ACTIONS(SHIFT(381)),
+        [aux_sym_STR_var] = ACTIONS(SHIFT(205)),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(aux_sym_block_statement_repeat1, 1)),
-        [aux_sym_STR_return] = ACTIONS(SHIFT(208)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(209)),
-        [aux_sym_STR_for] = ACTIONS(SHIFT(210)),
-        [aux_sym_STR_if] = ACTIONS(SHIFT(211)),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
+        [aux_sym_STR_return] = ACTIONS(SHIFT(207)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(208)),
+        [aux_sym_STR_for] = ACTIONS(SHIFT(209)),
+        [aux_sym_STR_if] = ACTIONS(SHIFT(210)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
     },
     [200] = {
-        [sym_var_declaration] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_statement] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_return_statement] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_range_statement] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_if_statement] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_expression_statement] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_expression] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_call_expression] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_selector_expression] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_math_op] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_bool_op] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_var_name] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym__identifier] = ACTIONS(REDUCE(sym_statement, 1)),
-        [sym_number] = ACTIONS(REDUCE(sym_statement, 1)),
+        [sym__line_break] = ACTIONS(SHIFT(380)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_block_statement_repeat1] = ACTIONS(REDUCE(sym_statement, 1)),
-        [aux_sym_STR_var] = ACTIONS(REDUCE(sym_statement, 1)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_statement, 1)),
-        [aux_sym_STR_return] = ACTIONS(REDUCE(sym_statement, 1)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_statement, 1)),
-        [aux_sym_STR_for] = ACTIONS(REDUCE(sym_statement, 1)),
-        [aux_sym_STR_if] = ACTIONS(REDUCE(sym_statement, 1)),
-        [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_statement, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(288)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(380)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(290)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(292)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(293)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(294)),
     },
     [201] = {
-        [sym__line_break] = ACTIONS(SHIFT(381)),
+        [sym__line_break] = ACTIONS(REDUCE(sym__expression, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(289)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(381)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(291)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(293)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(294)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(295)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_DOT] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LT] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_GT] = ACTIONS(REDUCE(sym__expression, 1)),
     },
     [202] = {
-        [sym__line_break] = ACTIONS(REDUCE(sym_expression, 1)),
+        [sym__line_break] = ACTIONS(REDUCE(sym__expression, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_DOT] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LT] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_expression, 1)),
+        [aux_sym_short_var_declaration_repeat1] = ACTIONS(SHIFT(369)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(370)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(371)),
+        [aux_sym_STR_DOT] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LT] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_GT] = ACTIONS(REDUCE(sym__expression, 1)),
     },
     [203] = {
-        [sym__line_break] = ACTIONS(REDUCE(sym_expression, 1)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_statement_repeat1] = ACTIONS(SHIFT(370)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(371)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(372)),
-        [aux_sym_STR_DOT] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LT] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_expression, 1)),
-    },
-    [204] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(369)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(368)),
     },
-    [205] = {
+    [204] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_statement_repeat1] = ACTIONS(REDUCE(sym_var_name, 1)),
+        [aux_sym_short_var_declaration_repeat1] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_var_name, 1)),
@@ -4521,81 +4496,81 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_var_name, 1)),
     },
-    [206] = {
-        [sym_var_name] = ACTIONS(SHIFT(337)),
+    [205] = {
+        [sym_var_name] = ACTIONS(SHIFT(336)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(338)),
+        [sym__identifier] = ACTIONS(SHIFT(337)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
-    [207] = {
+    [206] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_block_statement, 2)),
     },
-    [208] = {
-        [sym_expression] = ACTIONS(SHIFT(307)),
-        [sym_call_expression] = ACTIONS(SHIFT(308)),
-        [sym_selector_expression] = ACTIONS(SHIFT(308)),
-        [sym_math_op] = ACTIONS(SHIFT(308)),
-        [sym_bool_op] = ACTIONS(SHIFT(308)),
-        [sym_var_name] = ACTIONS(SHIFT(308)),
-        [sym__line_break] = ACTIONS(SHIFT(309)),
-        [sym_string] = ACTIONS(SHIFT(308)),
-        [sym__identifier] = ACTIONS(SHIFT(310)),
-        [sym_number] = ACTIONS(SHIFT(308)),
+    [207] = {
+        [sym__expression] = ACTIONS(SHIFT(306)),
+        [sym_call_expression] = ACTIONS(SHIFT(307)),
+        [sym_selector_expression] = ACTIONS(SHIFT(307)),
+        [sym_math_op] = ACTIONS(SHIFT(307)),
+        [sym_bool_op] = ACTIONS(SHIFT(307)),
+        [sym_var_name] = ACTIONS(SHIFT(307)),
+        [sym__line_break] = ACTIONS(SHIFT(308)),
+        [sym_string] = ACTIONS(SHIFT(307)),
+        [sym__identifier] = ACTIONS(SHIFT(309)),
+        [sym_number] = ACTIONS(SHIFT(307)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(309)),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(311)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(308)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(310)),
+    },
+    [208] = {
+        [sym__expression] = ACTIONS(SHIFT(286)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
     },
     [209] = {
-        [sym_expression] = ACTIONS(SHIFT(287)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
+        [sym_var_name] = ACTIONS(SHIFT(273)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym__identifier] = ACTIONS(SHIFT(274)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
     },
     [210] = {
-        [sym_var_name] = ACTIONS(SHIFT(274)),
+        [sym__expression] = ACTIONS(SHIFT(214)),
+        [sym_call_expression] = ACTIONS(SHIFT(215)),
+        [sym_selector_expression] = ACTIONS(SHIFT(215)),
+        [sym_math_op] = ACTIONS(SHIFT(215)),
+        [sym_bool_op] = ACTIONS(SHIFT(215)),
+        [sym_var_name] = ACTIONS(SHIFT(215)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(275)),
+        [sym_string] = ACTIONS(SHIFT(215)),
+        [sym__identifier] = ACTIONS(SHIFT(216)),
+        [sym_number] = ACTIONS(SHIFT(215)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(217)),
     },
     [211] = {
-        [sym_expression] = ACTIONS(SHIFT(215)),
-        [sym_call_expression] = ACTIONS(SHIFT(216)),
-        [sym_selector_expression] = ACTIONS(SHIFT(216)),
-        [sym_math_op] = ACTIONS(SHIFT(216)),
-        [sym_bool_op] = ACTIONS(SHIFT(216)),
-        [sym_var_name] = ACTIONS(SHIFT(216)),
+        [sym__expression] = ACTIONS(SHIFT(212)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(216)),
-        [sym__identifier] = ACTIONS(SHIFT(217)),
-        [sym_number] = ACTIONS(SHIFT(216)),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(218)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
     },
     [212] = {
-        [sym_expression] = ACTIONS(SHIFT(213)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
-    },
-    [213] = {
         [sym__line_break] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
@@ -4613,7 +4588,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
     },
-    [214] = {
+    [213] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_var_name, 1)),
@@ -4631,45 +4606,45 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_var_name, 1)),
     },
-    [215] = {
-        [sym_block_statement] = ACTIONS(SHIFT(220)),
+    [214] = {
+        [sym_block_statement] = ACTIONS(SHIFT(219)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(221)),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(222)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(223)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(224)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(223)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(225)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(225)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(226)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(227)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(228)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(220)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(221)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(222)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(223)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(222)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(224)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(224)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(225)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(226)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(227)),
+    },
+    [215] = {
+        [sym_block_statement] = ACTIONS(REDUCE(sym__expression, 1)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_DOT] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LT] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_GT] = ACTIONS(REDUCE(sym__expression, 1)),
     },
     [216] = {
-        [sym_block_statement] = ACTIONS(REDUCE(sym_expression, 1)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LBRACE] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_DOT] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LT] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_expression, 1)),
-    },
-    [217] = {
         [sym_block_statement] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -4688,21 +4663,21 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_var_name, 1)),
     },
-    [218] = {
-        [sym_expression] = ACTIONS(SHIFT(219)),
-        [sym_call_expression] = ACTIONS(SHIFT(216)),
-        [sym_selector_expression] = ACTIONS(SHIFT(216)),
-        [sym_math_op] = ACTIONS(SHIFT(216)),
-        [sym_bool_op] = ACTIONS(SHIFT(216)),
-        [sym_var_name] = ACTIONS(SHIFT(216)),
+    [217] = {
+        [sym__expression] = ACTIONS(SHIFT(218)),
+        [sym_call_expression] = ACTIONS(SHIFT(215)),
+        [sym_selector_expression] = ACTIONS(SHIFT(215)),
+        [sym_math_op] = ACTIONS(SHIFT(215)),
+        [sym_bool_op] = ACTIONS(SHIFT(215)),
+        [sym_var_name] = ACTIONS(SHIFT(215)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(216)),
-        [sym__identifier] = ACTIONS(SHIFT(217)),
-        [sym_number] = ACTIONS(SHIFT(216)),
+        [sym_string] = ACTIONS(SHIFT(215)),
+        [sym__identifier] = ACTIONS(SHIFT(216)),
+        [sym_number] = ACTIONS(SHIFT(215)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(218)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(217)),
     },
-    [219] = {
+    [218] = {
         [sym_block_statement] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -4721,15 +4696,15 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
     },
-    [220] = {
+    [219] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_if_statement, 3)),
-        [sym_statement] = ACTIONS(REDUCE(sym_if_statement, 3)),
+        [sym__statement] = ACTIONS(REDUCE(sym_if_statement, 3)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_if_statement, 3)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_if_statement, 3)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_if_statement, 3)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_if_statement, 3)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_if_statement, 3)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_if_statement, 3)),
-        [sym_expression] = ACTIONS(REDUCE(sym_if_statement, 3)),
+        [sym__expression] = ACTIONS(REDUCE(sym_if_statement, 3)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_if_statement, 3)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_if_statement, 3)),
         [sym_math_op] = ACTIONS(REDUCE(sym_if_statement, 3)),
@@ -4747,130 +4722,130 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_if_statement, 3)),
         [aux_sym_STR_for] = ACTIONS(REDUCE(sym_if_statement, 3)),
         [aux_sym_STR_if] = ACTIONS(REDUCE(sym_if_statement, 3)),
-        [aux_sym_STR_else] = ACTIONS(SHIFT(268)),
+        [aux_sym_STR_else] = ACTIONS(SHIFT(267)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_if_statement, 3)),
     },
-    [221] = {
-        [sym_expression] = ACTIONS(SHIFT(238)),
-        [sym_call_expression] = ACTIONS(SHIFT(239)),
-        [sym_selector_expression] = ACTIONS(SHIFT(239)),
-        [sym_math_op] = ACTIONS(SHIFT(239)),
-        [sym_bool_op] = ACTIONS(SHIFT(239)),
-        [sym_var_name] = ACTIONS(SHIFT(239)),
+    [220] = {
+        [sym__expression] = ACTIONS(SHIFT(237)),
+        [sym_call_expression] = ACTIONS(SHIFT(238)),
+        [sym_selector_expression] = ACTIONS(SHIFT(238)),
+        [sym_math_op] = ACTIONS(SHIFT(238)),
+        [sym_bool_op] = ACTIONS(SHIFT(238)),
+        [sym_var_name] = ACTIONS(SHIFT(238)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(239)),
-        [sym__identifier] = ACTIONS(SHIFT(240)),
-        [sym_number] = ACTIONS(SHIFT(239)),
+        [sym_string] = ACTIONS(SHIFT(238)),
+        [sym__identifier] = ACTIONS(SHIFT(239)),
+        [sym_number] = ACTIONS(SHIFT(238)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(241)),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(242)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(240)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(241)),
+    },
+    [221] = {
+        [sym_var_declaration] = ACTIONS(SHIFT(198)),
+        [sym__statement] = ACTIONS(SHIFT(199)),
+        [sym_return_statement] = ACTIONS(SHIFT(198)),
+        [sym_short_var_declaration] = ACTIONS(SHIFT(198)),
+        [sym_range_statement] = ACTIONS(SHIFT(198)),
+        [sym_if_statement] = ACTIONS(SHIFT(198)),
+        [sym_expression_statement] = ACTIONS(SHIFT(198)),
+        [sym__expression] = ACTIONS(SHIFT(200)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(202)),
+        [ts_builtin_sym_error] = ACTIONS(SHIFT(234)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(204)),
+        [sym_number] = ACTIONS(SHIFT(201)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_block_statement_repeat1] = ACTIONS(SHIFT(234)),
+        [aux_sym_STR_var] = ACTIONS(SHIFT(205)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(235)),
+        [aux_sym_STR_return] = ACTIONS(SHIFT(207)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(208)),
+        [aux_sym_STR_for] = ACTIONS(SHIFT(209)),
+        [aux_sym_STR_if] = ACTIONS(SHIFT(210)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
     },
     [222] = {
-        [sym_var_declaration] = ACTIONS(SHIFT(198)),
-        [sym_statement] = ACTIONS(SHIFT(199)),
-        [sym_return_statement] = ACTIONS(SHIFT(200)),
-        [sym_declaration_statement] = ACTIONS(SHIFT(200)),
-        [sym_range_statement] = ACTIONS(SHIFT(200)),
-        [sym_if_statement] = ACTIONS(SHIFT(200)),
-        [sym_expression_statement] = ACTIONS(SHIFT(200)),
-        [sym_expression] = ACTIONS(SHIFT(201)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(203)),
-        [ts_builtin_sym_error] = ACTIONS(SHIFT(235)),
+        [sym__expression] = ACTIONS(SHIFT(233)),
+        [sym_call_expression] = ACTIONS(SHIFT(215)),
+        [sym_selector_expression] = ACTIONS(SHIFT(215)),
+        [sym_math_op] = ACTIONS(SHIFT(215)),
+        [sym_bool_op] = ACTIONS(SHIFT(215)),
+        [sym_var_name] = ACTIONS(SHIFT(215)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(205)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym_string] = ACTIONS(SHIFT(215)),
+        [sym__identifier] = ACTIONS(SHIFT(216)),
+        [sym_number] = ACTIONS(SHIFT(215)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_block_statement_repeat1] = ACTIONS(SHIFT(235)),
-        [aux_sym_STR_var] = ACTIONS(SHIFT(206)),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(236)),
-        [aux_sym_STR_return] = ACTIONS(SHIFT(208)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(209)),
-        [aux_sym_STR_for] = ACTIONS(SHIFT(210)),
-        [aux_sym_STR_if] = ACTIONS(SHIFT(211)),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(217)),
     },
     [223] = {
-        [sym_expression] = ACTIONS(SHIFT(234)),
-        [sym_call_expression] = ACTIONS(SHIFT(216)),
-        [sym_selector_expression] = ACTIONS(SHIFT(216)),
-        [sym_math_op] = ACTIONS(SHIFT(216)),
-        [sym_bool_op] = ACTIONS(SHIFT(216)),
-        [sym_var_name] = ACTIONS(SHIFT(216)),
+        [sym_var_name] = ACTIONS(SHIFT(232)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(216)),
-        [sym__identifier] = ACTIONS(SHIFT(217)),
-        [sym_number] = ACTIONS(SHIFT(216)),
+        [sym__identifier] = ACTIONS(SHIFT(216)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(218)),
     },
     [224] = {
-        [sym_var_name] = ACTIONS(SHIFT(233)),
+        [sym__expression] = ACTIONS(SHIFT(231)),
+        [sym_call_expression] = ACTIONS(SHIFT(215)),
+        [sym_selector_expression] = ACTIONS(SHIFT(215)),
+        [sym_math_op] = ACTIONS(SHIFT(215)),
+        [sym_bool_op] = ACTIONS(SHIFT(215)),
+        [sym_var_name] = ACTIONS(SHIFT(215)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(217)),
+        [sym_string] = ACTIONS(SHIFT(215)),
+        [sym__identifier] = ACTIONS(SHIFT(216)),
+        [sym_number] = ACTIONS(SHIFT(215)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(217)),
     },
     [225] = {
-        [sym_expression] = ACTIONS(SHIFT(232)),
-        [sym_call_expression] = ACTIONS(SHIFT(216)),
-        [sym_selector_expression] = ACTIONS(SHIFT(216)),
-        [sym_math_op] = ACTIONS(SHIFT(216)),
-        [sym_bool_op] = ACTIONS(SHIFT(216)),
-        [sym_var_name] = ACTIONS(SHIFT(216)),
+        [sym__expression] = ACTIONS(SHIFT(230)),
+        [sym_call_expression] = ACTIONS(SHIFT(215)),
+        [sym_selector_expression] = ACTIONS(SHIFT(215)),
+        [sym_math_op] = ACTIONS(SHIFT(215)),
+        [sym_bool_op] = ACTIONS(SHIFT(215)),
+        [sym_var_name] = ACTIONS(SHIFT(215)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(216)),
-        [sym__identifier] = ACTIONS(SHIFT(217)),
-        [sym_number] = ACTIONS(SHIFT(216)),
+        [sym_string] = ACTIONS(SHIFT(215)),
+        [sym__identifier] = ACTIONS(SHIFT(216)),
+        [sym_number] = ACTIONS(SHIFT(215)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(218)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(217)),
     },
     [226] = {
-        [sym_expression] = ACTIONS(SHIFT(231)),
-        [sym_call_expression] = ACTIONS(SHIFT(216)),
-        [sym_selector_expression] = ACTIONS(SHIFT(216)),
-        [sym_math_op] = ACTIONS(SHIFT(216)),
-        [sym_bool_op] = ACTIONS(SHIFT(216)),
-        [sym_var_name] = ACTIONS(SHIFT(216)),
+        [sym__expression] = ACTIONS(SHIFT(229)),
+        [sym_call_expression] = ACTIONS(SHIFT(215)),
+        [sym_selector_expression] = ACTIONS(SHIFT(215)),
+        [sym_math_op] = ACTIONS(SHIFT(215)),
+        [sym_bool_op] = ACTIONS(SHIFT(215)),
+        [sym_var_name] = ACTIONS(SHIFT(215)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(216)),
-        [sym__identifier] = ACTIONS(SHIFT(217)),
-        [sym_number] = ACTIONS(SHIFT(216)),
+        [sym_string] = ACTIONS(SHIFT(215)),
+        [sym__identifier] = ACTIONS(SHIFT(216)),
+        [sym_number] = ACTIONS(SHIFT(215)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(218)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(217)),
     },
     [227] = {
-        [sym_expression] = ACTIONS(SHIFT(230)),
-        [sym_call_expression] = ACTIONS(SHIFT(216)),
-        [sym_selector_expression] = ACTIONS(SHIFT(216)),
-        [sym_math_op] = ACTIONS(SHIFT(216)),
-        [sym_bool_op] = ACTIONS(SHIFT(216)),
-        [sym_var_name] = ACTIONS(SHIFT(216)),
+        [sym__expression] = ACTIONS(SHIFT(228)),
+        [sym_call_expression] = ACTIONS(SHIFT(215)),
+        [sym_selector_expression] = ACTIONS(SHIFT(215)),
+        [sym_math_op] = ACTIONS(SHIFT(215)),
+        [sym_bool_op] = ACTIONS(SHIFT(215)),
+        [sym_var_name] = ACTIONS(SHIFT(215)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(216)),
-        [sym__identifier] = ACTIONS(SHIFT(217)),
-        [sym_number] = ACTIONS(SHIFT(216)),
+        [sym_string] = ACTIONS(SHIFT(215)),
+        [sym__identifier] = ACTIONS(SHIFT(216)),
+        [sym_number] = ACTIONS(SHIFT(215)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(218)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(217)),
     },
     [228] = {
-        [sym_expression] = ACTIONS(SHIFT(229)),
-        [sym_call_expression] = ACTIONS(SHIFT(216)),
-        [sym_selector_expression] = ACTIONS(SHIFT(216)),
-        [sym_math_op] = ACTIONS(SHIFT(216)),
-        [sym_bool_op] = ACTIONS(SHIFT(216)),
-        [sym_var_name] = ACTIONS(SHIFT(216)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(216)),
-        [sym__identifier] = ACTIONS(SHIFT(217)),
-        [sym_number] = ACTIONS(SHIFT(216)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(218)),
-    },
-    [229] = {
         [sym_block_statement] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -4889,7 +4864,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
     },
-    [230] = {
+    [229] = {
         [sym_block_statement] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -4902,51 +4877,51 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(228)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(227)),
     },
-    [231] = {
+    [230] = {
         [sym_block_statement] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_LBRACE] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(223)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(222)),
         [aux_sym_STR_DOT] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(223)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(222)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(227)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(228)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(226)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(227)),
     },
-    [232] = {
+    [231] = {
         [sym_block_statement] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_LBRACE] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(223)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(222)),
         [aux_sym_STR_DOT] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(223)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(222)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(227)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(228)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(226)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(227)),
     },
-    [233] = {
+    [232] = {
         [sym_block_statement] = ACTIONS(REDUCE(sym_selector_expression, 3)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -4965,7 +4940,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_selector_expression, 3)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_selector_expression, 3)),
     },
-    [234] = {
+    [233] = {
         [sym_block_statement] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -4978,26 +4953,26 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(228)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(227)),
     },
-    [235] = {
+    [234] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(237)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(236)),
     },
-    [236] = {
+    [235] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_block_statement, 2)),
-        [sym_statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
+        [sym__statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
-        [sym_expression] = ACTIONS(REDUCE(sym_block_statement, 2)),
+        [sym__expression] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_math_op] = ACTIONS(REDUCE(sym_block_statement, 2)),
@@ -5018,15 +4993,15 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_else] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_block_statement, 2)),
     },
-    [237] = {
+    [236] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_block_statement, 3)),
-        [sym_statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
+        [sym__statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
-        [sym_expression] = ACTIONS(REDUCE(sym_block_statement, 3)),
+        [sym__expression] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_math_op] = ACTIONS(REDUCE(sym_block_statement, 3)),
@@ -5047,47 +5022,47 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_else] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_block_statement, 3)),
     },
+    [237] = {
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(243)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(244)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(245)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(246)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(247)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(248)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(246)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(249)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(249)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(250)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(251)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(252)),
+    },
     [238] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(244)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(245)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(246)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(247)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(248)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(249)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(247)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(250)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(250)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(251)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(252)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(253)),
+        [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_DOT] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LT] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_GT] = ACTIONS(REDUCE(sym__expression, 1)),
     },
     [239] = {
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_DOT] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LT] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_expression, 1)),
-    },
-    [240] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym_var_name, 1)),
@@ -5107,7 +5082,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_var_name, 1)),
     },
-    [241] = {
+    [240] = {
         [sym_block_statement] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -5126,21 +5101,21 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_call_expression, 3)),
     },
-    [242] = {
-        [sym_expression] = ACTIONS(SHIFT(243)),
-        [sym_call_expression] = ACTIONS(SHIFT(239)),
-        [sym_selector_expression] = ACTIONS(SHIFT(239)),
-        [sym_math_op] = ACTIONS(SHIFT(239)),
-        [sym_bool_op] = ACTIONS(SHIFT(239)),
-        [sym_var_name] = ACTIONS(SHIFT(239)),
+    [241] = {
+        [sym__expression] = ACTIONS(SHIFT(242)),
+        [sym_call_expression] = ACTIONS(SHIFT(238)),
+        [sym_selector_expression] = ACTIONS(SHIFT(238)),
+        [sym_math_op] = ACTIONS(SHIFT(238)),
+        [sym_bool_op] = ACTIONS(SHIFT(238)),
+        [sym_var_name] = ACTIONS(SHIFT(238)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(239)),
-        [sym__identifier] = ACTIONS(SHIFT(240)),
-        [sym_number] = ACTIONS(SHIFT(239)),
+        [sym_string] = ACTIONS(SHIFT(238)),
+        [sym__identifier] = ACTIONS(SHIFT(239)),
+        [sym_number] = ACTIONS(SHIFT(238)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(242)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(241)),
     },
-    [243] = {
+    [242] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
@@ -5160,27 +5135,27 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
     },
-    [244] = {
+    [243] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(267)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(266)),
+    },
+    [244] = {
+        [sym__expression] = ACTIONS(SHIFT(261)),
+        [sym_call_expression] = ACTIONS(SHIFT(238)),
+        [sym_selector_expression] = ACTIONS(SHIFT(238)),
+        [sym_math_op] = ACTIONS(SHIFT(238)),
+        [sym_bool_op] = ACTIONS(SHIFT(238)),
+        [sym_var_name] = ACTIONS(SHIFT(238)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_string] = ACTIONS(SHIFT(238)),
+        [sym__identifier] = ACTIONS(SHIFT(239)),
+        [sym_number] = ACTIONS(SHIFT(238)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(262)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(241)),
     },
     [245] = {
-        [sym_expression] = ACTIONS(SHIFT(262)),
-        [sym_call_expression] = ACTIONS(SHIFT(239)),
-        [sym_selector_expression] = ACTIONS(SHIFT(239)),
-        [sym_math_op] = ACTIONS(SHIFT(239)),
-        [sym_bool_op] = ACTIONS(SHIFT(239)),
-        [sym_var_name] = ACTIONS(SHIFT(239)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(239)),
-        [sym__identifier] = ACTIONS(SHIFT(240)),
-        [sym_number] = ACTIONS(SHIFT(239)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(263)),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(242)),
-    },
-    [246] = {
         [sym_block_statement] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -5199,97 +5174,97 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_call_expression, 4)),
     },
-    [247] = {
-        [sym_expression] = ACTIONS(SHIFT(261)),
-        [sym_call_expression] = ACTIONS(SHIFT(239)),
-        [sym_selector_expression] = ACTIONS(SHIFT(239)),
-        [sym_math_op] = ACTIONS(SHIFT(239)),
-        [sym_bool_op] = ACTIONS(SHIFT(239)),
-        [sym_var_name] = ACTIONS(SHIFT(239)),
+    [246] = {
+        [sym__expression] = ACTIONS(SHIFT(260)),
+        [sym_call_expression] = ACTIONS(SHIFT(238)),
+        [sym_selector_expression] = ACTIONS(SHIFT(238)),
+        [sym_math_op] = ACTIONS(SHIFT(238)),
+        [sym_bool_op] = ACTIONS(SHIFT(238)),
+        [sym_var_name] = ACTIONS(SHIFT(238)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(239)),
-        [sym__identifier] = ACTIONS(SHIFT(240)),
-        [sym_number] = ACTIONS(SHIFT(239)),
+        [sym_string] = ACTIONS(SHIFT(238)),
+        [sym__identifier] = ACTIONS(SHIFT(239)),
+        [sym_number] = ACTIONS(SHIFT(238)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(242)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(241)),
+    },
+    [247] = {
+        [sym__expression] = ACTIONS(SHIFT(258)),
+        [sym_call_expression] = ACTIONS(SHIFT(238)),
+        [sym_selector_expression] = ACTIONS(SHIFT(238)),
+        [sym_math_op] = ACTIONS(SHIFT(238)),
+        [sym_bool_op] = ACTIONS(SHIFT(238)),
+        [sym_var_name] = ACTIONS(SHIFT(238)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_string] = ACTIONS(SHIFT(238)),
+        [sym__identifier] = ACTIONS(SHIFT(239)),
+        [sym_number] = ACTIONS(SHIFT(238)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(241)),
     },
     [248] = {
-        [sym_expression] = ACTIONS(SHIFT(259)),
-        [sym_call_expression] = ACTIONS(SHIFT(239)),
-        [sym_selector_expression] = ACTIONS(SHIFT(239)),
-        [sym_math_op] = ACTIONS(SHIFT(239)),
-        [sym_bool_op] = ACTIONS(SHIFT(239)),
-        [sym_var_name] = ACTIONS(SHIFT(239)),
+        [sym_var_name] = ACTIONS(SHIFT(257)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(239)),
-        [sym__identifier] = ACTIONS(SHIFT(240)),
-        [sym_number] = ACTIONS(SHIFT(239)),
+        [sym__identifier] = ACTIONS(SHIFT(239)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(242)),
     },
     [249] = {
-        [sym_var_name] = ACTIONS(SHIFT(258)),
+        [sym__expression] = ACTIONS(SHIFT(256)),
+        [sym_call_expression] = ACTIONS(SHIFT(238)),
+        [sym_selector_expression] = ACTIONS(SHIFT(238)),
+        [sym_math_op] = ACTIONS(SHIFT(238)),
+        [sym_bool_op] = ACTIONS(SHIFT(238)),
+        [sym_var_name] = ACTIONS(SHIFT(238)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(240)),
+        [sym_string] = ACTIONS(SHIFT(238)),
+        [sym__identifier] = ACTIONS(SHIFT(239)),
+        [sym_number] = ACTIONS(SHIFT(238)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(241)),
     },
     [250] = {
-        [sym_expression] = ACTIONS(SHIFT(257)),
-        [sym_call_expression] = ACTIONS(SHIFT(239)),
-        [sym_selector_expression] = ACTIONS(SHIFT(239)),
-        [sym_math_op] = ACTIONS(SHIFT(239)),
-        [sym_bool_op] = ACTIONS(SHIFT(239)),
-        [sym_var_name] = ACTIONS(SHIFT(239)),
+        [sym__expression] = ACTIONS(SHIFT(255)),
+        [sym_call_expression] = ACTIONS(SHIFT(238)),
+        [sym_selector_expression] = ACTIONS(SHIFT(238)),
+        [sym_math_op] = ACTIONS(SHIFT(238)),
+        [sym_bool_op] = ACTIONS(SHIFT(238)),
+        [sym_var_name] = ACTIONS(SHIFT(238)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(239)),
-        [sym__identifier] = ACTIONS(SHIFT(240)),
-        [sym_number] = ACTIONS(SHIFT(239)),
+        [sym_string] = ACTIONS(SHIFT(238)),
+        [sym__identifier] = ACTIONS(SHIFT(239)),
+        [sym_number] = ACTIONS(SHIFT(238)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(242)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(241)),
     },
     [251] = {
-        [sym_expression] = ACTIONS(SHIFT(256)),
-        [sym_call_expression] = ACTIONS(SHIFT(239)),
-        [sym_selector_expression] = ACTIONS(SHIFT(239)),
-        [sym_math_op] = ACTIONS(SHIFT(239)),
-        [sym_bool_op] = ACTIONS(SHIFT(239)),
-        [sym_var_name] = ACTIONS(SHIFT(239)),
+        [sym__expression] = ACTIONS(SHIFT(254)),
+        [sym_call_expression] = ACTIONS(SHIFT(238)),
+        [sym_selector_expression] = ACTIONS(SHIFT(238)),
+        [sym_math_op] = ACTIONS(SHIFT(238)),
+        [sym_bool_op] = ACTIONS(SHIFT(238)),
+        [sym_var_name] = ACTIONS(SHIFT(238)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(239)),
-        [sym__identifier] = ACTIONS(SHIFT(240)),
-        [sym_number] = ACTIONS(SHIFT(239)),
+        [sym_string] = ACTIONS(SHIFT(238)),
+        [sym__identifier] = ACTIONS(SHIFT(239)),
+        [sym_number] = ACTIONS(SHIFT(238)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(242)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(241)),
     },
     [252] = {
-        [sym_expression] = ACTIONS(SHIFT(255)),
-        [sym_call_expression] = ACTIONS(SHIFT(239)),
-        [sym_selector_expression] = ACTIONS(SHIFT(239)),
-        [sym_math_op] = ACTIONS(SHIFT(239)),
-        [sym_bool_op] = ACTIONS(SHIFT(239)),
-        [sym_var_name] = ACTIONS(SHIFT(239)),
+        [sym__expression] = ACTIONS(SHIFT(253)),
+        [sym_call_expression] = ACTIONS(SHIFT(238)),
+        [sym_selector_expression] = ACTIONS(SHIFT(238)),
+        [sym_math_op] = ACTIONS(SHIFT(238)),
+        [sym_bool_op] = ACTIONS(SHIFT(238)),
+        [sym_var_name] = ACTIONS(SHIFT(238)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(239)),
-        [sym__identifier] = ACTIONS(SHIFT(240)),
-        [sym_number] = ACTIONS(SHIFT(239)),
+        [sym_string] = ACTIONS(SHIFT(238)),
+        [sym__identifier] = ACTIONS(SHIFT(239)),
+        [sym_number] = ACTIONS(SHIFT(238)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(242)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(241)),
     },
     [253] = {
-        [sym_expression] = ACTIONS(SHIFT(254)),
-        [sym_call_expression] = ACTIONS(SHIFT(239)),
-        [sym_selector_expression] = ACTIONS(SHIFT(239)),
-        [sym_math_op] = ACTIONS(SHIFT(239)),
-        [sym_bool_op] = ACTIONS(SHIFT(239)),
-        [sym_var_name] = ACTIONS(SHIFT(239)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(239)),
-        [sym__identifier] = ACTIONS(SHIFT(240)),
-        [sym_number] = ACTIONS(SHIFT(239)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(242)),
-    },
-    [254] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
@@ -5309,7 +5284,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
     },
-    [255] = {
+    [254] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
@@ -5323,53 +5298,53 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(253)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(252)),
     },
-    [256] = {
+    [255] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(247)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(246)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_DOT] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(247)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(246)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(252)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(253)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(251)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(252)),
     },
-    [257] = {
+    [256] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(247)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(246)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_DOT] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(247)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(246)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(252)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(253)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(251)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(252)),
     },
-    [258] = {
+    [257] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym_selector_expression, 3)),
@@ -5389,32 +5364,32 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_selector_expression, 3)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_selector_expression, 3)),
     },
-    [259] = {
+    [258] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(260)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(245)),
+        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(259)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(244)),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(aux_sym_return_statement_repeat1, 2)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(247)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(248)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(249)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(247)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(250)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(250)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(251)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(252)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(253)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(246)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(247)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(248)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(246)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(249)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(249)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(250)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(251)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(252)),
     },
-    [260] = {
+    [259] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(aux_sym_return_statement_repeat1, 3)),
     },
-    [261] = {
+    [260] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
@@ -5428,33 +5403,33 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(253)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(252)),
     },
-    [262] = {
+    [261] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(264)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(245)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(265)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(247)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(248)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(249)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(247)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(250)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(250)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(251)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(252)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(253)),
+        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(263)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(244)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(264)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(246)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(247)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(248)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(246)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(249)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(249)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(250)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(251)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(252)),
     },
-    [263] = {
+    [262] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym_call_expression, 3)),
@@ -5474,12 +5449,12 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_call_expression, 3)),
     },
-    [264] = {
+    [263] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(266)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(265)),
     },
-    [265] = {
+    [264] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym_call_expression, 4)),
@@ -5499,7 +5474,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_call_expression, 4)),
     },
-    [266] = {
+    [265] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym_call_expression, 5)),
@@ -5519,7 +5494,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_call_expression, 5)),
     },
-    [267] = {
+    [266] = {
         [sym_block_statement] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
@@ -5538,23 +5513,23 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_call_expression, 5)),
     },
-    [268] = {
-        [sym_block_statement] = ACTIONS(SHIFT(269)),
-        [sym_if_statement] = ACTIONS(SHIFT(269)),
+    [267] = {
+        [sym_block_statement] = ACTIONS(SHIFT(268)),
+        [sym_if_statement] = ACTIONS(SHIFT(268)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(270)),
-        [aux_sym_STR_if] = ACTIONS(SHIFT(211)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(269)),
+        [aux_sym_STR_if] = ACTIONS(SHIFT(210)),
     },
-    [269] = {
+    [268] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_if_statement, 5)),
-        [sym_statement] = ACTIONS(REDUCE(sym_if_statement, 5)),
+        [sym__statement] = ACTIONS(REDUCE(sym_if_statement, 5)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_if_statement, 5)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_if_statement, 5)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_if_statement, 5)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_if_statement, 5)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_if_statement, 5)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_if_statement, 5)),
-        [sym_expression] = ACTIONS(REDUCE(sym_if_statement, 5)),
+        [sym__expression] = ACTIONS(REDUCE(sym_if_statement, 5)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_if_statement, 5)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_if_statement, 5)),
         [sym_math_op] = ACTIONS(REDUCE(sym_if_statement, 5)),
@@ -5574,49 +5549,49 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_if] = ACTIONS(REDUCE(sym_if_statement, 5)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_if_statement, 5)),
     },
-    [270] = {
+    [269] = {
         [sym_var_declaration] = ACTIONS(SHIFT(198)),
-        [sym_statement] = ACTIONS(SHIFT(199)),
-        [sym_return_statement] = ACTIONS(SHIFT(200)),
-        [sym_declaration_statement] = ACTIONS(SHIFT(200)),
-        [sym_range_statement] = ACTIONS(SHIFT(200)),
-        [sym_if_statement] = ACTIONS(SHIFT(200)),
-        [sym_expression_statement] = ACTIONS(SHIFT(200)),
-        [sym_expression] = ACTIONS(SHIFT(201)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(203)),
-        [ts_builtin_sym_error] = ACTIONS(SHIFT(271)),
+        [sym__statement] = ACTIONS(SHIFT(199)),
+        [sym_return_statement] = ACTIONS(SHIFT(198)),
+        [sym_short_var_declaration] = ACTIONS(SHIFT(198)),
+        [sym_range_statement] = ACTIONS(SHIFT(198)),
+        [sym_if_statement] = ACTIONS(SHIFT(198)),
+        [sym_expression_statement] = ACTIONS(SHIFT(198)),
+        [sym__expression] = ACTIONS(SHIFT(200)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(202)),
+        [ts_builtin_sym_error] = ACTIONS(SHIFT(270)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(204)),
+        [sym_number] = ACTIONS(SHIFT(201)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_block_statement_repeat1] = ACTIONS(SHIFT(270)),
+        [aux_sym_STR_var] = ACTIONS(SHIFT(205)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(271)),
+        [aux_sym_STR_return] = ACTIONS(SHIFT(207)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(208)),
+        [aux_sym_STR_for] = ACTIONS(SHIFT(209)),
+        [aux_sym_STR_if] = ACTIONS(SHIFT(210)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
+    },
+    [270] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(205)),
-        [sym_number] = ACTIONS(SHIFT(202)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_block_statement_repeat1] = ACTIONS(SHIFT(271)),
-        [aux_sym_STR_var] = ACTIONS(SHIFT(206)),
         [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(272)),
-        [aux_sym_STR_return] = ACTIONS(SHIFT(208)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(209)),
-        [aux_sym_STR_for] = ACTIONS(SHIFT(210)),
-        [aux_sym_STR_if] = ACTIONS(SHIFT(211)),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
     },
     [271] = {
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(273)),
-    },
-    [272] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_block_statement, 2)),
-        [sym_statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
+        [sym__statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_block_statement, 2)),
-        [sym_expression] = ACTIONS(REDUCE(sym_block_statement, 2)),
+        [sym__expression] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [sym_math_op] = ACTIONS(REDUCE(sym_block_statement, 2)),
@@ -5636,15 +5611,15 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_if] = ACTIONS(REDUCE(sym_block_statement, 2)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_block_statement, 2)),
     },
-    [273] = {
+    [272] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_block_statement, 3)),
-        [sym_statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
+        [sym__statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_block_statement, 3)),
-        [sym_expression] = ACTIONS(REDUCE(sym_block_statement, 3)),
+        [sym__expression] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_math_op] = ACTIONS(REDUCE(sym_block_statement, 3)),
@@ -5664,71 +5639,71 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_if] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_block_statement, 3)),
     },
-    [274] = {
+    [273] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(276)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(277)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(275)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(276)),
     },
-    [275] = {
+    [274] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_var_name, 1)),
     },
-    [276] = {
-        [sym_var_name] = ACTIONS(SHIFT(281)),
+    [275] = {
+        [sym_var_name] = ACTIONS(SHIFT(280)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(282)),
+        [sym__identifier] = ACTIONS(SHIFT(281)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
+    [276] = {
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_range] = ACTIONS(SHIFT(277)),
+    },
     [277] = {
+        [sym__expression] = ACTIONS(SHIFT(278)),
+        [sym_call_expression] = ACTIONS(SHIFT(215)),
+        [sym_selector_expression] = ACTIONS(SHIFT(215)),
+        [sym_math_op] = ACTIONS(SHIFT(215)),
+        [sym_bool_op] = ACTIONS(SHIFT(215)),
+        [sym_var_name] = ACTIONS(SHIFT(215)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_string] = ACTIONS(SHIFT(215)),
+        [sym__identifier] = ACTIONS(SHIFT(216)),
+        [sym_number] = ACTIONS(SHIFT(215)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_range] = ACTIONS(SHIFT(278)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(217)),
     },
     [278] = {
-        [sym_expression] = ACTIONS(SHIFT(279)),
-        [sym_call_expression] = ACTIONS(SHIFT(216)),
-        [sym_selector_expression] = ACTIONS(SHIFT(216)),
-        [sym_math_op] = ACTIONS(SHIFT(216)),
-        [sym_bool_op] = ACTIONS(SHIFT(216)),
-        [sym_var_name] = ACTIONS(SHIFT(216)),
+        [sym_block_statement] = ACTIONS(SHIFT(279)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(216)),
-        [sym__identifier] = ACTIONS(SHIFT(217)),
-        [sym_number] = ACTIONS(SHIFT(216)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(218)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(220)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(269)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(222)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(223)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(222)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(224)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(224)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(225)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(226)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(227)),
     },
     [279] = {
-        [sym_block_statement] = ACTIONS(SHIFT(280)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(221)),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(270)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(223)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(224)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(223)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(225)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(225)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(226)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(227)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(228)),
-    },
-    [280] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_range_statement, 6)),
-        [sym_statement] = ACTIONS(REDUCE(sym_range_statement, 6)),
+        [sym__statement] = ACTIONS(REDUCE(sym_range_statement, 6)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_range_statement, 6)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_range_statement, 6)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_range_statement, 6)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_range_statement, 6)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_range_statement, 6)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_range_statement, 6)),
-        [sym_expression] = ACTIONS(REDUCE(sym_range_statement, 6)),
+        [sym__expression] = ACTIONS(REDUCE(sym_range_statement, 6)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_range_statement, 6)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_range_statement, 6)),
         [sym_math_op] = ACTIONS(REDUCE(sym_range_statement, 6)),
@@ -5748,63 +5723,63 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_if] = ACTIONS(REDUCE(sym_range_statement, 6)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_range_statement, 6)),
     },
-    [281] = {
+    [280] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(283)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(282)),
     },
-    [282] = {
+    [281] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_var_name, 1)),
     },
-    [283] = {
+    [282] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_range] = ACTIONS(SHIFT(284)),
+        [aux_sym_STR_range] = ACTIONS(SHIFT(283)),
+    },
+    [283] = {
+        [sym__expression] = ACTIONS(SHIFT(284)),
+        [sym_call_expression] = ACTIONS(SHIFT(215)),
+        [sym_selector_expression] = ACTIONS(SHIFT(215)),
+        [sym_math_op] = ACTIONS(SHIFT(215)),
+        [sym_bool_op] = ACTIONS(SHIFT(215)),
+        [sym_var_name] = ACTIONS(SHIFT(215)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_string] = ACTIONS(SHIFT(215)),
+        [sym__identifier] = ACTIONS(SHIFT(216)),
+        [sym_number] = ACTIONS(SHIFT(215)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(217)),
     },
     [284] = {
-        [sym_expression] = ACTIONS(SHIFT(285)),
-        [sym_call_expression] = ACTIONS(SHIFT(216)),
-        [sym_selector_expression] = ACTIONS(SHIFT(216)),
-        [sym_math_op] = ACTIONS(SHIFT(216)),
-        [sym_bool_op] = ACTIONS(SHIFT(216)),
-        [sym_var_name] = ACTIONS(SHIFT(216)),
+        [sym_block_statement] = ACTIONS(SHIFT(285)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(216)),
-        [sym__identifier] = ACTIONS(SHIFT(217)),
-        [sym_number] = ACTIONS(SHIFT(216)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(218)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(220)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(269)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(222)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(223)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(222)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(224)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(224)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(225)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(226)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(227)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(227)),
     },
     [285] = {
-        [sym_block_statement] = ACTIONS(SHIFT(286)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(221)),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(270)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(223)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(224)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(223)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(225)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(225)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(226)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(227)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(228)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(228)),
-    },
-    [286] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_range_statement, 8)),
-        [sym_statement] = ACTIONS(REDUCE(sym_range_statement, 8)),
+        [sym__statement] = ACTIONS(REDUCE(sym_range_statement, 8)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_range_statement, 8)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_range_statement, 8)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_range_statement, 8)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_range_statement, 8)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_range_statement, 8)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_range_statement, 8)),
-        [sym_expression] = ACTIONS(REDUCE(sym_range_statement, 8)),
+        [sym__expression] = ACTIONS(REDUCE(sym_range_statement, 8)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_range_statement, 8)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_range_statement, 8)),
         [sym_math_op] = ACTIONS(REDUCE(sym_range_statement, 8)),
@@ -5824,53 +5799,53 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_if] = ACTIONS(REDUCE(sym_range_statement, 8)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_range_statement, 8)),
     },
-    [287] = {
-        [sym__line_break] = ACTIONS(SHIFT(288)),
+    [286] = {
+        [sym__line_break] = ACTIONS(SHIFT(287)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(289)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(288)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(291)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(293)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(294)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(295)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(288)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(287)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(290)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(292)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(293)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(294)),
     },
-    [288] = {
-        [sym_var_declaration] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_statement] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_return_statement] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_range_statement] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_if_statement] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_expression_statement] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_expression] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_call_expression] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_selector_expression] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_math_op] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_bool_op] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_var_name] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
+    [287] = {
+        [sym_var_declaration] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym__statement] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym_return_statement] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym_range_statement] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym_if_statement] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym_expression_statement] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym__expression] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym_call_expression] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym_selector_expression] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym_math_op] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym_bool_op] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym_var_name] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym__identifier] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [sym_number] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
+        [sym_string] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym__identifier] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [sym_number] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_block_statement_repeat1] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
+        [aux_sym_block_statement_repeat1] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
-        [aux_sym_STR_var] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
+        [aux_sym_STR_var] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
-        [aux_sym_STR_return] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [aux_sym_STR_for] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
-        [aux_sym_STR_if] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
+        [aux_sym_STR_return] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [aux_sym_STR_for] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+        [aux_sym_STR_if] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
         [aux_sym_STR_DOT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_SLASH] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
@@ -5882,100 +5857,100 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_LT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
-        [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_declaration_statement, 3)),
+        [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_short_var_declaration, 3)),
+    },
+    [288] = {
+        [sym__expression] = ACTIONS(SHIFT(301)),
+        [sym_call_expression] = ACTIONS(SHIFT(238)),
+        [sym_selector_expression] = ACTIONS(SHIFT(238)),
+        [sym_math_op] = ACTIONS(SHIFT(238)),
+        [sym_bool_op] = ACTIONS(SHIFT(238)),
+        [sym_var_name] = ACTIONS(SHIFT(238)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_string] = ACTIONS(SHIFT(238)),
+        [sym__identifier] = ACTIONS(SHIFT(239)),
+        [sym_number] = ACTIONS(SHIFT(238)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(302)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(241)),
     },
     [289] = {
-        [sym_expression] = ACTIONS(SHIFT(302)),
-        [sym_call_expression] = ACTIONS(SHIFT(239)),
-        [sym_selector_expression] = ACTIONS(SHIFT(239)),
-        [sym_math_op] = ACTIONS(SHIFT(239)),
-        [sym_bool_op] = ACTIONS(SHIFT(239)),
-        [sym_var_name] = ACTIONS(SHIFT(239)),
+        [sym__expression] = ACTIONS(SHIFT(300)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(239)),
-        [sym__identifier] = ACTIONS(SHIFT(240)),
-        [sym_number] = ACTIONS(SHIFT(239)),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(303)),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(242)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
     },
     [290] = {
-        [sym_expression] = ACTIONS(SHIFT(301)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
+        [sym_var_name] = ACTIONS(SHIFT(299)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
     },
     [291] = {
-        [sym_var_name] = ACTIONS(SHIFT(300)),
+        [sym__expression] = ACTIONS(SHIFT(298)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
     },
     [292] = {
-        [sym_expression] = ACTIONS(SHIFT(299)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
+        [sym__expression] = ACTIONS(SHIFT(297)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
     },
     [293] = {
-        [sym_expression] = ACTIONS(SHIFT(298)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
+        [sym__expression] = ACTIONS(SHIFT(296)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
     },
     [294] = {
-        [sym_expression] = ACTIONS(SHIFT(297)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
+        [sym__expression] = ACTIONS(SHIFT(295)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
     },
     [295] = {
-        [sym_expression] = ACTIONS(SHIFT(296)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
-    },
-    [296] = {
         [sym__line_break] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
@@ -5993,7 +5968,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
     },
-    [297] = {
+    [296] = {
         [sym__line_break] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
@@ -6005,49 +5980,49 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(295)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(294)),
     },
-    [298] = {
+    [297] = {
         [sym__line_break] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(290)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(289)),
         [aux_sym_STR_DOT] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(290)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(289)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(294)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(295)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(293)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(294)),
     },
-    [299] = {
+    [298] = {
         [sym__line_break] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(290)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(289)),
         [aux_sym_STR_DOT] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(290)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(289)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(294)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(295)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(293)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(294)),
     },
-    [300] = {
+    [299] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_selector_expression, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_selector_expression, 3)),
@@ -6065,7 +6040,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_selector_expression, 3)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_selector_expression, 3)),
     },
-    [301] = {
+    [300] = {
         [sym__line_break] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
@@ -6077,33 +6052,33 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(295)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(294)),
     },
-    [302] = {
+    [301] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(304)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(245)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(305)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(247)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(248)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(249)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(247)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(250)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(250)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(251)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(252)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(253)),
+        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(303)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(244)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(304)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(246)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(247)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(248)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(246)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(249)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(249)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(250)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(251)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(252)),
     },
-    [303] = {
+    [302] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_call_expression, 3)),
@@ -6121,12 +6096,12 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_call_expression, 3)),
     },
-    [304] = {
+    [303] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(306)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(305)),
     },
-    [305] = {
+    [304] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_call_expression, 4)),
@@ -6144,7 +6119,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_call_expression, 4)),
     },
-    [306] = {
+    [305] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_call_expression, 5)),
@@ -6162,55 +6137,55 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_call_expression, 5)),
     },
-    [307] = {
-        [sym__line_break] = ACTIONS(SHIFT(313)),
+    [306] = {
+        [sym__line_break] = ACTIONS(SHIFT(312)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(314)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(315)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(313)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(316)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(317)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(318)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(316)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(319)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(319)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(320)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(321)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(322)),
+        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(313)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(314)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(312)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(315)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(316)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(317)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(315)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(318)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(318)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(319)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(320)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(321)),
+    },
+    [307] = {
+        [sym__line_break] = ACTIONS(REDUCE(sym__expression, 1)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_DOT] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_LT] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym__expression, 1)),
+        [aux_sym_STR_GT] = ACTIONS(REDUCE(sym__expression, 1)),
     },
     [308] = {
-        [sym__line_break] = ACTIONS(REDUCE(sym_expression, 1)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LPAREN] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_STAR] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_DOT] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_SLASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_PLUS] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_DASH] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_LT] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_expression, 1)),
-        [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_expression, 1)),
-    },
-    [309] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_return_statement, 2)),
-        [sym_statement] = ACTIONS(REDUCE(sym_return_statement, 2)),
+        [sym__statement] = ACTIONS(REDUCE(sym_return_statement, 2)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_return_statement, 2)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_return_statement, 2)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_return_statement, 2)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_return_statement, 2)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_return_statement, 2)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_return_statement, 2)),
-        [sym_expression] = ACTIONS(REDUCE(sym_return_statement, 2)),
+        [sym__expression] = ACTIONS(REDUCE(sym_return_statement, 2)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_return_statement, 2)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_return_statement, 2)),
         [sym_math_op] = ACTIONS(REDUCE(sym_return_statement, 2)),
@@ -6231,7 +6206,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_if] = ACTIONS(REDUCE(sym_return_statement, 2)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_return_statement, 2)),
     },
-    [310] = {
+    [309] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym_var_name, 1)),
@@ -6251,21 +6226,21 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_var_name, 1)),
     },
-    [311] = {
-        [sym_expression] = ACTIONS(SHIFT(312)),
-        [sym_call_expression] = ACTIONS(SHIFT(308)),
-        [sym_selector_expression] = ACTIONS(SHIFT(308)),
-        [sym_math_op] = ACTIONS(SHIFT(308)),
-        [sym_bool_op] = ACTIONS(SHIFT(308)),
-        [sym_var_name] = ACTIONS(SHIFT(308)),
+    [310] = {
+        [sym__expression] = ACTIONS(SHIFT(311)),
+        [sym_call_expression] = ACTIONS(SHIFT(307)),
+        [sym_selector_expression] = ACTIONS(SHIFT(307)),
+        [sym_math_op] = ACTIONS(SHIFT(307)),
+        [sym_bool_op] = ACTIONS(SHIFT(307)),
+        [sym_var_name] = ACTIONS(SHIFT(307)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(308)),
-        [sym__identifier] = ACTIONS(SHIFT(310)),
-        [sym_number] = ACTIONS(SHIFT(308)),
+        [sym_string] = ACTIONS(SHIFT(307)),
+        [sym__identifier] = ACTIONS(SHIFT(309)),
+        [sym_number] = ACTIONS(SHIFT(307)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(311)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(310)),
     },
-    [312] = {
+    [311] = {
         [sym__line_break] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
@@ -6285,15 +6260,15 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 2)),
     },
-    [313] = {
+    [312] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_return_statement, 3)),
-        [sym_statement] = ACTIONS(REDUCE(sym_return_statement, 3)),
+        [sym__statement] = ACTIONS(REDUCE(sym_return_statement, 3)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_return_statement, 3)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_return_statement, 3)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_return_statement, 3)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_return_statement, 3)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_return_statement, 3)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_return_statement, 3)),
-        [sym_expression] = ACTIONS(REDUCE(sym_return_statement, 3)),
+        [sym__expression] = ACTIONS(REDUCE(sym_return_statement, 3)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_return_statement, 3)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_return_statement, 3)),
         [sym_math_op] = ACTIONS(REDUCE(sym_return_statement, 3)),
@@ -6329,117 +6304,117 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_return_statement, 3)),
     },
-    [314] = {
-        [sym__line_break] = ACTIONS(SHIFT(336)),
+    [313] = {
+        [sym__line_break] = ACTIONS(SHIFT(335)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(336)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(335)),
+    },
+    [314] = {
+        [sym__expression] = ACTIONS(SHIFT(330)),
+        [sym_call_expression] = ACTIONS(SHIFT(238)),
+        [sym_selector_expression] = ACTIONS(SHIFT(238)),
+        [sym_math_op] = ACTIONS(SHIFT(238)),
+        [sym_bool_op] = ACTIONS(SHIFT(238)),
+        [sym_var_name] = ACTIONS(SHIFT(238)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_string] = ACTIONS(SHIFT(238)),
+        [sym__identifier] = ACTIONS(SHIFT(239)),
+        [sym_number] = ACTIONS(SHIFT(238)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(331)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(241)),
     },
     [315] = {
-        [sym_expression] = ACTIONS(SHIFT(331)),
-        [sym_call_expression] = ACTIONS(SHIFT(239)),
-        [sym_selector_expression] = ACTIONS(SHIFT(239)),
-        [sym_math_op] = ACTIONS(SHIFT(239)),
-        [sym_bool_op] = ACTIONS(SHIFT(239)),
-        [sym_var_name] = ACTIONS(SHIFT(239)),
+        [sym__expression] = ACTIONS(SHIFT(329)),
+        [sym_call_expression] = ACTIONS(SHIFT(307)),
+        [sym_selector_expression] = ACTIONS(SHIFT(307)),
+        [sym_math_op] = ACTIONS(SHIFT(307)),
+        [sym_bool_op] = ACTIONS(SHIFT(307)),
+        [sym_var_name] = ACTIONS(SHIFT(307)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(239)),
-        [sym__identifier] = ACTIONS(SHIFT(240)),
-        [sym_number] = ACTIONS(SHIFT(239)),
+        [sym_string] = ACTIONS(SHIFT(307)),
+        [sym__identifier] = ACTIONS(SHIFT(309)),
+        [sym_number] = ACTIONS(SHIFT(307)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(332)),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(242)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(310)),
     },
     [316] = {
-        [sym_expression] = ACTIONS(SHIFT(330)),
-        [sym_call_expression] = ACTIONS(SHIFT(308)),
-        [sym_selector_expression] = ACTIONS(SHIFT(308)),
-        [sym_math_op] = ACTIONS(SHIFT(308)),
-        [sym_bool_op] = ACTIONS(SHIFT(308)),
-        [sym_var_name] = ACTIONS(SHIFT(308)),
+        [sym__expression] = ACTIONS(SHIFT(327)),
+        [sym_call_expression] = ACTIONS(SHIFT(307)),
+        [sym_selector_expression] = ACTIONS(SHIFT(307)),
+        [sym_math_op] = ACTIONS(SHIFT(307)),
+        [sym_bool_op] = ACTIONS(SHIFT(307)),
+        [sym_var_name] = ACTIONS(SHIFT(307)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(308)),
-        [sym__identifier] = ACTIONS(SHIFT(310)),
-        [sym_number] = ACTIONS(SHIFT(308)),
+        [sym_string] = ACTIONS(SHIFT(307)),
+        [sym__identifier] = ACTIONS(SHIFT(309)),
+        [sym_number] = ACTIONS(SHIFT(307)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(311)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(310)),
     },
     [317] = {
-        [sym_expression] = ACTIONS(SHIFT(328)),
-        [sym_call_expression] = ACTIONS(SHIFT(308)),
-        [sym_selector_expression] = ACTIONS(SHIFT(308)),
-        [sym_math_op] = ACTIONS(SHIFT(308)),
-        [sym_bool_op] = ACTIONS(SHIFT(308)),
-        [sym_var_name] = ACTIONS(SHIFT(308)),
+        [sym_var_name] = ACTIONS(SHIFT(326)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(308)),
-        [sym__identifier] = ACTIONS(SHIFT(310)),
-        [sym_number] = ACTIONS(SHIFT(308)),
+        [sym__identifier] = ACTIONS(SHIFT(309)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(311)),
     },
     [318] = {
-        [sym_var_name] = ACTIONS(SHIFT(327)),
+        [sym__expression] = ACTIONS(SHIFT(325)),
+        [sym_call_expression] = ACTIONS(SHIFT(307)),
+        [sym_selector_expression] = ACTIONS(SHIFT(307)),
+        [sym_math_op] = ACTIONS(SHIFT(307)),
+        [sym_bool_op] = ACTIONS(SHIFT(307)),
+        [sym_var_name] = ACTIONS(SHIFT(307)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(310)),
+        [sym_string] = ACTIONS(SHIFT(307)),
+        [sym__identifier] = ACTIONS(SHIFT(309)),
+        [sym_number] = ACTIONS(SHIFT(307)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(310)),
     },
     [319] = {
-        [sym_expression] = ACTIONS(SHIFT(326)),
-        [sym_call_expression] = ACTIONS(SHIFT(308)),
-        [sym_selector_expression] = ACTIONS(SHIFT(308)),
-        [sym_math_op] = ACTIONS(SHIFT(308)),
-        [sym_bool_op] = ACTIONS(SHIFT(308)),
-        [sym_var_name] = ACTIONS(SHIFT(308)),
+        [sym__expression] = ACTIONS(SHIFT(324)),
+        [sym_call_expression] = ACTIONS(SHIFT(307)),
+        [sym_selector_expression] = ACTIONS(SHIFT(307)),
+        [sym_math_op] = ACTIONS(SHIFT(307)),
+        [sym_bool_op] = ACTIONS(SHIFT(307)),
+        [sym_var_name] = ACTIONS(SHIFT(307)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(308)),
-        [sym__identifier] = ACTIONS(SHIFT(310)),
-        [sym_number] = ACTIONS(SHIFT(308)),
+        [sym_string] = ACTIONS(SHIFT(307)),
+        [sym__identifier] = ACTIONS(SHIFT(309)),
+        [sym_number] = ACTIONS(SHIFT(307)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(311)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(310)),
     },
     [320] = {
-        [sym_expression] = ACTIONS(SHIFT(325)),
-        [sym_call_expression] = ACTIONS(SHIFT(308)),
-        [sym_selector_expression] = ACTIONS(SHIFT(308)),
-        [sym_math_op] = ACTIONS(SHIFT(308)),
-        [sym_bool_op] = ACTIONS(SHIFT(308)),
-        [sym_var_name] = ACTIONS(SHIFT(308)),
+        [sym__expression] = ACTIONS(SHIFT(323)),
+        [sym_call_expression] = ACTIONS(SHIFT(307)),
+        [sym_selector_expression] = ACTIONS(SHIFT(307)),
+        [sym_math_op] = ACTIONS(SHIFT(307)),
+        [sym_bool_op] = ACTIONS(SHIFT(307)),
+        [sym_var_name] = ACTIONS(SHIFT(307)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(308)),
-        [sym__identifier] = ACTIONS(SHIFT(310)),
-        [sym_number] = ACTIONS(SHIFT(308)),
+        [sym_string] = ACTIONS(SHIFT(307)),
+        [sym__identifier] = ACTIONS(SHIFT(309)),
+        [sym_number] = ACTIONS(SHIFT(307)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(311)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(310)),
     },
     [321] = {
-        [sym_expression] = ACTIONS(SHIFT(324)),
-        [sym_call_expression] = ACTIONS(SHIFT(308)),
-        [sym_selector_expression] = ACTIONS(SHIFT(308)),
-        [sym_math_op] = ACTIONS(SHIFT(308)),
-        [sym_bool_op] = ACTIONS(SHIFT(308)),
-        [sym_var_name] = ACTIONS(SHIFT(308)),
+        [sym__expression] = ACTIONS(SHIFT(322)),
+        [sym_call_expression] = ACTIONS(SHIFT(307)),
+        [sym_selector_expression] = ACTIONS(SHIFT(307)),
+        [sym_math_op] = ACTIONS(SHIFT(307)),
+        [sym_bool_op] = ACTIONS(SHIFT(307)),
+        [sym_var_name] = ACTIONS(SHIFT(307)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(308)),
-        [sym__identifier] = ACTIONS(SHIFT(310)),
-        [sym_number] = ACTIONS(SHIFT(308)),
+        [sym_string] = ACTIONS(SHIFT(307)),
+        [sym__identifier] = ACTIONS(SHIFT(309)),
+        [sym_number] = ACTIONS(SHIFT(307)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(311)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(310)),
     },
     [322] = {
-        [sym_expression] = ACTIONS(SHIFT(323)),
-        [sym_call_expression] = ACTIONS(SHIFT(308)),
-        [sym_selector_expression] = ACTIONS(SHIFT(308)),
-        [sym_math_op] = ACTIONS(SHIFT(308)),
-        [sym_bool_op] = ACTIONS(SHIFT(308)),
-        [sym_var_name] = ACTIONS(SHIFT(308)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(308)),
-        [sym__identifier] = ACTIONS(SHIFT(310)),
-        [sym_number] = ACTIONS(SHIFT(308)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(311)),
-    },
-    [323] = {
         [sym__line_break] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
@@ -6459,7 +6434,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
     },
-    [324] = {
+    [323] = {
         [sym__line_break] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
@@ -6473,53 +6448,53 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(322)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(321)),
     },
-    [325] = {
+    [324] = {
         [sym__line_break] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(316)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(315)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_DOT] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(316)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(315)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_bool_op, 3)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(321)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(322)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(320)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(321)),
     },
-    [326] = {
+    [325] = {
         [sym__line_break] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(316)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(315)),
         [aux_sym_STR_COMMA] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_DOT] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(316)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(315)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(321)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(322)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(320)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(321)),
     },
-    [327] = {
+    [326] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_selector_expression, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym_selector_expression, 3)),
@@ -6539,32 +6514,32 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_selector_expression, 3)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_selector_expression, 3)),
     },
-    [328] = {
+    [327] = {
         [sym__line_break] = ACTIONS(REDUCE(aux_sym_return_statement_repeat1, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(329)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(315)),
+        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(328)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(314)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(aux_sym_return_statement_repeat1, 2)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(316)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(317)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(318)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(316)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(319)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(319)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(320)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(321)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(322)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(315)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(316)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(317)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(315)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(318)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(318)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(319)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(320)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(321)),
     },
-    [329] = {
+    [328] = {
         [sym__line_break] = ACTIONS(REDUCE(aux_sym_return_statement_repeat1, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(aux_sym_return_statement_repeat1, 3)),
     },
-    [330] = {
+    [329] = {
         [sym__line_break] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
@@ -6578,33 +6553,33 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_DASH] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_PIPE_PIPE] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
         [aux_sym_STR_AMP_AMP] = ACTIONS(REDUCE_FRAGILE(sym_math_op, 3)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(322)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(322)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(321)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(321)),
     },
-    [331] = {
+    [330] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(333)),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(245)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(334)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(247)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(248)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(249)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(247)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(250)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(250)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(251)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(252)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(253)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(253)),
+        [aux_sym_return_statement_repeat1] = ACTIONS(SHIFT(332)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(244)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(333)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(246)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(247)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(248)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(246)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(249)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(249)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(250)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(251)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(252)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(252)),
     },
-    [332] = {
+    [331] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym_call_expression, 3)),
@@ -6624,12 +6599,12 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_call_expression, 3)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_call_expression, 3)),
     },
-    [333] = {
+    [332] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(335)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(334)),
     },
-    [334] = {
+    [333] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym_call_expression, 4)),
@@ -6649,7 +6624,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_call_expression, 4)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_call_expression, 4)),
     },
-    [335] = {
+    [334] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_return_statement_repeat1] = ACTIONS(REDUCE(sym_call_expression, 5)),
@@ -6669,15 +6644,15 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE(sym_call_expression, 5)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE(sym_call_expression, 5)),
     },
-    [336] = {
+    [335] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_return_statement, 4)),
-        [sym_statement] = ACTIONS(REDUCE(sym_return_statement, 4)),
+        [sym__statement] = ACTIONS(REDUCE(sym_return_statement, 4)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_return_statement, 4)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_return_statement, 4)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_return_statement, 4)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_return_statement, 4)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_return_statement, 4)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_return_statement, 4)),
-        [sym_expression] = ACTIONS(REDUCE(sym_return_statement, 4)),
+        [sym__expression] = ACTIONS(REDUCE(sym_return_statement, 4)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_return_statement, 4)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_return_statement, 4)),
         [sym_math_op] = ACTIONS(REDUCE(sym_return_statement, 4)),
@@ -6698,26 +6673,26 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_if] = ACTIONS(REDUCE(sym_return_statement, 4)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_return_statement, 4)),
     },
-    [337] = {
-        [sym_type_expression] = ACTIONS(SHIFT(339)),
-        [sym_pointer_type] = ACTIONS(SHIFT(340)),
-        [sym_map_type] = ACTIONS(SHIFT(340)),
-        [sym_slice_type] = ACTIONS(SHIFT(340)),
-        [sym_struct_type] = ACTIONS(SHIFT(340)),
-        [sym_interface_type] = ACTIONS(SHIFT(340)),
-        [sym_type_name] = ACTIONS(SHIFT(340)),
+    [336] = {
+        [sym__type_expression] = ACTIONS(SHIFT(338)),
+        [sym_pointer_type] = ACTIONS(SHIFT(339)),
+        [sym_map_type] = ACTIONS(SHIFT(339)),
+        [sym_slice_type] = ACTIONS(SHIFT(339)),
+        [sym_struct_type] = ACTIONS(SHIFT(339)),
+        [sym_interface_type] = ACTIONS(SHIFT(339)),
+        [sym_type_name] = ACTIONS(SHIFT(339)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(341)),
+        [sym__identifier] = ACTIONS(SHIFT(340)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_EQ] = ACTIONS(SHIFT(342)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(343)),
-        [aux_sym_STR_map] = ACTIONS(SHIFT(344)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(345)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(346)),
-        [aux_sym_STR_interface] = ACTIONS(SHIFT(347)),
+        [aux_sym_STR_EQ] = ACTIONS(SHIFT(341)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(342)),
+        [aux_sym_STR_map] = ACTIONS(SHIFT(343)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(344)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(345)),
+        [aux_sym_STR_interface] = ACTIONS(SHIFT(346)),
     },
-    [338] = {
-        [sym_type_expression] = ACTIONS(REDUCE(sym_var_name, 1)),
+    [337] = {
+        [sym__type_expression] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_pointer_type] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_map_type] = ACTIONS(REDUCE(sym_var_name, 1)),
         [sym_slice_type] = ACTIONS(REDUCE(sym_var_name, 1)),
@@ -6734,150 +6709,150 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_var_name, 1)),
         [aux_sym_STR_interface] = ACTIONS(REDUCE(sym_var_name, 1)),
     },
-    [339] = {
-        [sym__line_break] = ACTIONS(SHIFT(365)),
+    [338] = {
+        [sym__line_break] = ACTIONS(SHIFT(364)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(365)),
-        [aux_sym_STR_EQ] = ACTIONS(SHIFT(366)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(364)),
+        [aux_sym_STR_EQ] = ACTIONS(SHIFT(365)),
+    },
+    [339] = {
+        [sym__line_break] = ACTIONS(REDUCE(sym__type_expression, 1)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__type_expression, 1)),
+        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym__type_expression, 1)),
     },
     [340] = {
-        [sym__line_break] = ACTIONS(REDUCE(sym_type_expression, 1)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_type_expression, 1)),
-        [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_type_expression, 1)),
-    },
-    [341] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_type_name, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_type_name, 1)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_type_name, 1)),
     },
-    [342] = {
-        [sym_expression] = ACTIONS(SHIFT(363)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
+    [341] = {
+        [sym__expression] = ACTIONS(SHIFT(362)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
+    },
+    [342] = {
+        [sym__type_expression] = ACTIONS(SHIFT(361)),
+        [sym_pointer_type] = ACTIONS(SHIFT(339)),
+        [sym_map_type] = ACTIONS(SHIFT(339)),
+        [sym_slice_type] = ACTIONS(SHIFT(339)),
+        [sym_struct_type] = ACTIONS(SHIFT(339)),
+        [sym_interface_type] = ACTIONS(SHIFT(339)),
+        [sym_type_name] = ACTIONS(SHIFT(339)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym__identifier] = ACTIONS(SHIFT(340)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(342)),
+        [aux_sym_STR_map] = ACTIONS(SHIFT(343)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(344)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(345)),
+        [aux_sym_STR_interface] = ACTIONS(SHIFT(346)),
     },
     [343] = {
-        [sym_type_expression] = ACTIONS(SHIFT(362)),
-        [sym_pointer_type] = ACTIONS(SHIFT(340)),
-        [sym_map_type] = ACTIONS(SHIFT(340)),
-        [sym_slice_type] = ACTIONS(SHIFT(340)),
-        [sym_struct_type] = ACTIONS(SHIFT(340)),
-        [sym_interface_type] = ACTIONS(SHIFT(340)),
-        [sym_type_name] = ACTIONS(SHIFT(340)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(341)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(343)),
-        [aux_sym_STR_map] = ACTIONS(SHIFT(344)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(345)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(346)),
-        [aux_sym_STR_interface] = ACTIONS(SHIFT(347)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(357)),
     },
     [344] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(358)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(355)),
     },
     [345] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(356)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(351)),
     },
     [346] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(352)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(347)),
     },
     [347] = {
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(348)),
-    },
-    [348] = {
         [sym_var_name] = ACTIONS(SHIFT(57)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym__identifier] = ACTIONS(SHIFT(16)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_interface_type_repeat1] = ACTIONS(SHIFT(349)),
+        [aux_sym_interface_type_repeat1] = ACTIONS(SHIFT(348)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(349)),
+    },
+    [348] = {
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(350)),
     },
     [349] = {
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(351)),
-    },
-    [350] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_interface_type, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_interface_type, 3)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_interface_type, 3)),
     },
-    [351] = {
+    [350] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_interface_type, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_interface_type, 4)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_interface_type, 4)),
     },
-    [352] = {
+    [351] = {
         [sym_var_name] = ACTIONS(SHIFT(112)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym__identifier] = ACTIONS(SHIFT(113)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_struct_type_repeat1] = ACTIONS(SHIFT(353)),
+        [aux_sym_struct_type_repeat1] = ACTIONS(SHIFT(352)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(353)),
+    },
+    [352] = {
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(354)),
     },
     [353] = {
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(355)),
-    },
-    [354] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_struct_type, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_struct_type, 3)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_struct_type, 3)),
     },
-    [355] = {
+    [354] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_struct_type, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_struct_type, 4)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_struct_type, 4)),
     },
-    [356] = {
-        [sym_type_expression] = ACTIONS(SHIFT(357)),
-        [sym_pointer_type] = ACTIONS(SHIFT(340)),
-        [sym_map_type] = ACTIONS(SHIFT(340)),
-        [sym_slice_type] = ACTIONS(SHIFT(340)),
-        [sym_struct_type] = ACTIONS(SHIFT(340)),
-        [sym_interface_type] = ACTIONS(SHIFT(340)),
-        [sym_type_name] = ACTIONS(SHIFT(340)),
+    [355] = {
+        [sym__type_expression] = ACTIONS(SHIFT(356)),
+        [sym_pointer_type] = ACTIONS(SHIFT(339)),
+        [sym_map_type] = ACTIONS(SHIFT(339)),
+        [sym_slice_type] = ACTIONS(SHIFT(339)),
+        [sym_struct_type] = ACTIONS(SHIFT(339)),
+        [sym_interface_type] = ACTIONS(SHIFT(339)),
+        [sym_type_name] = ACTIONS(SHIFT(339)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(341)),
+        [sym__identifier] = ACTIONS(SHIFT(340)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(343)),
-        [aux_sym_STR_map] = ACTIONS(SHIFT(344)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(345)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(346)),
-        [aux_sym_STR_interface] = ACTIONS(SHIFT(347)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(342)),
+        [aux_sym_STR_map] = ACTIONS(SHIFT(343)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(344)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(345)),
+        [aux_sym_STR_interface] = ACTIONS(SHIFT(346)),
     },
-    [357] = {
+    [356] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_slice_type, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_slice_type, 3)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_slice_type, 3)),
     },
-    [358] = {
-        [sym_type_expression] = ACTIONS(SHIFT(359)),
+    [357] = {
+        [sym__type_expression] = ACTIONS(SHIFT(358)),
         [sym_pointer_type] = ACTIONS(SHIFT(137)),
         [sym_map_type] = ACTIONS(SHIFT(137)),
         [sym_slice_type] = ACTIONS(SHIFT(137)),
@@ -6893,67 +6868,67 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_struct] = ACTIONS(SHIFT(142)),
         [aux_sym_STR_interface] = ACTIONS(SHIFT(143)),
     },
-    [359] = {
+    [358] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(360)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(359)),
+    },
+    [359] = {
+        [sym__type_expression] = ACTIONS(SHIFT(360)),
+        [sym_pointer_type] = ACTIONS(SHIFT(339)),
+        [sym_map_type] = ACTIONS(SHIFT(339)),
+        [sym_slice_type] = ACTIONS(SHIFT(339)),
+        [sym_struct_type] = ACTIONS(SHIFT(339)),
+        [sym_interface_type] = ACTIONS(SHIFT(339)),
+        [sym_type_name] = ACTIONS(SHIFT(339)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym__identifier] = ACTIONS(SHIFT(340)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(342)),
+        [aux_sym_STR_map] = ACTIONS(SHIFT(343)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(344)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(345)),
+        [aux_sym_STR_interface] = ACTIONS(SHIFT(346)),
     },
     [360] = {
-        [sym_type_expression] = ACTIONS(SHIFT(361)),
-        [sym_pointer_type] = ACTIONS(SHIFT(340)),
-        [sym_map_type] = ACTIONS(SHIFT(340)),
-        [sym_slice_type] = ACTIONS(SHIFT(340)),
-        [sym_struct_type] = ACTIONS(SHIFT(340)),
-        [sym_interface_type] = ACTIONS(SHIFT(340)),
-        [sym_type_name] = ACTIONS(SHIFT(340)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(341)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(343)),
-        [aux_sym_STR_map] = ACTIONS(SHIFT(344)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(345)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(346)),
-        [aux_sym_STR_interface] = ACTIONS(SHIFT(347)),
-    },
-    [361] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_map_type, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_map_type, 5)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_map_type, 5)),
     },
-    [362] = {
+    [361] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_pointer_type, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_pointer_type, 2)),
         [aux_sym_STR_EQ] = ACTIONS(REDUCE(sym_pointer_type, 2)),
     },
-    [363] = {
-        [sym__line_break] = ACTIONS(SHIFT(364)),
+    [362] = {
+        [sym__line_break] = ACTIONS(SHIFT(363)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(289)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(364)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(291)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(293)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(294)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(295)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(288)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(363)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(290)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(292)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(293)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(294)),
     },
-    [364] = {
+    [363] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_var_declaration, 5)),
-        [sym_statement] = ACTIONS(REDUCE(sym_var_declaration, 5)),
+        [sym__statement] = ACTIONS(REDUCE(sym_var_declaration, 5)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_var_declaration, 5)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_var_declaration, 5)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_var_declaration, 5)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_var_declaration, 5)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_var_declaration, 5)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_var_declaration, 5)),
-        [sym_expression] = ACTIONS(REDUCE(sym_var_declaration, 5)),
+        [sym__expression] = ACTIONS(REDUCE(sym_var_declaration, 5)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_var_declaration, 5)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_var_declaration, 5)),
         [sym_math_op] = ACTIONS(REDUCE(sym_var_declaration, 5)),
@@ -6987,15 +6962,15 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_var_declaration, 5)),
     },
-    [365] = {
+    [364] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_var_declaration, 4)),
-        [sym_statement] = ACTIONS(REDUCE(sym_var_declaration, 4)),
+        [sym__statement] = ACTIONS(REDUCE(sym_var_declaration, 4)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_var_declaration, 4)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_var_declaration, 4)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_var_declaration, 4)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_var_declaration, 4)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_var_declaration, 4)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_var_declaration, 4)),
-        [sym_expression] = ACTIONS(REDUCE(sym_var_declaration, 4)),
+        [sym__expression] = ACTIONS(REDUCE(sym_var_declaration, 4)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_var_declaration, 4)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_var_declaration, 4)),
         [sym_math_op] = ACTIONS(REDUCE(sym_var_declaration, 4)),
@@ -7017,47 +6992,47 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_if] = ACTIONS(REDUCE(sym_var_declaration, 4)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_var_declaration, 4)),
     },
-    [366] = {
-        [sym_expression] = ACTIONS(SHIFT(367)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
+    [365] = {
+        [sym__expression] = ACTIONS(SHIFT(366)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
+    },
+    [366] = {
+        [sym__line_break] = ACTIONS(SHIFT(367)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(288)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(367)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(290)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(292)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(293)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(294)),
     },
     [367] = {
-        [sym__line_break] = ACTIONS(SHIFT(368)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(289)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(368)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(291)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(293)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(294)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(295)),
-    },
-    [368] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_var_declaration, 6)),
-        [sym_statement] = ACTIONS(REDUCE(sym_var_declaration, 6)),
+        [sym__statement] = ACTIONS(REDUCE(sym_var_declaration, 6)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_var_declaration, 6)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_var_declaration, 6)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_var_declaration, 6)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_var_declaration, 6)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_var_declaration, 6)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_var_declaration, 6)),
-        [sym_expression] = ACTIONS(REDUCE(sym_var_declaration, 6)),
+        [sym__expression] = ACTIONS(REDUCE(sym_var_declaration, 6)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_var_declaration, 6)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_var_declaration, 6)),
         [sym_math_op] = ACTIONS(REDUCE(sym_var_declaration, 6)),
@@ -7091,83 +7066,83 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_var_declaration, 6)),
     },
-    [369] = {
+    [368] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_block_statement, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_block_statement, 3)),
     },
-    [370] = {
+    [369] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(378)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(SHIFT(377)),
+    },
+    [370] = {
+        [sym_var_name] = ACTIONS(SHIFT(374)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym__identifier] = ACTIONS(SHIFT(375)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
     [371] = {
-        [sym_var_name] = ACTIONS(SHIFT(375)),
+        [sym__expression] = ACTIONS(SHIFT(372)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(376)),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
     },
     [372] = {
-        [sym_expression] = ACTIONS(SHIFT(373)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym__line_break] = ACTIONS(SHIFT(373)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(288)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(373)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(290)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(292)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(293)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(294)),
     },
     [373] = {
-        [sym__line_break] = ACTIONS(SHIFT(374)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(289)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(374)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(291)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(293)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(294)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(295)),
-    },
-    [374] = {
-        [sym_var_declaration] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_statement] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_return_statement] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_range_statement] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_if_statement] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_expression_statement] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_expression] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_call_expression] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_selector_expression] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_math_op] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_bool_op] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_var_name] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
+        [sym_var_declaration] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym__statement] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym_return_statement] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym_range_statement] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym_if_statement] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym_expression_statement] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym__expression] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym_call_expression] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym_selector_expression] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym_math_op] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym_bool_op] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym_var_name] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym__identifier] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [sym_number] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
+        [sym_string] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym__identifier] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [sym_number] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_block_statement_repeat1] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
+        [aux_sym_block_statement_repeat1] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
-        [aux_sym_STR_var] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
+        [aux_sym_STR_var] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
-        [aux_sym_STR_return] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [aux_sym_STR_for] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
-        [aux_sym_STR_if] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
+        [aux_sym_STR_return] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [aux_sym_STR_for] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+        [aux_sym_STR_if] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
         [aux_sym_STR_DOT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_SLASH] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
@@ -7179,88 +7154,88 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_LT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
-        [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_declaration_statement, 4)),
+        [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_short_var_declaration, 4)),
+    },
+    [374] = {
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_short_var_declaration_repeat1] = ACTIONS(SHIFT(376)),
+        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(370)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 2)),
     },
     [375] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_statement_repeat1] = ACTIONS(SHIFT(377)),
-        [aux_sym_STR_COMMA] = ACTIONS(SHIFT(371)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 2)),
+        [aux_sym_short_var_declaration_repeat1] = ACTIONS(REDUCE(sym_var_name, 1)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_var_name, 1)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_var_name, 1)),
     },
     [376] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_declaration_statement_repeat1] = ACTIONS(REDUCE(sym_var_name, 1)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_var_name, 1)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_var_name, 1)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(aux_sym_short_var_declaration_repeat1, 3)),
     },
     [377] = {
+        [sym__expression] = ACTIONS(SHIFT(378)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(aux_sym_declaration_statement_repeat1, 3)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
     },
     [378] = {
-        [sym_expression] = ACTIONS(SHIFT(379)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym__line_break] = ACTIONS(SHIFT(379)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(288)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(379)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(290)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(292)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(293)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(294)),
     },
     [379] = {
-        [sym__line_break] = ACTIONS(SHIFT(380)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(289)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(380)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(291)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(293)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(294)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(295)),
-    },
-    [380] = {
-        [sym_var_declaration] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_statement] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_return_statement] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_range_statement] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_if_statement] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_expression_statement] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_expression] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_call_expression] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_selector_expression] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_math_op] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_bool_op] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_var_name] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
+        [sym_var_declaration] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym__statement] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym_return_statement] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym_range_statement] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym_if_statement] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym_expression_statement] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym__expression] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym_call_expression] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym_selector_expression] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym_math_op] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym_bool_op] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym_var_name] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym__identifier] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [sym_number] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
+        [sym_string] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym__identifier] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [sym_number] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_block_statement_repeat1] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
+        [aux_sym_block_statement_repeat1] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
         [aux_sym_STR_LPAREN] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
-        [aux_sym_STR_var] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
+        [aux_sym_STR_var] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
         [aux_sym_STR_STAR] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
-        [aux_sym_STR_return] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [aux_sym_STR_for] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
-        [aux_sym_STR_if] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
+        [aux_sym_STR_return] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [aux_sym_STR_COLON_EQ] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [aux_sym_STR_for] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
+        [aux_sym_STR_if] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
         [aux_sym_STR_DOT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_SLASH] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_PLUS] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
@@ -7272,17 +7247,17 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_LT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
-        [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_declaration_statement, 5)),
+        [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_short_var_declaration, 5)),
     },
-    [381] = {
+    [380] = {
         [sym_var_declaration] = ACTIONS(REDUCE(sym_expression_statement, 2)),
-        [sym_statement] = ACTIONS(REDUCE(sym_expression_statement, 2)),
+        [sym__statement] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_return_statement] = ACTIONS(REDUCE(sym_expression_statement, 2)),
-        [sym_declaration_statement] = ACTIONS(REDUCE(sym_expression_statement, 2)),
+        [sym_short_var_declaration] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_range_statement] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_if_statement] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_expression_statement] = ACTIONS(REDUCE(sym_expression_statement, 2)),
-        [sym_expression] = ACTIONS(REDUCE(sym_expression_statement, 2)),
+        [sym__expression] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_call_expression] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_selector_expression] = ACTIONS(REDUCE(sym_expression_statement, 2)),
         [sym_math_op] = ACTIONS(REDUCE(sym_expression_statement, 2)),
@@ -7316,13 +7291,13 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_BANG] = ACTIONS(REDUCE(sym_expression_statement, 2)),
     },
-    [382] = {
+    [381] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(aux_sym_block_statement_repeat1, 2)),
     },
-    [383] = {
-        [sym_declaration] = ACTIONS(REDUCE(sym_func_declaration, 5)),
+    [382] = {
+        [sym__declaration] = ACTIONS(REDUCE(sym_func_declaration, 5)),
         [sym_type_declaration] = ACTIONS(REDUCE(sym_func_declaration, 5)),
         [sym_var_declaration] = ACTIONS(REDUCE(sym_func_declaration, 5)),
         [sym_func_declaration] = ACTIONS(REDUCE(sym_func_declaration, 5)),
@@ -7335,64 +7310,64 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_var] = ACTIONS(REDUCE(sym_func_declaration, 5)),
         [aux_sym_STR_func] = ACTIONS(REDUCE(sym_func_declaration, 5)),
     },
+    [383] = {
+        [sym__type_expression] = ACTIONS(SHIFT(384)),
+        [sym_pointer_type] = ACTIONS(SHIFT(339)),
+        [sym_map_type] = ACTIONS(SHIFT(339)),
+        [sym_slice_type] = ACTIONS(SHIFT(339)),
+        [sym_struct_type] = ACTIONS(SHIFT(339)),
+        [sym_interface_type] = ACTIONS(SHIFT(339)),
+        [sym_type_name] = ACTIONS(SHIFT(339)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym__identifier] = ACTIONS(SHIFT(340)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_EQ] = ACTIONS(SHIFT(385)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(342)),
+        [aux_sym_STR_map] = ACTIONS(SHIFT(343)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(344)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(345)),
+        [aux_sym_STR_interface] = ACTIONS(SHIFT(346)),
+    },
     [384] = {
-        [sym_type_expression] = ACTIONS(SHIFT(385)),
-        [sym_pointer_type] = ACTIONS(SHIFT(340)),
-        [sym_map_type] = ACTIONS(SHIFT(340)),
-        [sym_slice_type] = ACTIONS(SHIFT(340)),
-        [sym_struct_type] = ACTIONS(SHIFT(340)),
-        [sym_interface_type] = ACTIONS(SHIFT(340)),
-        [sym_type_name] = ACTIONS(SHIFT(340)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(341)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_EQ] = ACTIONS(SHIFT(386)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(343)),
-        [aux_sym_STR_map] = ACTIONS(SHIFT(344)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(345)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(346)),
-        [aux_sym_STR_interface] = ACTIONS(SHIFT(347)),
-    },
-    [385] = {
-        [sym__line_break] = ACTIONS(SHIFT(389)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(389)),
-        [aux_sym_STR_EQ] = ACTIONS(SHIFT(390)),
-    },
-    [386] = {
-        [sym_expression] = ACTIONS(SHIFT(387)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
-    },
-    [387] = {
         [sym__line_break] = ACTIONS(SHIFT(388)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(289)),
         [aux_sym_STR_SEMI] = ACTIONS(SHIFT(388)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(291)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(293)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(294)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(295)),
+        [aux_sym_STR_EQ] = ACTIONS(SHIFT(389)),
     },
-    [388] = {
-        [sym_declaration] = ACTIONS(REDUCE(sym_var_declaration, 5)),
+    [385] = {
+        [sym__expression] = ACTIONS(SHIFT(386)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
+    },
+    [386] = {
+        [sym__line_break] = ACTIONS(SHIFT(387)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(288)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(387)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(290)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(292)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(293)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(294)),
+    },
+    [387] = {
+        [sym__declaration] = ACTIONS(REDUCE(sym_var_declaration, 5)),
         [sym_type_declaration] = ACTIONS(REDUCE(sym_var_declaration, 5)),
         [sym_var_declaration] = ACTIONS(REDUCE(sym_var_declaration, 5)),
         [sym_func_declaration] = ACTIONS(REDUCE(sym_var_declaration, 5)),
@@ -7418,8 +7393,8 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
     },
-    [389] = {
-        [sym_declaration] = ACTIONS(REDUCE(sym_var_declaration, 4)),
+    [388] = {
+        [sym__declaration] = ACTIONS(REDUCE(sym_var_declaration, 4)),
         [sym_type_declaration] = ACTIONS(REDUCE(sym_var_declaration, 4)),
         [sym_var_declaration] = ACTIONS(REDUCE(sym_var_declaration, 4)),
         [sym_func_declaration] = ACTIONS(REDUCE(sym_var_declaration, 4)),
@@ -7433,40 +7408,40 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_EQ] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_func] = ACTIONS(REDUCE(sym_var_declaration, 4)),
     },
-    [390] = {
-        [sym_expression] = ACTIONS(SHIFT(391)),
-        [sym_call_expression] = ACTIONS(SHIFT(202)),
-        [sym_selector_expression] = ACTIONS(SHIFT(202)),
-        [sym_math_op] = ACTIONS(SHIFT(202)),
-        [sym_bool_op] = ACTIONS(SHIFT(202)),
-        [sym_var_name] = ACTIONS(SHIFT(202)),
+    [389] = {
+        [sym__expression] = ACTIONS(SHIFT(390)),
+        [sym_call_expression] = ACTIONS(SHIFT(201)),
+        [sym_selector_expression] = ACTIONS(SHIFT(201)),
+        [sym_math_op] = ACTIONS(SHIFT(201)),
+        [sym_bool_op] = ACTIONS(SHIFT(201)),
+        [sym_var_name] = ACTIONS(SHIFT(201)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(202)),
-        [sym__identifier] = ACTIONS(SHIFT(214)),
-        [sym_number] = ACTIONS(SHIFT(202)),
+        [sym_string] = ACTIONS(SHIFT(201)),
+        [sym__identifier] = ACTIONS(SHIFT(213)),
+        [sym_number] = ACTIONS(SHIFT(201)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_BANG] = ACTIONS(SHIFT(212)),
+        [aux_sym_STR_BANG] = ACTIONS(SHIFT(211)),
+    },
+    [390] = {
+        [sym__line_break] = ACTIONS(SHIFT(391)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(288)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(391)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_DOT] = ACTIONS(SHIFT(290)),
+        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(289)),
+        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_DASH] = ACTIONS(SHIFT(291)),
+        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(292)),
+        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(293)),
+        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_LT] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(294)),
+        [aux_sym_STR_GT] = ACTIONS(SHIFT(294)),
     },
     [391] = {
-        [sym__line_break] = ACTIONS(SHIFT(392)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LPAREN] = ACTIONS(SHIFT(289)),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(392)),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_DOT] = ACTIONS(SHIFT(291)),
-        [aux_sym_STR_SLASH] = ACTIONS(SHIFT(290)),
-        [aux_sym_STR_PLUS] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_DASH] = ACTIONS(SHIFT(292)),
-        [aux_sym_STR_PIPE_PIPE] = ACTIONS(SHIFT(293)),
-        [aux_sym_STR_AMP_AMP] = ACTIONS(SHIFT(294)),
-        [aux_sym_STR_EQ_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_LT] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT_EQ] = ACTIONS(SHIFT(295)),
-        [aux_sym_STR_GT] = ACTIONS(SHIFT(295)),
-    },
-    [392] = {
-        [sym_declaration] = ACTIONS(REDUCE(sym_var_declaration, 6)),
+        [sym__declaration] = ACTIONS(REDUCE(sym_var_declaration, 6)),
         [sym_type_declaration] = ACTIONS(REDUCE(sym_var_declaration, 6)),
         [sym_var_declaration] = ACTIONS(REDUCE(sym_var_declaration, 6)),
         [sym_func_declaration] = ACTIONS(REDUCE(sym_var_declaration, 6)),
@@ -7492,25 +7467,25 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_GT_EQ] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
         [aux_sym_STR_GT] = ACTIONS(REDUCE_EXTRA(sym__line_break)),
     },
-    [393] = {
-        [sym_type_expression] = ACTIONS(SHIFT(395)),
-        [sym_pointer_type] = ACTIONS(SHIFT(396)),
-        [sym_map_type] = ACTIONS(SHIFT(396)),
-        [sym_slice_type] = ACTIONS(SHIFT(396)),
-        [sym_struct_type] = ACTIONS(SHIFT(396)),
-        [sym_interface_type] = ACTIONS(SHIFT(396)),
-        [sym_type_name] = ACTIONS(SHIFT(396)),
+    [392] = {
+        [sym__type_expression] = ACTIONS(SHIFT(394)),
+        [sym_pointer_type] = ACTIONS(SHIFT(395)),
+        [sym_map_type] = ACTIONS(SHIFT(395)),
+        [sym_slice_type] = ACTIONS(SHIFT(395)),
+        [sym_struct_type] = ACTIONS(SHIFT(395)),
+        [sym_interface_type] = ACTIONS(SHIFT(395)),
+        [sym_type_name] = ACTIONS(SHIFT(395)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(397)),
+        [sym__identifier] = ACTIONS(SHIFT(396)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(398)),
-        [aux_sym_STR_map] = ACTIONS(SHIFT(399)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(400)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(401)),
-        [aux_sym_STR_interface] = ACTIONS(SHIFT(402)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(397)),
+        [aux_sym_STR_map] = ACTIONS(SHIFT(398)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(399)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(400)),
+        [aux_sym_STR_interface] = ACTIONS(SHIFT(401)),
     },
-    [394] = {
-        [sym_type_expression] = ACTIONS(REDUCE(sym_type_name, 1)),
+    [393] = {
+        [sym__type_expression] = ACTIONS(REDUCE(sym_type_name, 1)),
         [sym_pointer_type] = ACTIONS(REDUCE(sym_type_name, 1)),
         [sym_map_type] = ACTIONS(REDUCE(sym_type_name, 1)),
         [sym_slice_type] = ACTIONS(REDUCE(sym_type_name, 1)),
@@ -7526,128 +7501,128 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_struct] = ACTIONS(REDUCE(sym_type_name, 1)),
         [aux_sym_STR_interface] = ACTIONS(REDUCE(sym_type_name, 1)),
     },
-    [395] = {
-        [sym__line_break] = ACTIONS(SHIFT(418)),
+    [394] = {
+        [sym__line_break] = ACTIONS(SHIFT(417)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(418)),
+        [aux_sym_STR_SEMI] = ACTIONS(SHIFT(417)),
+    },
+    [395] = {
+        [sym__line_break] = ACTIONS(REDUCE(sym__type_expression, 1)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym__type_expression, 1)),
     },
     [396] = {
-        [sym__line_break] = ACTIONS(REDUCE(sym_type_expression, 1)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_type_expression, 1)),
-    },
-    [397] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_type_name, 1)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_type_name, 1)),
     },
-    [398] = {
-        [sym_type_expression] = ACTIONS(SHIFT(417)),
-        [sym_pointer_type] = ACTIONS(SHIFT(396)),
-        [sym_map_type] = ACTIONS(SHIFT(396)),
-        [sym_slice_type] = ACTIONS(SHIFT(396)),
-        [sym_struct_type] = ACTIONS(SHIFT(396)),
-        [sym_interface_type] = ACTIONS(SHIFT(396)),
-        [sym_type_name] = ACTIONS(SHIFT(396)),
+    [397] = {
+        [sym__type_expression] = ACTIONS(SHIFT(416)),
+        [sym_pointer_type] = ACTIONS(SHIFT(395)),
+        [sym_map_type] = ACTIONS(SHIFT(395)),
+        [sym_slice_type] = ACTIONS(SHIFT(395)),
+        [sym_struct_type] = ACTIONS(SHIFT(395)),
+        [sym_interface_type] = ACTIONS(SHIFT(395)),
+        [sym_type_name] = ACTIONS(SHIFT(395)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(397)),
+        [sym__identifier] = ACTIONS(SHIFT(396)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(398)),
-        [aux_sym_STR_map] = ACTIONS(SHIFT(399)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(400)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(401)),
-        [aux_sym_STR_interface] = ACTIONS(SHIFT(402)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(397)),
+        [aux_sym_STR_map] = ACTIONS(SHIFT(398)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(399)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(400)),
+        [aux_sym_STR_interface] = ACTIONS(SHIFT(401)),
+    },
+    [398] = {
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(412)),
     },
     [399] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(413)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(410)),
     },
     [400] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(411)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(406)),
     },
     [401] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(407)),
+        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(402)),
     },
     [402] = {
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_LBRACE] = ACTIONS(SHIFT(403)),
-    },
-    [403] = {
         [sym_var_name] = ACTIONS(SHIFT(57)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym__identifier] = ACTIONS(SHIFT(16)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_interface_type_repeat1] = ACTIONS(SHIFT(404)),
+        [aux_sym_interface_type_repeat1] = ACTIONS(SHIFT(403)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(404)),
+    },
+    [403] = {
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(405)),
     },
     [404] = {
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(406)),
-    },
-    [405] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_interface_type, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_interface_type, 3)),
     },
-    [406] = {
+    [405] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_interface_type, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_interface_type, 4)),
     },
-    [407] = {
+    [406] = {
         [sym_var_name] = ACTIONS(SHIFT(112)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym__identifier] = ACTIONS(SHIFT(113)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_struct_type_repeat1] = ACTIONS(SHIFT(408)),
+        [aux_sym_struct_type_repeat1] = ACTIONS(SHIFT(407)),
+        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(408)),
+    },
+    [407] = {
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(409)),
     },
     [408] = {
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(410)),
-    },
-    [409] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_struct_type, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_struct_type, 3)),
     },
-    [410] = {
+    [409] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_struct_type, 4)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_struct_type, 4)),
     },
-    [411] = {
-        [sym_type_expression] = ACTIONS(SHIFT(412)),
-        [sym_pointer_type] = ACTIONS(SHIFT(396)),
-        [sym_map_type] = ACTIONS(SHIFT(396)),
-        [sym_slice_type] = ACTIONS(SHIFT(396)),
-        [sym_struct_type] = ACTIONS(SHIFT(396)),
-        [sym_interface_type] = ACTIONS(SHIFT(396)),
-        [sym_type_name] = ACTIONS(SHIFT(396)),
+    [410] = {
+        [sym__type_expression] = ACTIONS(SHIFT(411)),
+        [sym_pointer_type] = ACTIONS(SHIFT(395)),
+        [sym_map_type] = ACTIONS(SHIFT(395)),
+        [sym_slice_type] = ACTIONS(SHIFT(395)),
+        [sym_struct_type] = ACTIONS(SHIFT(395)),
+        [sym_interface_type] = ACTIONS(SHIFT(395)),
+        [sym_type_name] = ACTIONS(SHIFT(395)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(397)),
+        [sym__identifier] = ACTIONS(SHIFT(396)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(398)),
-        [aux_sym_STR_map] = ACTIONS(SHIFT(399)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(400)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(401)),
-        [aux_sym_STR_interface] = ACTIONS(SHIFT(402)),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(397)),
+        [aux_sym_STR_map] = ACTIONS(SHIFT(398)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(399)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(400)),
+        [aux_sym_STR_interface] = ACTIONS(SHIFT(401)),
     },
-    [412] = {
+    [411] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_slice_type, 3)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_slice_type, 3)),
     },
-    [413] = {
-        [sym_type_expression] = ACTIONS(SHIFT(414)),
+    [412] = {
+        [sym__type_expression] = ACTIONS(SHIFT(413)),
         [sym_pointer_type] = ACTIONS(SHIFT(137)),
         [sym_map_type] = ACTIONS(SHIFT(137)),
         [sym_slice_type] = ACTIONS(SHIFT(137)),
@@ -7663,40 +7638,40 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_struct] = ACTIONS(SHIFT(142)),
         [aux_sym_STR_interface] = ACTIONS(SHIFT(143)),
     },
-    [414] = {
+    [413] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(415)),
+        [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(414)),
+    },
+    [414] = {
+        [sym__type_expression] = ACTIONS(SHIFT(415)),
+        [sym_pointer_type] = ACTIONS(SHIFT(395)),
+        [sym_map_type] = ACTIONS(SHIFT(395)),
+        [sym_slice_type] = ACTIONS(SHIFT(395)),
+        [sym_struct_type] = ACTIONS(SHIFT(395)),
+        [sym_interface_type] = ACTIONS(SHIFT(395)),
+        [sym_type_name] = ACTIONS(SHIFT(395)),
+        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
+        [sym__identifier] = ACTIONS(SHIFT(396)),
+        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
+        [aux_sym_STR_STAR] = ACTIONS(SHIFT(397)),
+        [aux_sym_STR_map] = ACTIONS(SHIFT(398)),
+        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(399)),
+        [aux_sym_STR_struct] = ACTIONS(SHIFT(400)),
+        [aux_sym_STR_interface] = ACTIONS(SHIFT(401)),
     },
     [415] = {
-        [sym_type_expression] = ACTIONS(SHIFT(416)),
-        [sym_pointer_type] = ACTIONS(SHIFT(396)),
-        [sym_map_type] = ACTIONS(SHIFT(396)),
-        [sym_slice_type] = ACTIONS(SHIFT(396)),
-        [sym_struct_type] = ACTIONS(SHIFT(396)),
-        [sym_interface_type] = ACTIONS(SHIFT(396)),
-        [sym_type_name] = ACTIONS(SHIFT(396)),
-        [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym__identifier] = ACTIONS(SHIFT(397)),
-        [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_STAR] = ACTIONS(SHIFT(398)),
-        [aux_sym_STR_map] = ACTIONS(SHIFT(399)),
-        [aux_sym_STR_LBRACK] = ACTIONS(SHIFT(400)),
-        [aux_sym_STR_struct] = ACTIONS(SHIFT(401)),
-        [aux_sym_STR_interface] = ACTIONS(SHIFT(402)),
-    },
-    [416] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_map_type, 5)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_map_type, 5)),
     },
-    [417] = {
+    [416] = {
         [sym__line_break] = ACTIONS(REDUCE(sym_pointer_type, 2)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_SEMI] = ACTIONS(REDUCE(sym_pointer_type, 2)),
     },
-    [418] = {
-        [sym_declaration] = ACTIONS(REDUCE(sym_type_declaration, 4)),
+    [417] = {
+        [sym__declaration] = ACTIONS(REDUCE(sym_type_declaration, 4)),
         [sym_type_declaration] = ACTIONS(REDUCE(sym_type_declaration, 4)),
         [sym_var_declaration] = ACTIONS(REDUCE(sym_type_declaration, 4)),
         [sym_func_declaration] = ACTIONS(REDUCE(sym_type_declaration, 4)),
@@ -7709,9 +7684,9 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_var] = ACTIONS(REDUCE(sym_type_declaration, 4)),
         [aux_sym_STR_func] = ACTIONS(REDUCE(sym_type_declaration, 4)),
     },
-    [419] = {
+    [418] = {
         [sym_imports_block] = ACTIONS(REDUCE(sym_imports_block, 2)),
-        [sym_declaration] = ACTIONS(REDUCE(sym_imports_block, 2)),
+        [sym__declaration] = ACTIONS(REDUCE(sym_imports_block, 2)),
         [sym_type_declaration] = ACTIONS(REDUCE(sym_imports_block, 2)),
         [sym_var_declaration] = ACTIONS(REDUCE(sym_imports_block, 2)),
         [sym_func_declaration] = ACTIONS(REDUCE(sym_imports_block, 2)),
@@ -7725,9 +7700,9 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_var] = ACTIONS(REDUCE(sym_imports_block, 2)),
         [aux_sym_STR_func] = ACTIONS(REDUCE(sym_imports_block, 2)),
     },
-    [420] = {
+    [419] = {
         [sym_imports_block] = ACTIONS(REDUCE(sym_package_import, 1)),
-        [sym_declaration] = ACTIONS(REDUCE(sym_package_import, 1)),
+        [sym__declaration] = ACTIONS(REDUCE(sym_package_import, 1)),
         [sym_type_declaration] = ACTIONS(REDUCE(sym_package_import, 1)),
         [sym_var_declaration] = ACTIONS(REDUCE(sym_package_import, 1)),
         [sym_func_declaration] = ACTIONS(REDUCE(sym_package_import, 1)),
@@ -7741,29 +7716,29 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_var] = ACTIONS(REDUCE(sym_package_import, 1)),
         [aux_sym_STR_func] = ACTIONS(REDUCE(sym_package_import, 1)),
     },
-    [421] = {
-        [sym_package_import] = ACTIONS(SHIFT(422)),
-        [ts_builtin_sym_error] = ACTIONS(SHIFT(423)),
+    [420] = {
+        [sym_package_import] = ACTIONS(SHIFT(421)),
+        [ts_builtin_sym_error] = ACTIONS(SHIFT(422)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(424)),
+        [sym_string] = ACTIONS(SHIFT(423)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_imports_block_repeat1] = ACTIONS(SHIFT(423)),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(425)),
+        [aux_sym_imports_block_repeat1] = ACTIONS(SHIFT(422)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(424)),
     },
-    [422] = {
-        [sym_package_import] = ACTIONS(SHIFT(422)),
+    [421] = {
+        [sym_package_import] = ACTIONS(SHIFT(421)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
-        [sym_string] = ACTIONS(SHIFT(424)),
+        [sym_string] = ACTIONS(SHIFT(423)),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_imports_block_repeat1] = ACTIONS(SHIFT(427)),
+        [aux_sym_imports_block_repeat1] = ACTIONS(SHIFT(426)),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(aux_sym_imports_block_repeat1, 1)),
     },
-    [423] = {
+    [422] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
-        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(426)),
+        [aux_sym_STR_RPAREN] = ACTIONS(SHIFT(425)),
     },
-    [424] = {
+    [423] = {
         [sym_package_import] = ACTIONS(REDUCE(sym_package_import, 1)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_string] = ACTIONS(REDUCE(sym_package_import, 1)),
@@ -7771,9 +7746,9 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_imports_block_repeat1] = ACTIONS(REDUCE(sym_package_import, 1)),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(sym_package_import, 1)),
     },
-    [425] = {
+    [424] = {
         [sym_imports_block] = ACTIONS(REDUCE(sym_imports_block, 3)),
-        [sym_declaration] = ACTIONS(REDUCE(sym_imports_block, 3)),
+        [sym__declaration] = ACTIONS(REDUCE(sym_imports_block, 3)),
         [sym_type_declaration] = ACTIONS(REDUCE(sym_imports_block, 3)),
         [sym_var_declaration] = ACTIONS(REDUCE(sym_imports_block, 3)),
         [sym_func_declaration] = ACTIONS(REDUCE(sym_imports_block, 3)),
@@ -7787,9 +7762,9 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_var] = ACTIONS(REDUCE(sym_imports_block, 3)),
         [aux_sym_STR_func] = ACTIONS(REDUCE(sym_imports_block, 3)),
     },
-    [426] = {
+    [425] = {
         [sym_imports_block] = ACTIONS(REDUCE(sym_imports_block, 4)),
-        [sym_declaration] = ACTIONS(REDUCE(sym_imports_block, 4)),
+        [sym__declaration] = ACTIONS(REDUCE(sym_imports_block, 4)),
         [sym_type_declaration] = ACTIONS(REDUCE(sym_imports_block, 4)),
         [sym_var_declaration] = ACTIONS(REDUCE(sym_imports_block, 4)),
         [sym_func_declaration] = ACTIONS(REDUCE(sym_imports_block, 4)),
@@ -7803,23 +7778,23 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_var] = ACTIONS(REDUCE(sym_imports_block, 4)),
         [aux_sym_STR_func] = ACTIONS(REDUCE(sym_imports_block, 4)),
     },
-    [427] = {
+    [426] = {
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
         [aux_sym_STR_RPAREN] = ACTIONS(REDUCE(aux_sym_imports_block_repeat1, 2)),
     },
-    [428] = {
+    [427] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_program, 3)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
-    [429] = {
+    [428] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE(aux_sym_program_repeat2, 2)),
         [sym__line_break] = ACTIONS(SHIFT_EXTRA()),
         [sym_comment] = ACTIONS(SHIFT_EXTRA()),
     },
-    [430] = {
-        [sym_declaration] = ACTIONS(REDUCE(aux_sym_program_repeat1, 2)),
+    [429] = {
+        [sym__declaration] = ACTIONS(REDUCE(aux_sym_program_repeat1, 2)),
         [sym_type_declaration] = ACTIONS(REDUCE(aux_sym_program_repeat1, 2)),
         [sym_var_declaration] = ACTIONS(REDUCE(aux_sym_program_repeat1, 2)),
         [sym_func_declaration] = ACTIONS(REDUCE(aux_sym_program_repeat1, 2)),
diff --git a/spec/fixtures/parsers/json.c b/spec/fixtures/parsers/json.c
index d1beaa1d..95bab04a 100644
--- a/spec/fixtures/parsers/json.c
+++ b/spec/fixtures/parsers/json.c
@@ -4,7 +4,7 @@
 #define SYMBOL_COUNT 18
 
 enum {
-    sym_value = ts_builtin_sym_start,
+    sym__value = ts_builtin_sym_start,
     sym_object,
     sym_array,
     sym_string,
@@ -23,7 +23,7 @@ enum {
 };
 
 static const char *ts_symbol_names[] = {
-    [sym_value] = "value",
+    [sym__value] = "_value",
     [sym_object] = "object",
     [sym_array] = "array",
     [ts_builtin_sym_error] = "ERROR",
@@ -44,6 +44,7 @@ static const char *ts_symbol_names[] = {
 };
 
 static const int ts_hidden_symbol_flags[SYMBOL_COUNT] = {
+    [sym__value] = 1,
     [aux_sym_object_repeat1] = 1,
     [aux_sym_array_repeat1] = 1,
     [aux_sym_STR_LBRACE] = 1,
@@ -441,7 +442,7 @@ static TSStateId ts_lex_states[STATE_COUNT] = {
 
 static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
     [0] = {
-        [sym_value] = ACTIONS(SHIFT(1)),
+        [sym__value] = ACTIONS(SHIFT(1)),
         [sym_object] = ACTIONS(SHIFT(2)),
         [sym_array] = ACTIONS(SHIFT(2)),
         [sym_string] = ACTIONS(SHIFT(2)),
@@ -456,7 +457,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [ts_builtin_sym_end] = ACTIONS(ACCEPT_INPUT()),
     },
     [2] = {
-        [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_value, 1)),
+        [ts_builtin_sym_end] = ACTIONS(REDUCE(sym__value, 1)),
     },
     [3] = {
         [ts_builtin_sym_error] = ACTIONS(SHIFT(58)),
@@ -464,7 +465,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(60)),
     },
     [4] = {
-        [sym_value] = ACTIONS(SHIFT(5)),
+        [sym__value] = ACTIONS(SHIFT(5)),
         [sym_object] = ACTIONS(SHIFT(6)),
         [sym_array] = ACTIONS(SHIFT(6)),
         [ts_builtin_sym_error] = ACTIONS(SHIFT(5)),
@@ -483,9 +484,9 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(56)),
     },
     [6] = {
-        [aux_sym_array_repeat1] = ACTIONS(REDUCE(sym_value, 1)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_value, 1)),
-        [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym_value, 1)),
+        [aux_sym_array_repeat1] = ACTIONS(REDUCE(sym__value, 1)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__value, 1)),
+        [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym__value, 1)),
     },
     [7] = {
         [ts_builtin_sym_error] = ACTIONS(SHIFT(18)),
@@ -493,7 +494,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(20)),
     },
     [8] = {
-        [sym_value] = ACTIONS(SHIFT(10)),
+        [sym__value] = ACTIONS(SHIFT(10)),
         [sym_object] = ACTIONS(SHIFT(6)),
         [sym_array] = ACTIONS(SHIFT(6)),
         [ts_builtin_sym_error] = ACTIONS(SHIFT(10)),
@@ -523,7 +524,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACK] = ACTIONS(SHIFT(17)),
     },
     [13] = {
-        [sym_value] = ACTIONS(SHIFT(15)),
+        [sym__value] = ACTIONS(SHIFT(15)),
         [sym_object] = ACTIONS(SHIFT(6)),
         [sym_array] = ACTIONS(SHIFT(6)),
         [ts_builtin_sym_error] = ACTIONS(SHIFT(15)),
@@ -567,7 +568,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACK] = ACTIONS(REDUCE(sym_object, 2)),
     },
     [21] = {
-        [sym_value] = ACTIONS(SHIFT(22)),
+        [sym__value] = ACTIONS(SHIFT(22)),
         [sym_object] = ACTIONS(SHIFT(23)),
         [sym_array] = ACTIONS(SHIFT(23)),
         [sym_string] = ACTIONS(SHIFT(23)),
@@ -584,9 +585,9 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(50)),
     },
     [23] = {
-        [aux_sym_object_repeat1] = ACTIONS(REDUCE(sym_value, 1)),
-        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym_value, 1)),
-        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_value, 1)),
+        [aux_sym_object_repeat1] = ACTIONS(REDUCE(sym__value, 1)),
+        [aux_sym_STR_COMMA] = ACTIONS(REDUCE(sym__value, 1)),
+        [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym__value, 1)),
     },
     [24] = {
         [ts_builtin_sym_error] = ACTIONS(SHIFT(31)),
@@ -594,7 +595,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACE] = ACTIONS(SHIFT(33)),
     },
     [25] = {
-        [sym_value] = ACTIONS(SHIFT(26)),
+        [sym__value] = ACTIONS(SHIFT(26)),
         [sym_object] = ACTIONS(SHIFT(6)),
         [sym_array] = ACTIONS(SHIFT(6)),
         [ts_builtin_sym_error] = ACTIONS(SHIFT(26)),
@@ -644,7 +645,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_RBRACE] = ACTIONS(REDUCE(sym_object, 2)),
     },
     [34] = {
-        [sym_value] = ACTIONS(SHIFT(35)),
+        [sym__value] = ACTIONS(SHIFT(35)),
         [sym_object] = ACTIONS(SHIFT(23)),
         [sym_array] = ACTIONS(SHIFT(23)),
         [sym_string] = ACTIONS(SHIFT(23)),
@@ -681,7 +682,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [aux_sym_STR_COLON] = ACTIONS(SHIFT(41)),
     },
     [41] = {
-        [sym_value] = ACTIONS(SHIFT(42)),
+        [sym__value] = ACTIONS(SHIFT(42)),
         [sym_object] = ACTIONS(SHIFT(23)),
         [sym_array] = ACTIONS(SHIFT(23)),
         [sym_string] = ACTIONS(SHIFT(23)),
@@ -768,7 +769,7 @@ static const TSParseAction *ts_parse_actions[STATE_COUNT][SYMBOL_COUNT] = {
         [ts_builtin_sym_end] = ACTIONS(REDUCE(sym_object, 2)),
     },
     [61] = {
-        [sym_value] = ACTIONS(SHIFT(62)),
+        [sym__value] = ACTIONS(SHIFT(62)),
         [sym_object] = ACTIONS(SHIFT(23)),
         [sym_array] = ACTIONS(SHIFT(23)),
         [sym_string] = ACTIONS(SHIFT(23)),
diff --git a/spec/runtime/document_spec.cc b/spec/runtime/document_spec.cc
index 7cca92d7..6714526e 100644
--- a/spec/runtime/document_spec.cc
+++ b/spec/runtime/document_spec.cc
@@ -85,7 +85,7 @@ describe("Document", [&]() {
 
       AssertThat(debugger->messages, Contains("new_parse"));
       AssertThat(debugger->messages, Contains("lookahead char:'['"));
-      AssertThat(debugger->messages, Contains("reduce sym:value, count:1"));
+      AssertThat(debugger->messages, Contains("reduce sym:array, count:4"));
       AssertThat(debugger->messages, Contains("accept"));
     });
 
diff --git a/spec/runtime/languages/arithmetic/errors.txt b/spec/runtime/languages/arithmetic/errors.txt
index cbb75418..6da79bd2 100644
--- a/spec/runtime/languages/arithmetic/errors.txt
+++ b/spec/runtime/languages/arithmetic/errors.txt
@@ -16,7 +16,7 @@ x + (y * + z) * 5
 
 ---
 
-(sum
+(program (sum
   (variable)
   (product
-    (group (ERROR (variable) (UNEXPECTED '+') (variable))) (number)))
+    (group (ERROR (variable) (UNEXPECTED '+') (variable))) (number))))
diff --git a/spec/runtime/languages/arithmetic/main.txt b/spec/runtime/languages/arithmetic/main.txt
index 22a114bb..5f48aa89 100644
--- a/spec/runtime/languages/arithmetic/main.txt
+++ b/spec/runtime/languages/arithmetic/main.txt
@@ -6,7 +6,7 @@ numbers
 
 ---
 
-(number)
+(program (number))
 
 ===================
 variables
@@ -16,7 +16,7 @@ x
 
 ---
 
-(variable)
+(program (variable))
 
 ====================================
 variables with greek letters
@@ -26,7 +26,7 @@ variables with greek letters
 
 ---
 
-(variable)
+(program (variable))
 
 ===================
 products
@@ -36,7 +36,7 @@ x * x
 
 ---
 
-(product (variable) (variable))
+(program (product (variable) (variable)))
 
 ===================
 sums
@@ -46,7 +46,7 @@ x + x
 
 ---
 
-(sum (variable) (variable))
+(program (sum (variable) (variable)))
 
 ===============================================
 operators of different precedence
@@ -56,9 +56,9 @@ a * b + c * d
 
 ---
 
-(sum
+(program (sum
     (product (variable) (variable))
-    (product (variable) (variable)))
+    (product (variable) (variable))))
 
 ============================
 exponents
@@ -68,10 +68,10 @@ x + y * z^(a + b)
 
 ---
 
-(sum
+(program (sum
     (variable)
     (product
         (variable)
         (exponent
             (variable)
-            (group (sum (variable) (variable))))))
+            (group (sum (variable) (variable)))))))
diff --git a/spec/runtime/languages/c/declarations.txt b/spec/runtime/languages/c/declarations.txt
index 2d50588d..94840285 100644
--- a/spec/runtime/languages/c/declarations.txt
+++ b/spec/runtime/languages/c/declarations.txt
@@ -6,7 +6,8 @@ int x;
 
 ---
 
-(declaration (identifier) (identifier))
+(program
+  (declaration (type_name (identifier)) (declarator (identifier))))
 
 ==========================================
 simple functions
@@ -17,25 +18,27 @@ int main() {
 
 ---
 
-(function_definition
-	(identifier) (direct_declarator (identifier))
-	(compound_statement))
+(program (function_definition
+  (type_name (identifier))
+  (declarator (identifier))
+  (compound_statement)))
 
 ==========================================
 ambiguous declarations
 ==========================================
 
 int main() {
-	int i;
-	someTypeOrValue * pointerOrMultiplicand();
-	float y;
+  int i;
+  someTypeOrValue * pointerOrMultiplicand();
+  float y;
 }
 
 ---
 
-(function_definition
-	(identifier) (direct_declarator (identifier))
+(program (function_definition
+  (type_name (identifier))
+  (declarator (identifier))
   (compound_statement
-		(declaration (identifier) (identifier))
-		(declaration (identifier) (declarator (pointer) (direct_declarator (identifier))))
-		(declaration (identifier) (identifier))))
+    (declaration (type_name (identifier)) (declarator (identifier)))
+    (declaration (type_name (identifier)) (declarator (pointer) (identifier)))
+    (declaration (type_name (identifier)) (declarator (identifier))))))
diff --git a/spec/runtime/languages/golang/declarations.txt b/spec/runtime/languages/golang/declarations.txt
index df76a2eb..aab1fc87 100644
--- a/spec/runtime/languages/golang/declarations.txt
+++ b/spec/runtime/languages/golang/declarations.txt
@@ -48,5 +48,5 @@ func main() {
 
 (program
     (package_directive (package_name))
-    (var_declaration (var_name) (expression (number) (comment)))
+    (var_declaration (var_name) (number) (comment))
     (func_declaration (var_name) (block_statement (comment))))
diff --git a/spec/runtime/languages/golang/errors.txt b/spec/runtime/languages/golang/errors.txt
index 07cd2331..546de9fa 100644
--- a/spec/runtime/languages/golang/errors.txt
+++ b/spec/runtime/languages/golang/errors.txt
@@ -10,6 +10,6 @@ package trivial
 ---
 
 (program
-    (package_directive (package_name))
-    (func_declaration (var_name) (block_statement))
-    (func_declaration (var_name) (block_statement)))
+  (package_directive (package_name))
+  (func_declaration (var_name) (block_statement))
+  (func_declaration (var_name) (block_statement)))
diff --git a/spec/runtime/languages/golang/expressions.txt b/spec/runtime/languages/golang/expressions.txt
index 653db1b0..f0da9ab5 100644
--- a/spec/runtime/languages/golang/expressions.txt
+++ b/spec/runtime/languages/golang/expressions.txt
@@ -5,17 +5,17 @@ function calls
 package main
 
 func main() {
-    println("1", 2)
-    println()
+  println("1", 2)
+  println()
 }
 
 ---
 
 (program
-    (package_directive (package_name))
-    (func_declaration (var_name) (block_statement
-        (expression_statement (call_expression (var_name) (string) (number)))
-        (expression_statement (call_expression (var_name))))))
+  (package_directive (package_name))
+  (func_declaration (var_name) (block_statement
+    (expression_statement (call_expression (var_name) (string) (number)))
+    (expression_statement (call_expression (var_name))))))
 
 ============================================
 selector expressions
@@ -24,16 +24,15 @@ selector expressions
 package main
 
 func main() {
-    x.SomeMethod(x.SomeField, x.OtherField.NestedField);
+  x.SomeMethod(x.SomeField, x.OtherField.NestedField);
 }
 
 ---
 
 (program
-    (package_directive (package_name))
-    (func_declaration (var_name) (block_statement
-        (expression_statement (call_expression
-            (selector_expression (var_name) (var_name))
-            (selector_expression (var_name) (var_name))
-            (selector_expression (selector_expression (var_name) (var_name)) (var_name)))))))
-
+  (package_directive (package_name))
+  (func_declaration (var_name) (block_statement
+    (expression_statement (call_expression
+      (selector_expression (var_name) (var_name))
+      (selector_expression (var_name) (var_name))
+      (selector_expression (selector_expression (var_name) (var_name)) (var_name)))))))
diff --git a/spec/runtime/languages/golang/statements.txt b/spec/runtime/languages/golang/statements.txt
index 5e547da6..b6433ecc 100644
--- a/spec/runtime/languages/golang/statements.txt
+++ b/spec/runtime/languages/golang/statements.txt
@@ -14,10 +14,10 @@ func helper() {
 ---
 
 (program (package_directive (package_name))
-    (func_declaration (var_name) (block_statement
-        (return_statement)))
-    (func_declaration (var_name) (block_statement
-        (return_statement (number) (var_name) (string)))))
+  (func_declaration (var_name) (block_statement
+    (return_statement)))
+  (func_declaration (var_name) (block_statement
+    (return_statement (number) (var_name) (string)))))
 
 ============================================
 variable declarations
@@ -34,10 +34,10 @@ func main() {
 ---
 
 (program (package_directive (package_name))
-    (func_declaration (var_name) (block_statement
-        (declaration_statement (var_name) (var_name) (call_expression (var_name)))
-        (var_declaration (var_name) (number))
-        (expression_statement (call_expression (var_name) (var_name) (var_name) (var_name))))))
+  (func_declaration (var_name) (block_statement
+    (short_var_declaration (var_name) (var_name) (call_expression (var_name)))
+    (var_declaration (var_name) (number))
+    (expression_statement (call_expression (var_name) (var_name) (var_name) (var_name))))))
 
 ============================================
 if statements
@@ -46,30 +46,30 @@ if statements
 package main
 
 func main() {
-    if condition1() {
-    }
+  if condition1() {
+  }
 
-    if condition2() {
-    } else {
-    }
+  if condition2() {
+  } else {
+  }
 
-    if condition3() {
-    } else if condition4() {
-    }
+  if condition3() {
+  } else if condition4() {
+  }
 }
 
 ---
 
 (program (package_directive (package_name))
-    (func_declaration (var_name) (block_statement
+  (func_declaration (var_name) (block_statement
+    (if_statement (call_expression (var_name))
+      (block_statement))
+    (if_statement (call_expression (var_name))
+      (block_statement) (block_statement))
+    (if_statement (call_expression (var_name))
+      (block_statement)
         (if_statement (call_expression (var_name))
-            (block_statement))
-        (if_statement (call_expression (var_name))
-            (block_statement) (block_statement))
-        (if_statement (call_expression (var_name))
-            (block_statement)
-            (if_statement (call_expression (var_name))
-                (block_statement))))))
+          (block_statement))))))
 
 =============================================
 range statements
@@ -90,8 +90,8 @@ func main() {
 ---
 
 (program (package_directive (package_name))
-    (func_declaration (var_name) (block_statement
-        (range_statement (var_name) (call_expression (var_name)) (block_statement
-            (expression_statement (call_expression (var_name) (var_name)))))
-        (range_statement (var_name) (var_name) (call_expression (var_name)) (block_statement
-            (expression_statement (call_expression (var_name) (var_name) (var_name))))))))
+  (func_declaration (var_name) (block_statement
+    (range_statement (var_name) (call_expression (var_name)) (block_statement
+      (expression_statement (call_expression (var_name) (var_name)))))
+    (range_statement (var_name) (var_name) (call_expression (var_name)) (block_statement
+      (expression_statement (call_expression (var_name) (var_name) (var_name))))))))
diff --git a/spec/runtime/languages/golang/types.txt b/spec/runtime/languages/golang/types.txt
index c51f9e4e..9bc604b4 100644
--- a/spec/runtime/languages/golang/types.txt
+++ b/spec/runtime/languages/golang/types.txt
@@ -5,21 +5,21 @@ composite types
 package main
 
 type x *struct {
-    field1 []int64
-    field2 map[string]interface{
-        DoStuff()
-    }
+  field1 []int64
+  field2 map[string]interface{
+    DoStuff()
+  }
 }
 
 ---
 
 (program
-    (package_directive (package_name))
-    (type_declaration
-        (type_name)
-        (pointer_type (struct_type
-            (var_name) (slice_type (type_name))
-            (var_name) (map_type (type_name) (interface_type (var_name)))))))
+  (package_directive (package_name))
+  (type_declaration
+    (type_name)
+    (pointer_type (struct_type
+      (var_name) (slice_type (type_name))
+      (var_name) (map_type (type_name) (interface_type (var_name)))))))
 
 ============================================
 functions arguments
@@ -34,10 +34,10 @@ func argsOfDifferentTypes() (arg1 string, arg2 int64) {}
 ---
 
 (program
-    (package_directive (package_name))
-    (func_declaration (var_name) (var_name) (interface_type) (block_statement))
-    (func_declaration (var_name) (var_name) (var_name) (type_name) (block_statement))
-    (func_declaration (var_name) (var_name) (type_name) (var_name) (type_name) (block_statement)))
+  (package_directive (package_name))
+  (func_declaration (var_name) (var_name) (interface_type) (block_statement))
+  (func_declaration (var_name) (var_name) (var_name) (type_name) (block_statement))
+  (func_declaration (var_name) (var_name) (type_name) (var_name) (type_name) (block_statement)))
 
 ============================================
 functions with unnamed return values
@@ -51,11 +51,11 @@ func multipleReturnValues() (string, int64, error) {}
 ---
 
 (program
-    (package_directive (package_name))
-    (func_declaration (var_name) (type_name)
-        (block_statement))
-    (func_declaration (var_name) (type_name) (type_name) (type_name)
-        (block_statement)))
+  (package_directive (package_name))
+  (func_declaration (var_name) (type_name)
+    (block_statement))
+  (func_declaration (var_name) (type_name) (type_name) (type_name)
+    (block_statement)))
 
 ============================================
 functions with named return values
@@ -69,9 +69,8 @@ func multipleReturnValues() (result string, count int64, err error) {}
 ---
 
 (program
-    (package_directive (package_name))
-    (func_declaration (var_name) (var_name) (type_name)
-        (block_statement))
-    (func_declaration (var_name) (var_name) (type_name) (var_name) (type_name) (var_name) (type_name)
-        (block_statement)))
-
+  (package_directive (package_name))
+  (func_declaration (var_name) (var_name) (type_name)
+    (block_statement))
+  (func_declaration (var_name) (var_name) (type_name) (var_name) (type_name) (var_name) (type_name)
+    (block_statement)))
diff --git a/spec/runtime/parser_spec.cc b/spec/runtime/parser_spec.cc
index f49c393e..a190acc3 100644
--- a/spec/runtime/parser_spec.cc
+++ b/spec/runtime/parser_spec.cc
@@ -160,7 +160,7 @@ describe("Parser", [&]() {
         set_text("fn()\n");
 
         AssertThat(ts_node_string(root, doc), Equals(
-          "(expression_statement (function_call (identifier) (arguments)))"));
+          "(program (expression_statement (function_call (identifier) (arguments))))"));
       });
     });
 
@@ -171,9 +171,9 @@ describe("Parser", [&]() {
           "  .otherFn();");
 
         AssertThat(ts_node_string(root, doc), Equals(
-          "(expression_statement (function_call "
+          "(program (expression_statement (function_call "
             "(member_access (function_call (identifier) (arguments)) (identifier)) "
-            "(arguments)))"));
+            "(arguments))))"));
       });
     });
 
@@ -186,11 +186,11 @@ describe("Parser", [&]() {
           ".otherFn();");
 
         AssertThat(ts_node_string(root, doc), Equals(
-          "(expression_statement (function_call "
+          "(program (expression_statement (function_call "
             "(member_access (function_call (identifier) (arguments)) "
               "(comment) "
               "(identifier)) "
-              "(arguments)))"));
+              "(arguments))))"));
       });
     });
   });
@@ -206,18 +206,18 @@ describe("Parser", [&]() {
           set_text("x ^ (100 + abc)");
 
           AssertThat(ts_node_string(root, doc), Equals(
-            "(exponent "
+            "(program (exponent "
               "(variable) "
-              "(group (sum (number) (variable))))"));
+              "(group (sum (number) (variable)))))"));
 
           insert_text(strlen("x ^ (100 + abc"), " * 5");
         });
 
         it("updates the parse tree", [&]() {
           AssertThat(ts_node_string(root, doc), Equals(
-            "(exponent "
+            "(program (exponent "
               "(variable) "
-              "(group (sum (number) (product (variable) (number)))))"));
+              "(group (sum (number) (product (variable) (number))))))"));
         });
 
         it("re-reads only the changed portion of the input", [&]() {
@@ -232,20 +232,20 @@ describe("Parser", [&]() {
           set_text("123 * 456 ^ (10 + x)");
 
           AssertThat(ts_node_string(root, doc), Equals(
-            "(product "
+            "(program (product "
               "(number) "
-              "(exponent (number) (group (sum (number) (variable)))))"));
+              "(exponent (number) (group (sum (number) (variable))))))"));
 
           insert_text(strlen("123"), " + 5");
         });
 
         it("updates the parse tree", [&]() {
           AssertThat(ts_node_string(root, doc), Equals(
-            "(sum "
+            "(program (sum "
               "(number) "
               "(product "
                 "(number) "
-                "(exponent (number) (group (sum (number) (variable))))))"));
+                "(exponent (number) (group (sum (number) (variable)))))))"));
         });
 
         it("re-reads only the changed portion of the input", [&]() {
@@ -260,19 +260,19 @@ describe("Parser", [&]() {
           set_text("var x = y;");
 
           AssertThat(ts_node_string(root, doc), Equals(
-            "(var_declaration (var_assignment "
-              "(identifier) (identifier)))"));
+            "(program (var_declaration (var_assignment "
+              "(identifier) (identifier))))"));
 
           insert_text(strlen("var x = y"), " *");
 
           AssertThat(ts_node_string(root, doc), Equals(
-              "(var_declaration (ERROR (identifier) (identifier) (UNEXPECTED ';')))"));
+              "(program (var_declaration (ERROR (identifier) (identifier) (UNEXPECTED ';'))))"));
 
           insert_text(strlen("var x = y *"), " z");
 
           AssertThat(ts_node_string(root, doc), Equals(
-            "(var_declaration (var_assignment "
-              "(identifier) (math_op (identifier) (identifier))))"));
+            "(program (var_declaration (var_assignment "
+              "(identifier) (math_op (identifier) (identifier)))))"));
         });
       });
 
@@ -281,14 +281,14 @@ describe("Parser", [&]() {
           set_text("abc * 123");
 
           AssertThat(ts_node_string(root, doc), Equals(
-            "(product (variable) (number))"));
+            "(program (product (variable) (number)))"));
 
           insert_text(strlen("ab"), "XYZ");
         });
 
         it("updates the parse tree", [&]() {
           AssertThat(ts_node_string(root, doc), Equals(
-            "(product (variable) (number))"));
+            "(program (product (variable) (number)))"));
 
           TSNode node = ts_node_find_for_pos(root, 1);
           AssertThat(ts_node_name(node, doc), Equals("variable"));
@@ -301,14 +301,14 @@ describe("Parser", [&]() {
           set_text("abc * 123");
 
           AssertThat(ts_node_string(root, doc), Equals(
-            "(product (variable) (number))"));
+            "(program (product (variable) (number)))"));
 
           insert_text(strlen("abc"), "XYZ");
         });
 
         it("updates the parse tree", [&]() {
           AssertThat(ts_node_string(root, doc), Equals(
-            "(product (variable) (number))"));
+            "(program (product (variable) (number)))"));
 
           TSNode node = ts_node_find_for_pos(root, 1);
           AssertThat(ts_node_name(node, doc), Equals("variable"));
@@ -322,7 +322,7 @@ describe("Parser", [&]() {
           set_text("\u03b1\u03b2\u03b4 + 1");
 
           AssertThat(ts_node_string(root, doc), Equals(
-            "(sum (variable) (number))"));
+            "(program (sum (variable) (number)))"));
 
           // αβδ + ψ1
           insert_text(strlen("abd + "), "\u03c8");
@@ -330,7 +330,7 @@ describe("Parser", [&]() {
 
         it("inserts the text according to the UTF8 character index", [&]() {
           AssertThat(ts_node_string(root, doc), Equals(
-            "(sum (variable) (variable))"));
+            "(program (sum (variable) (variable)))"));
         });
       });
 
@@ -341,7 +341,7 @@ describe("Parser", [&]() {
             "abc");
 
           AssertThat(ts_node_string(root, doc), Equals(
-            "(product (number) (comment) (variable))"));
+            "(program (product (number) (comment) (variable)))"));
 
           insert_text(
             strlen("123 *\n"
@@ -352,7 +352,7 @@ describe("Parser", [&]() {
 
         it("updates the parse tree", [&]() {
           AssertThat(ts_node_string(root, doc), Equals(
-            "(product (number) (comment) (variable))"));
+            "(program (product (number) (comment) (variable)))"));
         });
       });
     });
@@ -363,7 +363,7 @@ describe("Parser", [&]() {
           set_text("123 * 456");
 
           AssertThat(ts_node_string(root, doc), Equals(
-            "(product (number) (number))"));
+            "(program (product (number) (number)))"));
 
           delete_text(strlen("123 "), 2);
         });
@@ -382,14 +382,14 @@ describe("Parser", [&]() {
         set_text("{ x: (b.c) };");
 
         AssertThat(ts_node_string(root, doc), Equals(
-          "(expression_statement (object (pair "
-            "(identifier) (member_access (identifier) (identifier)))))"));
+          "(program (expression_statement (object (pair "
+            "(identifier) (member_access (identifier) (identifier))))))"));
 
         replace_text(strlen("{ x: "), strlen("(b.c)"), "b.c");
 
         AssertThat(ts_node_string(root, doc), Equals(
-          "(expression_statement (object (pair "
-            "(identifier) (member_access (identifier) (identifier)))))"));
+          "(program (expression_statement (object (pair "
+            "(identifier) (member_access (identifier) (identifier))))))"));
       });
     });
   });
@@ -404,7 +404,7 @@ describe("Parser", [&]() {
         set_text("x # this is a comment");
 
         AssertThat(ts_node_string(root, doc), Equals(
-          "(expression (variable) (comment))"));
+          "(program (variable) (comment))"));
 
         TSNode comment = ts_node_child(root, 1);
 
@@ -417,7 +417,7 @@ describe("Parser", [&]() {
       set_text("x # \u03A9\u03A9\u03A9 \u2014 \u0394\u0394");
 
       AssertThat(ts_node_string(root, doc), Equals(
-        "(expression (variable) (comment))"));
+        "(program (variable) (comment))"));
 
       AssertThat(ts_node_size(root).chars, Equals(strlen("x # OOO - DD")));
       AssertThat(ts_node_size(root).bytes, Equals(strlen("x # \u03A9\u03A9\u03A9 \u2014 \u0394\u0394")));
diff --git a/src/runtime/document.c b/src/runtime/document.c
index b7dbeea9..618f19bf 100644
--- a/src/runtime/document.c
+++ b/src/runtime/document.c
@@ -63,8 +63,8 @@ void ts_document_set_input_string(TSDocument *document, const char *text) {
 }
 
 TSNode ts_document_root_node(const TSDocument *document) {
-  TSTree *tree = document->tree;
-  while (tree && ts_tree_is_singleton(tree))
-    tree = tree->children[0];
-  return ts_node_make(tree, ts_length_zero());
+  TSNode result = ts_node_make(document->tree, ts_length_zero());
+  while (result.data && !ts_tree_is_visible(result.data))
+    result = ts_node_child(result, 0);
+  return result;
 }
diff --git a/src/runtime/tree.c b/src/runtime/tree.c
index 63257b68..00b2886f 100644
--- a/src/runtime/tree.c
+++ b/src/runtime/tree.c
@@ -67,9 +67,6 @@ TSTree *ts_tree_make_node(TSSymbol symbol, size_t child_count,
   } else {
     if (is_hidden)
       options |= TSTreeOptionsHidden;
-    if (child_count == 1 &&
-        (ts_tree_is_visible(children[0]) || ts_tree_is_singleton(children[0])))
-      options |= (TSTreeOptionsSingleton | TSTreeOptionsHidden);
     if (child_count > 0) {
       if (ts_tree_is_fragile_left(children[0]))
         options |= (TSTreeOptionsFragileLeft);
@@ -207,7 +204,6 @@ void ts_tree_prepend_children(TSTree *tree, size_t count, TSTree **children) {
          tree->child_count * sizeof(TSTree *));
   free(tree->children);
 
-  ts_tree_unset_singleton(tree);
   tree->children = new_children;
   tree->visible_child_count += visible_count;
   tree->child_count += count;
diff --git a/src/runtime/tree.h b/src/runtime/tree.h
index 27abbf99..70e44d12 100644
--- a/src/runtime/tree.h
+++ b/src/runtime/tree.h
@@ -11,9 +11,8 @@ extern "C" {
 typedef enum {
   TSTreeOptionsHidden = 1 << 0,
   TSTreeOptionsExtra = 1 << 1,
-  TSTreeOptionsSingleton = 1 << 2,
-  TSTreeOptionsFragileLeft = 1 << 3,
-  TSTreeOptionsFragileRight = 1 << 4,
+  TSTreeOptionsFragileLeft = 1 << 2,
+  TSTreeOptionsFragileRight = 1 << 3,
 } TSTreeOptions;
 
 struct TSTree {
@@ -47,14 +46,6 @@ static inline bool ts_tree_is_visible(const TSTree *tree) {
   return !(tree->options & TSTreeOptionsHidden);
 }
 
-static inline bool ts_tree_is_singleton(const TSTree *tree) {
-  return !!(tree->options & TSTreeOptionsSingleton);
-}
-
-static inline void ts_tree_unset_singleton(TSTree *tree) {
-  tree->options = (TSTreeOptions)(tree->options & ~TSTreeOptionsSingleton);
-}
-
 static inline void ts_tree_set_options(TSTree *tree, TSTreeOptions options) {
   tree->options = (TSTreeOptions)(tree->options | options);
 }