diff --git a/binding.gyp b/binding.gyp
index ea6659d..4c96e3f 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -2,18 +2,29 @@
   "targets": [
     {
       "target_name": "tree_sitter_spl_binding",
+      "dependencies": [
+        "<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except",
+      ],
       "include_dirs": [
-        "<!(node -e \"require('nan')\")",
-        "src"
+        "src",
       ],
       "sources": [
         "bindings/node/binding.cc",
         "src/parser.c",
-        # If your language uses an external scanner, add it here.
+        # NOTE: if your language has an external scanner, add it here.
+      ],
+      "conditions": [
+        ["OS!='win'", {
+          "cflags_c": [
+            "-std=c11",
+          ],
+        }, { # OS == "win"
+          "cflags_c": [
+            "/std:c11",
+            "/utf-8",
+          ],
+        }],
       ],
-      "cflags_c": [
-        "-std=c99",
-      ]
     }
   ]
 }
diff --git a/bindings/node/binding.cc b/bindings/node/binding.cc
index c74648e..c24976d 100644
--- a/bindings/node/binding.cc
+++ b/bindings/node/binding.cc
@@ -1,28 +1,20 @@
-#include "tree_sitter/parser.h"
-#include <node.h>
-#include "nan.h"
+#include <napi.h>
 
-using namespace v8;
+typedef struct TSLanguage TSLanguage;
 
-extern "C" TSLanguage * tree_sitter_spl();
+extern "C" TSLanguage *tree_sitter_spl();
 
-namespace {
+// "tree-sitter", "language" hashed with BLAKE2
+const napi_type_tag LANGUAGE_TYPE_TAG = {
+  0x8AF2E5212AD58ABF, 0xD5006CAD83ABBA16
+};
 
-NAN_METHOD(New) {}
-
-void Init(Local<Object> exports, Local<Object> module) {
-  Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
-  tpl->SetClassName(Nan::New("Language").ToLocalChecked());
-  tpl->InstanceTemplate()->SetInternalFieldCount(1);
-
-  Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
-  Local<Object> instance = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
-  Nan::SetInternalFieldPointer(instance, 0, tree_sitter_spl());
-
-  Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("spl").ToLocalChecked());
-  Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
+Napi::Object Init(Napi::Env env, Napi::Object exports) {
+    exports["name"] = Napi::String::New(env, "spl");
+    auto language = Napi::External<TSLanguage>::New(env, tree_sitter_spl());
+    language.TypeTag(&LANGUAGE_TYPE_TAG);
+    exports["language"] = language;
+    return exports;
 }
 
-NODE_MODULE(tree_sitter_spl_binding, Init)
-
-}  // namespace
+NODE_API_MODULE(tree_sitter_spl_binding, Init)
diff --git a/bindings/node/index.js b/bindings/node/index.js
index 7992152..6657bcf 100644
--- a/bindings/node/index.js
+++ b/bindings/node/index.js
@@ -1,18 +1,6 @@
-try {
-  module.exports = require("../../build/Release/tree_sitter_spl_binding");
-} catch (error1) {
-  if (error1.code !== 'MODULE_NOT_FOUND') {
-    throw error1;
-  }
-  try {
-    module.exports = require("../../build/Debug/tree_sitter_spl_binding");
-  } catch (error2) {
-    if (error2.code !== 'MODULE_NOT_FOUND') {
-      throw error2;
-    }
-    throw error1
-  }
-}
+const root = require("path").join(__dirname, "..", "..");
+
+module.exports = require("node-gyp-build")(root);
 
 try {
   module.exports.nodeTypeInfo = require("../../src/node-types.json");
diff --git a/bindings/rust/build.rs b/bindings/rust/build.rs
index c6061f0..4cc26f5 100644
--- a/bindings/rust/build.rs
+++ b/bindings/rust/build.rs
@@ -7,6 +7,9 @@ fn main() {
         .flag_if_supported("-Wno-unused-parameter")
         .flag_if_supported("-Wno-unused-but-set-variable")
         .flag_if_supported("-Wno-trigraphs");
+    #[cfg(target_env = "msvc")]
+    c_config.flag("-utf-8");
+
     let parser_path = src_dir.join("parser.c");
     c_config.file(&parser_path);
 
diff --git a/grammar.js b/grammar.js
index 713fff6..5787278 100644
--- a/grammar.js
+++ b/grammar.js
@@ -3,7 +3,7 @@ module.exports = grammar({
 
   rules: {
     source_file: $ => repeat($._statement),
-    _statement: $ => seq(
+    _unspaced_statement: $ => seq(
       choice(
         $.string,
         $.function_definition,
@@ -17,13 +17,17 @@ module.exports = grammar({
         $.include,
         $.def,
         $.number,
-        $.expression,
+        $.call_expr,
         seq(
           repeat('&'),
           $.call
         ),
       ),
       optional(';'),
+      optional($.call_expr),
+    ),
+    _statement: $ => seq(
+      $._unspaced_statement,
       $._spacing,
     ),
     function_definition: $ => choice($.func, $.block),
@@ -37,7 +41,7 @@ module.exports = grammar({
         repeat($._statement), 
       '}',
     ),
-    identifier: $ => /[^ \n\r\t:;&{}"']+/,
+    identifier: $ => /[^ \n\r\t<>:;&{}"']+/,
     call: $ => seq(
       choice(
         seq(
@@ -50,7 +54,7 @@ module.exports = grammar({
     ),
     number: $ => /\d+(\.\d+)?/,
     string: $ => seq('"', repeat(choice(/\\./, /./)), '"'),
-    expression: $ => seq('<{', $._spacing, repeat($._statement), '}'),
+    call_expr: $ => seq('<', optional($._spacing), repeat($._statement), $._unspaced_statement, '>'),
     with_expr: $ => seq(
       'with', $._spacing,
       repeat($.identifier),
diff --git a/package.json b/package.json
index d735328..f99899e 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,11 @@
   "version": "1.0.0",
   "description": "",
   "main": "bindings/node",
+  "types": "bindings/node",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "install": "node-gyp-build",
+    "prebuildify": "prebuildify --napi --strip"
   },
   "repository": {
     "type": "git",
@@ -17,10 +20,20 @@
   },
   "homepage": "https://github.com/tudbut/tree-sitter-spl#readme",
   "dependencies": {
-    "nan": "^2.17.0"
+    "node-addon-api": "^7.1.0",
+    "node-gyp-build": "^4.8.0"
+  },
+  "peerDependencies": {
+    "tree-sitter": "^0.21.0"
+  },
+  "peerDependenciesMeta": {
+    "tree_sitter": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.20.8"
+    "tree-sitter-cli": "^0.20.8",
+    "prebuildify": "^6.0.0"
   },
   "tree-sitter": [
     {
@@ -31,5 +44,13 @@
         "sbl"
       ]
     }
+  ],
+  "files": [
+    "grammar.js",
+    "binding.gyp",
+    "prebuilds/**",
+    "bindings/node/*",
+    "queries/*",
+    "src/**"
   ]
 }
diff --git a/src/grammar.json b/src/grammar.json
index e4f7b60..5ab2460 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -8,7 +8,7 @@
         "name": "_statement"
       }
     },
-    "_statement": {
+    "_unspaced_statement": {
       "type": "SEQ",
       "members": [
         {
@@ -64,7 +64,7 @@
             },
             {
               "type": "SYMBOL",
-              "name": "expression"
+              "name": "call_expr"
             },
             {
               "type": "SEQ",
@@ -96,6 +96,27 @@
             }
           ]
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "call_expr"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
+    "_statement": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_unspaced_statement"
+        },
         {
           "type": "SYMBOL",
           "name": "_spacing"
@@ -241,7 +262,7 @@
     },
     "identifier": {
       "type": "PATTERN",
-      "value": "[^ \\n\\r\\t:;&{}\"']+"
+      "value": "[^ \\n\\r\\t<>:;&{}\"']+"
     },
     "call": {
       "type": "SEQ",
@@ -315,16 +336,24 @@
         }
       ]
     },
-    "expression": {
+    "call_expr": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "<{"
+          "value": "<"
         },
         {
-          "type": "SYMBOL",
-          "name": "_spacing"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_spacing"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         },
         {
           "type": "REPEAT",
@@ -333,9 +362,13 @@
             "name": "_statement"
           }
         },
+        {
+          "type": "SYMBOL",
+          "name": "_unspaced_statement"
+        },
         {
           "type": "STRING",
-          "value": "}"
+          "value": ">"
         }
       ]
     },
@@ -751,4 +784,3 @@
   "inline": [],
   "supertypes": []
 }
-
diff --git a/src/node-types.json b/src/node-types.json
index 2142300..73dd224 100644
--- a/src/node-types.json
+++ b/src/node-types.json
@@ -15,6 +15,10 @@
           "type": "call",
           "named": true
         },
+        {
+          "type": "call_expr",
+          "named": true
+        },
         {
           "type": "catch",
           "named": true
@@ -23,10 +27,6 @@
           "type": "def",
           "named": true
         },
-        {
-          "type": "expression",
-          "named": true
-        },
         {
           "type": "function_definition",
           "named": true
@@ -82,6 +82,10 @@
           "type": "call",
           "named": true
         },
+        {
+          "type": "call_expr",
+          "named": true
+        },
         {
           "type": "catch",
           "named": true
@@ -90,10 +94,6 @@
           "type": "def",
           "named": true
         },
-        {
-          "type": "expression",
-          "named": true
-        },
         {
           "type": "function_definition",
           "named": true
@@ -167,6 +167,73 @@
       ]
     }
   },
+  {
+    "type": "call_expr",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "array",
+          "named": true
+        },
+        {
+          "type": "call",
+          "named": true
+        },
+        {
+          "type": "call_expr",
+          "named": true
+        },
+        {
+          "type": "catch",
+          "named": true
+        },
+        {
+          "type": "def",
+          "named": true
+        },
+        {
+          "type": "function_definition",
+          "named": true
+        },
+        {
+          "type": "if",
+          "named": true
+        },
+        {
+          "type": "include",
+          "named": true
+        },
+        {
+          "type": "number",
+          "named": true
+        },
+        {
+          "type": "string",
+          "named": true
+        },
+        {
+          "type": "type_definition",
+          "named": true
+        },
+        {
+          "type": "use",
+          "named": true
+        },
+        {
+          "type": "while",
+          "named": true
+        },
+        {
+          "type": "with_expr",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "catch",
     "named": true,
@@ -183,6 +250,10 @@
           "type": "call",
           "named": true
         },
+        {
+          "type": "call_expr",
+          "named": true
+        },
         {
           "type": "catch",
           "named": true
@@ -191,10 +262,6 @@
           "type": "def",
           "named": true
         },
-        {
-          "type": "expression",
-          "named": true
-        },
         {
           "type": "function_definition",
           "named": true
@@ -249,73 +316,6 @@
       ]
     }
   },
-  {
-    "type": "expression",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": false,
-      "types": [
-        {
-          "type": "array",
-          "named": true
-        },
-        {
-          "type": "call",
-          "named": true
-        },
-        {
-          "type": "catch",
-          "named": true
-        },
-        {
-          "type": "def",
-          "named": true
-        },
-        {
-          "type": "expression",
-          "named": true
-        },
-        {
-          "type": "function_definition",
-          "named": true
-        },
-        {
-          "type": "if",
-          "named": true
-        },
-        {
-          "type": "include",
-          "named": true
-        },
-        {
-          "type": "number",
-          "named": true
-        },
-        {
-          "type": "string",
-          "named": true
-        },
-        {
-          "type": "type_definition",
-          "named": true
-        },
-        {
-          "type": "use",
-          "named": true
-        },
-        {
-          "type": "while",
-          "named": true
-        },
-        {
-          "type": "with_expr",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "func",
     "named": true,
@@ -374,6 +374,10 @@
           "type": "call",
           "named": true
         },
+        {
+          "type": "call_expr",
+          "named": true
+        },
         {
           "type": "catch",
           "named": true
@@ -382,10 +386,6 @@
           "type": "def",
           "named": true
         },
-        {
-          "type": "expression",
-          "named": true
-        },
         {
           "type": "function_definition",
           "named": true
@@ -456,6 +456,10 @@
           "type": "call",
           "named": true
         },
+        {
+          "type": "call_expr",
+          "named": true
+        },
         {
           "type": "catch",
           "named": true
@@ -464,10 +468,6 @@
           "type": "def",
           "named": true
         },
-        {
-          "type": "expression",
-          "named": true
-        },
         {
           "type": "function_definition",
           "named": true
@@ -566,6 +566,10 @@
           "type": "call",
           "named": true
         },
+        {
+          "type": "call_expr",
+          "named": true
+        },
         {
           "type": "catch",
           "named": true
@@ -574,10 +578,6 @@
           "type": "def",
           "named": true
         },
-        {
-          "type": "expression",
-          "named": true
-        },
         {
           "type": "function_definition",
           "named": true
@@ -653,13 +653,17 @@
     "named": false
   },
   {
-    "type": "<{",
+    "type": "<",
     "named": false
   },
   {
     "type": "=",
     "named": false
   },
+  {
+    "type": ">",
+    "named": false
+  },
   {
     "type": "@",
     "named": false
diff --git a/src/parser.c b/src/parser.c
index 1776d3b..d95004e 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,22 +1,21 @@
-#include <tree_sitter/parser.h>
+#include "tree_sitter/parser.h"
 
 #if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 
 #define LANGUAGE_VERSION 14
 #define STATE_COUNT 170
-#define LARGE_STATE_COUNT 27
-#define SYMBOL_COUNT 58
+#define LARGE_STATE_COUNT 29
+#define SYMBOL_COUNT 60
 #define ALIAS_COUNT 0
-#define TOKEN_COUNT 32
+#define TOKEN_COUNT 33
 #define EXTERNAL_TOKEN_COUNT 0
 #define FIELD_COUNT 0
 #define MAX_ALIAS_SEQUENCE_LENGTH 12
 #define PRODUCTION_ID_COUNT 1
 
-enum {
+enum ts_symbol_identifiers {
   anon_sym_AMP = 1,
   anon_sym_SEMI = 2,
   anon_sym_func = 3,
@@ -32,48 +31,50 @@ enum {
   sym_number = 13,
   anon_sym_DQUOTE = 14,
   aux_sym_string_token1 = 15,
-  anon_sym_LT_LBRACE = 16,
-  anon_sym_with = 17,
-  anon_sym_LBRACK = 18,
-  anon_sym_RBRACK = 19,
-  sym_operation = 20,
-  anon_sym_def = 21,
-  anon_sym_EQ = 22,
-  anon_sym_construct = 23,
-  anon_sym_namespace = 24,
-  sym__spacing = 25,
-  anon_sym_if = 26,
-  anon_sym_while = 27,
-  anon_sym_catch = 28,
-  anon_sym_include = 29,
-  anon_sym_in = 30,
-  anon_sym_use = 31,
-  sym_source_file = 32,
-  sym__statement = 33,
-  sym_function_definition = 34,
-  sym_func = 35,
-  sym_blocky = 36,
-  sym_block = 37,
-  sym_call = 38,
-  sym_string = 39,
-  sym_expression = 40,
-  sym_with_expr = 41,
-  sym_array = 42,
-  sym_type_definition = 43,
-  sym_if = 44,
-  sym_while = 45,
-  sym_catch = 46,
-  sym_include = 47,
-  sym_use = 48,
-  sym_def = 49,
-  aux_sym_source_file_repeat1 = 50,
-  aux_sym__statement_repeat1 = 51,
-  aux_sym_blocky_repeat1 = 52,
-  aux_sym_block_repeat1 = 53,
-  aux_sym_string_repeat1 = 54,
-  aux_sym_with_expr_repeat1 = 55,
-  aux_sym_type_definition_repeat1 = 56,
-  aux_sym_type_definition_repeat2 = 57,
+  anon_sym_LT = 16,
+  anon_sym_GT = 17,
+  anon_sym_with = 18,
+  anon_sym_LBRACK = 19,
+  anon_sym_RBRACK = 20,
+  sym_operation = 21,
+  anon_sym_def = 22,
+  anon_sym_EQ = 23,
+  anon_sym_construct = 24,
+  anon_sym_namespace = 25,
+  sym__spacing = 26,
+  anon_sym_if = 27,
+  anon_sym_while = 28,
+  anon_sym_catch = 29,
+  anon_sym_include = 30,
+  anon_sym_in = 31,
+  anon_sym_use = 32,
+  sym_source_file = 33,
+  sym__unspaced_statement = 34,
+  sym__statement = 35,
+  sym_function_definition = 36,
+  sym_func = 37,
+  sym_blocky = 38,
+  sym_block = 39,
+  sym_call = 40,
+  sym_string = 41,
+  sym_call_expr = 42,
+  sym_with_expr = 43,
+  sym_array = 44,
+  sym_type_definition = 45,
+  sym_if = 46,
+  sym_while = 47,
+  sym_catch = 48,
+  sym_include = 49,
+  sym_use = 50,
+  sym_def = 51,
+  aux_sym_source_file_repeat1 = 52,
+  aux_sym__unspaced_statement_repeat1 = 53,
+  aux_sym_blocky_repeat1 = 54,
+  aux_sym_block_repeat1 = 55,
+  aux_sym_string_repeat1 = 56,
+  aux_sym_with_expr_repeat1 = 57,
+  aux_sym_type_definition_repeat1 = 58,
+  aux_sym_type_definition_repeat2 = 59,
 };
 
 static const char * const ts_symbol_names[] = {
@@ -93,7 +94,8 @@ static const char * const ts_symbol_names[] = {
   [sym_number] = "number",
   [anon_sym_DQUOTE] = "\"",
   [aux_sym_string_token1] = "string_token1",
-  [anon_sym_LT_LBRACE] = "<{",
+  [anon_sym_LT] = "<",
+  [anon_sym_GT] = ">",
   [anon_sym_with] = "with",
   [anon_sym_LBRACK] = "[",
   [anon_sym_RBRACK] = "]",
@@ -110,6 +112,7 @@ static const char * const ts_symbol_names[] = {
   [anon_sym_in] = "in",
   [anon_sym_use] = "use",
   [sym_source_file] = "source_file",
+  [sym__unspaced_statement] = "_unspaced_statement",
   [sym__statement] = "_statement",
   [sym_function_definition] = "function_definition",
   [sym_func] = "func",
@@ -117,7 +120,7 @@ static const char * const ts_symbol_names[] = {
   [sym_block] = "block",
   [sym_call] = "call",
   [sym_string] = "string",
-  [sym_expression] = "expression",
+  [sym_call_expr] = "call_expr",
   [sym_with_expr] = "with_expr",
   [sym_array] = "array",
   [sym_type_definition] = "type_definition",
@@ -128,7 +131,7 @@ static const char * const ts_symbol_names[] = {
   [sym_use] = "use",
   [sym_def] = "def",
   [aux_sym_source_file_repeat1] = "source_file_repeat1",
-  [aux_sym__statement_repeat1] = "_statement_repeat1",
+  [aux_sym__unspaced_statement_repeat1] = "_unspaced_statement_repeat1",
   [aux_sym_blocky_repeat1] = "blocky_repeat1",
   [aux_sym_block_repeat1] = "block_repeat1",
   [aux_sym_string_repeat1] = "string_repeat1",
@@ -154,7 +157,8 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_number] = sym_number,
   [anon_sym_DQUOTE] = anon_sym_DQUOTE,
   [aux_sym_string_token1] = aux_sym_string_token1,
-  [anon_sym_LT_LBRACE] = anon_sym_LT_LBRACE,
+  [anon_sym_LT] = anon_sym_LT,
+  [anon_sym_GT] = anon_sym_GT,
   [anon_sym_with] = anon_sym_with,
   [anon_sym_LBRACK] = anon_sym_LBRACK,
   [anon_sym_RBRACK] = anon_sym_RBRACK,
@@ -171,6 +175,7 @@ static const TSSymbol ts_symbol_map[] = {
   [anon_sym_in] = anon_sym_in,
   [anon_sym_use] = anon_sym_use,
   [sym_source_file] = sym_source_file,
+  [sym__unspaced_statement] = sym__unspaced_statement,
   [sym__statement] = sym__statement,
   [sym_function_definition] = sym_function_definition,
   [sym_func] = sym_func,
@@ -178,7 +183,7 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_block] = sym_block,
   [sym_call] = sym_call,
   [sym_string] = sym_string,
-  [sym_expression] = sym_expression,
+  [sym_call_expr] = sym_call_expr,
   [sym_with_expr] = sym_with_expr,
   [sym_array] = sym_array,
   [sym_type_definition] = sym_type_definition,
@@ -189,7 +194,7 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_use] = sym_use,
   [sym_def] = sym_def,
   [aux_sym_source_file_repeat1] = aux_sym_source_file_repeat1,
-  [aux_sym__statement_repeat1] = aux_sym__statement_repeat1,
+  [aux_sym__unspaced_statement_repeat1] = aux_sym__unspaced_statement_repeat1,
   [aux_sym_blocky_repeat1] = aux_sym_blocky_repeat1,
   [aux_sym_block_repeat1] = aux_sym_block_repeat1,
   [aux_sym_string_repeat1] = aux_sym_string_repeat1,
@@ -263,7 +268,11 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = false,
   },
-  [anon_sym_LT_LBRACE] = {
+  [anon_sym_LT] = {
+    .visible = true,
+    .named = false,
+  },
+  [anon_sym_GT] = {
     .visible = true,
     .named = false,
   },
@@ -331,6 +340,10 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
+  [sym__unspaced_statement] = {
+    .visible = false,
+    .named = true,
+  },
   [sym__statement] = {
     .visible = false,
     .named = true,
@@ -359,7 +372,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [sym_expression] = {
+  [sym_call_expr] = {
     .visible = true,
     .named = true,
   },
@@ -403,7 +416,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = false,
   },
-  [aux_sym__statement_repeat1] = {
+  [aux_sym__unspaced_statement_repeat1] = {
     .visible = false,
     .named = false,
   },
@@ -447,13 +460,13 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [2] = 2,
   [3] = 3,
   [4] = 4,
-  [5] = 5,
+  [5] = 2,
   [6] = 6,
   [7] = 7,
   [8] = 8,
   [9] = 9,
   [10] = 10,
-  [11] = 2,
+  [11] = 11,
   [12] = 12,
   [13] = 13,
   [14] = 14,
@@ -472,20 +485,20 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [27] = 27,
   [28] = 28,
   [29] = 29,
-  [30] = 27,
-  [31] = 29,
-  [32] = 28,
+  [30] = 29,
+  [31] = 31,
+  [32] = 32,
   [33] = 33,
   [34] = 34,
   [35] = 35,
   [36] = 36,
-  [37] = 33,
-  [38] = 36,
-  [39] = 35,
+  [37] = 37,
+  [38] = 38,
+  [39] = 39,
   [40] = 40,
-  [41] = 41,
+  [41] = 34,
   [42] = 42,
-  [43] = 43,
+  [43] = 33,
   [44] = 44,
   [45] = 45,
   [46] = 46,
@@ -518,22 +531,22 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [73] = 73,
   [74] = 74,
   [75] = 75,
-  [76] = 68,
-  [77] = 52,
+  [76] = 76,
+  [77] = 77,
   [78] = 78,
   [79] = 79,
   [80] = 80,
   [81] = 81,
   [82] = 82,
   [83] = 83,
-  [84] = 83,
+  [84] = 84,
   [85] = 85,
   [86] = 86,
   [87] = 87,
   [88] = 88,
   [89] = 89,
-  [90] = 90,
-  [91] = 91,
+  [90] = 59,
+  [91] = 46,
   [92] = 92,
   [93] = 93,
   [94] = 94,
@@ -543,14 +556,14 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [98] = 98,
   [99] = 99,
   [100] = 100,
-  [101] = 75,
+  [101] = 101,
   [102] = 102,
   [103] = 103,
   [104] = 104,
   [105] = 105,
   [106] = 106,
   [107] = 107,
-  [108] = 73,
+  [108] = 108,
   [109] = 109,
   [110] = 110,
   [111] = 111,
@@ -588,7 +601,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [143] = 143,
   [144] = 144,
   [145] = 145,
-  [146] = 119,
+  [146] = 146,
   [147] = 147,
   [148] = 148,
   [149] = 149,
@@ -606,27 +619,18 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [161] = 161,
   [162] = 162,
   [163] = 163,
-  [164] = 122,
+  [164] = 164,
   [165] = 165,
   [166] = 166,
-  [167] = 167,
+  [167] = 151,
   [168] = 168,
   [169] = 169,
 };
 
-static inline bool sym_identifier_character_set_1(int32_t c) {
-  return (c < '"'
-    ? (c < '\r'
-      ? (c < '\t'
-        ? c == 0
-        : c <= '\n')
-      : (c <= '\r' || c == ' '))
-    : (c <= '"' || (c < '{'
-      ? (c < ':'
-        ? (c >= '&' && c <= '\'')
-        : c <= ';')
-      : (c <= '{' || c == '}'))));
-}
+static TSCharacterRange sym_identifier_character_set_1[] = {
+  {0, 0x08}, {0x0b, '\f'}, {0x0e, 0x1f}, {'!', '!'}, {'#', '%'}, {'(', '9'}, {'=', '='}, {'?', 'z'},
+  {'|', '|'}, {'~', 0x10ffff},
+};
 
 static bool ts_lex(TSLexer *lexer, TSStateId state) {
   START_LEXER();
@@ -634,245 +638,283 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
   switch (state) {
     case 0:
       if (eof) ADVANCE(44);
-      if (lookahead == '!') ADVANCE(50);
-      if (lookahead == '"') ADVANCE(96);
-      if (lookahead == '&') ADVANCE(45);
-      if (lookahead == ':') ADVANCE(93);
-      if (lookahead == ';') ADVANCE(46);
-      if (lookahead == '<') ADVANCE(39);
-      if (lookahead == '=') ADVANCE(108);
-      if (lookahead == '@') ADVANCE(49);
-      if (lookahead == '[') ADVANCE(101);
-      if (lookahead == '\\') ADVANCE(42);
-      if (lookahead == ']') ADVANCE(103);
-      if (lookahead == 'c') ADVANCE(6);
-      if (lookahead == 'd') ADVANCE(13);
-      if (lookahead == 'f') ADVANCE(37);
-      if (lookahead == 'i') ADVANCE(18);
-      if (lookahead == 'n') ADVANCE(7);
-      if (lookahead == 'u') ADVANCE(31);
-      if (lookahead == 'w') ADVANCE(20);
-      if (lookahead == '{') ADVANCE(51);
-      if (lookahead == '|') ADVANCE(58);
-      if (lookahead == '}') ADVANCE(56);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') SKIP(0)
-      if (lookahead == '%' ||
-          lookahead == '*' ||
-          lookahead == '+' ||
-          lookahead == '-' ||
-          lookahead == '/') ADVANCE(105);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(94);
+      ADVANCE_MAP(
+        '!', 50,
+        '"', 100,
+        '&', 45,
+        ':', 97,
+        ';', 46,
+        '<', 102,
+        '=', 113,
+        '>', 103,
+        '@', 49,
+        '[', 106,
+        '\\', 42,
+        ']', 108,
+        'c', 7,
+        'd', 14,
+        'f', 38,
+        'i', 19,
+        'n', 8,
+        'u', 32,
+        'w', 21,
+        '{', 51,
+        '|', 59,
+        '}', 56,
+        '%', 110,
+        '*', 110,
+        '+', 110,
+        '-', 110,
+        '/', 110,
+      );
+      if (('\t' <= lookahead && lookahead <= '\r') ||
+          lookahead == ' ') SKIP(0);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(98);
       END_STATE();
     case 1:
-      if (lookahead == '\n') SKIP(1)
+      if (lookahead == '\n') SKIP(1);
       if (lookahead == '{') ADVANCE(51);
       if (lookahead == '}') ADVANCE(56);
-      if (lookahead == '\t' ||
-          lookahead == '\r' ||
+      if (('\t' <= lookahead && lookahead <= '\r') ||
           lookahead == ' ') ADVANCE(54);
       if (lookahead != 0) ADVANCE(52);
       END_STATE();
     case 2:
-      if (lookahead == '\n') SKIP(2)
-      if (lookahead == '"') ADVANCE(96);
+      if (lookahead == '\n') SKIP(2);
+      if (lookahead == '"') ADVANCE(100);
       if (lookahead == '\\') ADVANCE(55);
-      if (lookahead == '\t' ||
-          lookahead == '\r' ||
+      if (('\t' <= lookahead && lookahead <= '\r') ||
           lookahead == ' ') ADVANCE(53);
       if (lookahead != 0) ADVANCE(52);
       END_STATE();
     case 3:
-      if (lookahead == '"') ADVANCE(96);
-      if (lookahead == '&') ADVANCE(45);
-      if (lookahead == ':') ADVANCE(93);
-      if (lookahead == '<') ADVANCE(90);
-      if (lookahead == '[') ADVANCE(102);
-      if (lookahead == ']') ADVANCE(104);
-      if (lookahead == 'c') ADVANCE(60);
-      if (lookahead == 'd') ADVANCE(66);
-      if (lookahead == 'f') ADVANCE(88);
-      if (lookahead == 'i') ADVANCE(70);
-      if (lookahead == 'u') ADVANCE(81);
-      if (lookahead == 'w') ADVANCE(72);
-      if (lookahead == '{') ADVANCE(51);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') SKIP(3)
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(59);
+      ADVANCE_MAP(
+        '"', 100,
+        '&', 45,
+        ':', 97,
+        '<', 102,
+        '[', 107,
+        ']', 109,
+        'c', 64,
+        'd', 70,
+        'f', 92,
+        'i', 74,
+        'u', 85,
+        'w', 76,
+        '{', 51,
+        0x0b, 61,
+        '\f', 61,
+      );
+      if (('\t' <= lookahead && lookahead <= '\r') ||
+          lookahead == ' ') SKIP(3);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(60);
       if (lookahead != 0 &&
+          lookahead != '&' &&
           lookahead != '\'' &&
-          lookahead != ';' &&
-          lookahead != '}') ADVANCE(92);
+          (lookahead < '0' || '<' < lookahead) &&
+          lookahead != '>' &&
+          lookahead != '}') ADVANCE(96);
       END_STATE();
     case 4:
-      if (lookahead == '&') ADVANCE(45);
-      if (lookahead == ':') ADVANCE(93);
-      if (lookahead == ';') ADVANCE(46);
-      if (lookahead == '}') ADVANCE(56);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') SKIP(4)
+      ADVANCE_MAP(
+        '"', 100,
+        '&', 45,
+        ':', 97,
+        '<', 102,
+        '[', 107,
+        'c', 64,
+        'd', 70,
+        'f', 92,
+        'i', 74,
+        'u', 85,
+        'w', 76,
+        '{', 51,
+        0x0b, 63,
+        '\f', 63,
+        '\t', 117,
+        '\n', 117,
+        '\r', 117,
+        ' ', 117,
+      );
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(60);
       if (lookahead != 0 &&
-          lookahead != '"' &&
+          lookahead != '&' &&
           lookahead != '\'' &&
-          lookahead != '{') ADVANCE(92);
+          (lookahead < '0' || '<' < lookahead) &&
+          lookahead != '>' &&
+          lookahead != '}') ADVANCE(96);
       END_STATE();
     case 5:
-      if (lookahead == ':') ADVANCE(93);
+      if (lookahead == '&') ADVANCE(45);
+      if (lookahead == ':') ADVANCE(97);
       if (lookahead == ';') ADVANCE(46);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(112);
+      if (lookahead == '}') ADVANCE(56);
+      if (lookahead == 0x0b ||
+          lookahead == '\f') ADVANCE(94);
+      if (('\t' <= lookahead && lookahead <= '\r') ||
+          lookahead == ' ') SKIP(5);
+      if (lookahead != 0 &&
+          lookahead != '"' &&
+          lookahead != '&' &&
+          lookahead != '\'' &&
+          (lookahead < ':' || '<' < lookahead) &&
+          lookahead != '>' &&
+          lookahead != '{') ADVANCE(96);
       END_STATE();
     case 6:
-      if (lookahead == 'a') ADVANCE(33);
-      if (lookahead == 'o') ADVANCE(26);
+      if (lookahead == ':') ADVANCE(97);
+      if (lookahead == ';') ADVANCE(46);
+      if (lookahead == '<') ADVANCE(102);
+      if (lookahead == '>') ADVANCE(103);
+      if (lookahead == 0x0b ||
+          lookahead == '\f') SKIP(6);
+      if (('\t' <= lookahead && lookahead <= '\r') ||
+          lookahead == ' ') ADVANCE(118);
       END_STATE();
     case 7:
-      if (lookahead == 'a') ADVANCE(25);
+      if (lookahead == 'a') ADVANCE(34);
+      if (lookahead == 'o') ADVANCE(27);
       END_STATE();
     case 8:
-      if (lookahead == 'a') ADVANCE(12);
+      if (lookahead == 'a') ADVANCE(26);
       END_STATE();
     case 9:
-      if (lookahead == 'c') ADVANCE(47);
+      if (lookahead == 'a') ADVANCE(13);
       END_STATE();
     case 10:
-      if (lookahead == 'c') ADVANCE(22);
+      if (lookahead == 'c') ADVANCE(47);
       END_STATE();
     case 11:
-      if (lookahead == 'c') ADVANCE(36);
+      if (lookahead == 'c') ADVANCE(23);
       END_STATE();
     case 12:
-      if (lookahead == 'c') ADVANCE(16);
+      if (lookahead == 'c') ADVANCE(37);
       END_STATE();
     case 13:
-      if (lookahead == 'e') ADVANCE(19);
+      if (lookahead == 'c') ADVANCE(17);
       END_STATE();
     case 14:
-      if (lookahead == 'e') ADVANCE(121);
+      if (lookahead == 'e') ADVANCE(20);
       END_STATE();
     case 15:
-      if (lookahead == 'e') ADVANCE(115);
+      if (lookahead == 'e') ADVANCE(127);
       END_STATE();
     case 16:
-      if (lookahead == 'e') ADVANCE(111);
+      if (lookahead == 'e') ADVANCE(121);
       END_STATE();
     case 17:
-      if (lookahead == 'e') ADVANCE(30);
+      if (lookahead == 'e') ADVANCE(116);
       END_STATE();
     case 18:
-      if (lookahead == 'f') ADVANCE(113);
-      if (lookahead == 'n') ADVANCE(120);
+      if (lookahead == 'e') ADVANCE(31);
       END_STATE();
     case 19:
-      if (lookahead == 'f') ADVANCE(106);
+      if (lookahead == 'f') ADVANCE(119);
+      if (lookahead == 'n') ADVANCE(126);
       END_STATE();
     case 20:
-      if (lookahead == 'h') ADVANCE(23);
-      if (lookahead == 'i') ADVANCE(34);
+      if (lookahead == 'f') ADVANCE(111);
       END_STATE();
     case 21:
-      if (lookahead == 'h') ADVANCE(99);
+      if (lookahead == 'h') ADVANCE(24);
+      if (lookahead == 'i') ADVANCE(35);
       END_STATE();
     case 22:
-      if (lookahead == 'h') ADVANCE(117);
+      if (lookahead == 'h') ADVANCE(104);
       END_STATE();
     case 23:
-      if (lookahead == 'i') ADVANCE(24);
+      if (lookahead == 'h') ADVANCE(123);
       END_STATE();
     case 24:
-      if (lookahead == 'l') ADVANCE(15);
+      if (lookahead == 'i') ADVANCE(25);
       END_STATE();
     case 25:
-      if (lookahead == 'm') ADVANCE(17);
+      if (lookahead == 'l') ADVANCE(16);
       END_STATE();
     case 26:
-      if (lookahead == 'n') ADVANCE(32);
+      if (lookahead == 'm') ADVANCE(18);
       END_STATE();
     case 27:
-      if (lookahead == 'n') ADVANCE(9);
+      if (lookahead == 'n') ADVANCE(33);
       END_STATE();
     case 28:
-      if (lookahead == 'p') ADVANCE(8);
+      if (lookahead == 'n') ADVANCE(10);
       END_STATE();
     case 29:
-      if (lookahead == 'r') ADVANCE(38);
+      if (lookahead == 'p') ADVANCE(9);
       END_STATE();
     case 30:
-      if (lookahead == 's') ADVANCE(28);
+      if (lookahead == 'r') ADVANCE(39);
       END_STATE();
     case 31:
-      if (lookahead == 's') ADVANCE(14);
+      if (lookahead == 's') ADVANCE(29);
       END_STATE();
     case 32:
-      if (lookahead == 's') ADVANCE(35);
+      if (lookahead == 's') ADVANCE(15);
       END_STATE();
     case 33:
-      if (lookahead == 't') ADVANCE(10);
+      if (lookahead == 's') ADVANCE(36);
       END_STATE();
     case 34:
-      if (lookahead == 't') ADVANCE(21);
+      if (lookahead == 't') ADVANCE(11);
       END_STATE();
     case 35:
-      if (lookahead == 't') ADVANCE(29);
+      if (lookahead == 't') ADVANCE(22);
       END_STATE();
     case 36:
-      if (lookahead == 't') ADVANCE(109);
+      if (lookahead == 't') ADVANCE(30);
       END_STATE();
     case 37:
-      if (lookahead == 'u') ADVANCE(27);
+      if (lookahead == 't') ADVANCE(114);
       END_STATE();
     case 38:
-      if (lookahead == 'u') ADVANCE(11);
+      if (lookahead == 'u') ADVANCE(28);
       END_STATE();
     case 39:
-      if (lookahead == '{') ADVANCE(98);
+      if (lookahead == 'u') ADVANCE(12);
       END_STATE();
     case 40:
-      if (lookahead == '|') ADVANCE(58);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') SKIP(40)
-      if (lookahead != 0) ADVANCE(57);
+      if (lookahead == '|') ADVANCE(59);
+      if (lookahead == 0x0b ||
+          lookahead == '\f') ADVANCE(57);
+      if (('\t' <= lookahead && lookahead <= '\r') ||
+          lookahead == ' ') SKIP(40);
+      if (lookahead != 0) ADVANCE(58);
       END_STATE();
     case 41:
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(95);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(99);
       END_STATE();
     case 42:
       if (lookahead != 0 &&
-          lookahead != '\n') ADVANCE(97);
+          lookahead != '\n') ADVANCE(101);
       END_STATE();
     case 43:
       if (eof) ADVANCE(44);
-      if (lookahead == '"') ADVANCE(96);
-      if (lookahead == '&') ADVANCE(45);
-      if (lookahead == ':') ADVANCE(93);
-      if (lookahead == '<') ADVANCE(90);
-      if (lookahead == '[') ADVANCE(102);
-      if (lookahead == 'c') ADVANCE(60);
-      if (lookahead == 'd') ADVANCE(66);
-      if (lookahead == 'f') ADVANCE(88);
-      if (lookahead == 'i') ADVANCE(70);
-      if (lookahead == 'u') ADVANCE(81);
-      if (lookahead == 'w') ADVANCE(72);
-      if (lookahead == '{') ADVANCE(51);
-      if (lookahead == '}') ADVANCE(56);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') SKIP(43)
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(59);
+      ADVANCE_MAP(
+        '"', 100,
+        '&', 45,
+        ':', 97,
+        '<', 102,
+        '[', 107,
+        'c', 64,
+        'd', 70,
+        'f', 92,
+        'i', 74,
+        'u', 85,
+        'w', 76,
+        '{', 51,
+        '}', 56,
+        0x0b, 62,
+        '\f', 62,
+      );
+      if (('\t' <= lookahead && lookahead <= '\r') ||
+          lookahead == ' ') SKIP(43);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(60);
       if (lookahead != 0 &&
+          lookahead != '&' &&
           lookahead != '\'' &&
-          lookahead != ';') ADVANCE(92);
+          (lookahead < '0' || '<' < lookahead) &&
+          lookahead != '>') ADVANCE(96);
       END_STATE();
     case 44:
       ACCEPT_TOKEN(ts_builtin_sym_end);
@@ -888,7 +930,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 48:
       ACCEPT_TOKEN(anon_sym_func);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 49:
       ACCEPT_TOKEN(anon_sym_AT);
@@ -904,333 +946,403 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 53:
       ACCEPT_TOKEN(aux_sym_blocky_token1);
-      if (lookahead == '"') ADVANCE(96);
+      if (lookahead == '"') ADVANCE(100);
       if (lookahead == '\\') ADVANCE(55);
       if (lookahead == '\t' ||
-          lookahead == '\r' ||
+          (0x0b <= lookahead && lookahead <= '\r') ||
           lookahead == ' ') ADVANCE(53);
       if (lookahead != 0 &&
-          lookahead != '\n') ADVANCE(52);
+          (lookahead < '\t' || '\r' < lookahead)) ADVANCE(52);
       END_STATE();
     case 54:
       ACCEPT_TOKEN(aux_sym_blocky_token1);
       if (lookahead == '{') ADVANCE(51);
       if (lookahead == '}') ADVANCE(56);
       if (lookahead == '\t' ||
-          lookahead == '\r' ||
+          (0x0b <= lookahead && lookahead <= '\r') ||
           lookahead == ' ') ADVANCE(54);
       if (lookahead != 0 &&
-          lookahead != '\n') ADVANCE(52);
+          (lookahead < '\t' || '\r' < lookahead)) ADVANCE(52);
       END_STATE();
     case 55:
       ACCEPT_TOKEN(aux_sym_blocky_token1);
       if (lookahead != 0 &&
-          lookahead != '\n') ADVANCE(97);
+          lookahead != '\n') ADVANCE(101);
       END_STATE();
     case 56:
       ACCEPT_TOKEN(anon_sym_RBRACE);
       END_STATE();
     case 57:
+      ACCEPT_TOKEN(aux_sym_block_token1);
+      if (lookahead == 0x0b ||
+          lookahead == '\f') ADVANCE(57);
+      if (lookahead != 0 &&
+          (lookahead < '\t' || '\r' < lookahead) &&
+          lookahead != ' ' &&
+          lookahead != '|') ADVANCE(58);
+      END_STATE();
+    case 58:
       ACCEPT_TOKEN(aux_sym_block_token1);
       if (lookahead != 0 &&
           lookahead != '\t' &&
           lookahead != '\n' &&
           lookahead != '\r' &&
           lookahead != ' ' &&
-          lookahead != '|') ADVANCE(57);
-      END_STATE();
-    case 58:
-      ACCEPT_TOKEN(anon_sym_PIPE);
+          lookahead != '|') ADVANCE(58);
       END_STATE();
     case 59:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == '.') ADVANCE(91);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(59);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      ACCEPT_TOKEN(anon_sym_PIPE);
       END_STATE();
     case 60:
       ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'a') ADVANCE(86);
-      if (lookahead == 'o') ADVANCE(78);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      if (lookahead == '.') ADVANCE(95);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(60);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 61:
       ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'c') ADVANCE(76);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      ADVANCE_MAP(
+        '[', 107,
+        ']', 109,
+        'c', 64,
+        'd', 70,
+        'f', 92,
+        'i', 74,
+        'u', 85,
+        'w', 76,
+        0x0b, 61,
+        '\f', 61,
+      );
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(60);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 62:
       ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'c') ADVANCE(48);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      ADVANCE_MAP(
+        '[', 107,
+        'c', 64,
+        'd', 70,
+        'f', 92,
+        'i', 74,
+        'u', 85,
+        'w', 76,
+        0x0b, 62,
+        '\f', 62,
+      );
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(60);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 63:
       ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'c') ADVANCE(74);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 64:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'c') ADVANCE(85);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 65:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'd') ADVANCE(69);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 66:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'e') ADVANCE(71);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 67:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'e') ADVANCE(122);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 68:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'e') ADVANCE(116);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 69:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'e') ADVANCE(119);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 70:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'f') ADVANCE(114);
-      if (lookahead == 'n') ADVANCE(61);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 71:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'f') ADVANCE(107);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 72:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'h') ADVANCE(75);
-      if (lookahead == 'i') ADVANCE(83);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 73:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'h') ADVANCE(100);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 74:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'h') ADVANCE(118);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 75:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'i') ADVANCE(77);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 76:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'l') ADVANCE(87);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 77:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'l') ADVANCE(68);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 78:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'n') ADVANCE(82);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 79:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'n') ADVANCE(62);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 80:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'r') ADVANCE(89);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 81:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 's') ADVANCE(67);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 82:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 's') ADVANCE(84);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 83:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 't') ADVANCE(73);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 84:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 't') ADVANCE(80);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 85:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 't') ADVANCE(110);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 86:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 't') ADVANCE(63);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 87:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'u') ADVANCE(65);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 88:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'u') ADVANCE(79);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 89:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == 'u') ADVANCE(64);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 90:
-      ACCEPT_TOKEN(sym_identifier);
-      if (lookahead == '{') ADVANCE(98);
+      ADVANCE_MAP(
+        '[', 107,
+        'c', 64,
+        'd', 70,
+        'f', 92,
+        'i', 74,
+        'u', 85,
+        'w', 76,
+        0x0b, 63,
+        '\f', 63,
+        '\t', 117,
+        '\n', 117,
+        '\r', 117,
+        ' ', 117,
+      );
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(60);
       if (lookahead != 0 &&
-          lookahead != '\t' &&
-          lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != ' ' &&
           lookahead != '"' &&
           lookahead != '&' &&
           lookahead != '\'' &&
-          lookahead != ':' &&
-          lookahead != ';' &&
-          lookahead != '}') ADVANCE(92);
+          (lookahead < '0' || '<' < lookahead) &&
+          lookahead != '>' &&
+          lookahead != '{' &&
+          lookahead != '}') ADVANCE(96);
+      END_STATE();
+    case 64:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'a') ADVANCE(90);
+      if (lookahead == 'o') ADVANCE(82);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 65:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'c') ADVANCE(80);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 66:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'c') ADVANCE(48);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 67:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'c') ADVANCE(78);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 68:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'c') ADVANCE(89);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 69:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'd') ADVANCE(73);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 70:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'e') ADVANCE(75);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 71:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'e') ADVANCE(128);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 72:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'e') ADVANCE(122);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 73:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'e') ADVANCE(125);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 74:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'f') ADVANCE(120);
+      if (lookahead == 'n') ADVANCE(65);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 75:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'f') ADVANCE(112);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 76:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'h') ADVANCE(79);
+      if (lookahead == 'i') ADVANCE(87);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 77:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'h') ADVANCE(105);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 78:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'h') ADVANCE(124);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 79:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'i') ADVANCE(81);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 80:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'l') ADVANCE(91);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 81:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'l') ADVANCE(72);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 82:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'n') ADVANCE(86);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 83:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'n') ADVANCE(66);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 84:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'r') ADVANCE(93);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 85:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 's') ADVANCE(71);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 86:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 's') ADVANCE(88);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 87:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 't') ADVANCE(77);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 88:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 't') ADVANCE(84);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 89:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 't') ADVANCE(115);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 90:
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 't') ADVANCE(67);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 91:
       ACCEPT_TOKEN(sym_identifier);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(91);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      if (lookahead == 'u') ADVANCE(69);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 92:
       ACCEPT_TOKEN(sym_identifier);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      if (lookahead == 'u') ADVANCE(83);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 93:
-      ACCEPT_TOKEN(anon_sym_COLON);
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 'u') ADVANCE(68);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 94:
-      ACCEPT_TOKEN(sym_number);
-      if (lookahead == '.') ADVANCE(41);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(94);
+      ACCEPT_TOKEN(sym_identifier);
+      if (lookahead == 0x0b ||
+          lookahead == '\f') ADVANCE(94);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 95:
-      ACCEPT_TOKEN(sym_number);
+      ACCEPT_TOKEN(sym_identifier);
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(95);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 96:
-      ACCEPT_TOKEN(anon_sym_DQUOTE);
+      ACCEPT_TOKEN(sym_identifier);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 97:
-      ACCEPT_TOKEN(aux_sym_string_token1);
+      ACCEPT_TOKEN(anon_sym_COLON);
       END_STATE();
     case 98:
-      ACCEPT_TOKEN(anon_sym_LT_LBRACE);
+      ACCEPT_TOKEN(sym_number);
+      if (lookahead == '.') ADVANCE(41);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(98);
       END_STATE();
     case 99:
-      ACCEPT_TOKEN(anon_sym_with);
+      ACCEPT_TOKEN(sym_number);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(99);
       END_STATE();
     case 100:
-      ACCEPT_TOKEN(anon_sym_with);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      ACCEPT_TOKEN(anon_sym_DQUOTE);
       END_STATE();
     case 101:
-      ACCEPT_TOKEN(anon_sym_LBRACK);
+      ACCEPT_TOKEN(aux_sym_string_token1);
       END_STATE();
     case 102:
-      ACCEPT_TOKEN(anon_sym_LBRACK);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      ACCEPT_TOKEN(anon_sym_LT);
       END_STATE();
     case 103:
-      ACCEPT_TOKEN(anon_sym_RBRACK);
+      ACCEPT_TOKEN(anon_sym_GT);
       END_STATE();
     case 104:
-      ACCEPT_TOKEN(anon_sym_RBRACK);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      ACCEPT_TOKEN(anon_sym_with);
       END_STATE();
     case 105:
-      ACCEPT_TOKEN(sym_operation);
+      ACCEPT_TOKEN(anon_sym_with);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 106:
-      ACCEPT_TOKEN(anon_sym_def);
+      ACCEPT_TOKEN(anon_sym_LBRACK);
       END_STATE();
     case 107:
-      ACCEPT_TOKEN(anon_sym_def);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      ACCEPT_TOKEN(anon_sym_LBRACK);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 108:
-      ACCEPT_TOKEN(anon_sym_EQ);
+      ACCEPT_TOKEN(anon_sym_RBRACK);
       END_STATE();
     case 109:
-      ACCEPT_TOKEN(anon_sym_construct);
+      ACCEPT_TOKEN(anon_sym_RBRACK);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 110:
-      ACCEPT_TOKEN(anon_sym_construct);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      ACCEPT_TOKEN(sym_operation);
       END_STATE();
     case 111:
-      ACCEPT_TOKEN(anon_sym_namespace);
+      ACCEPT_TOKEN(anon_sym_def);
       END_STATE();
     case 112:
+      ACCEPT_TOKEN(anon_sym_def);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 113:
+      ACCEPT_TOKEN(anon_sym_EQ);
+      END_STATE();
+    case 114:
+      ACCEPT_TOKEN(anon_sym_construct);
+      END_STATE();
+    case 115:
+      ACCEPT_TOKEN(anon_sym_construct);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 116:
+      ACCEPT_TOKEN(anon_sym_namespace);
+      END_STATE();
+    case 117:
+      ACCEPT_TOKEN(sym__spacing);
+      if (lookahead == 0x0b ||
+          lookahead == '\f') ADVANCE(63);
+      if (('\t' <= lookahead && lookahead <= '\r') ||
+          lookahead == ' ') ADVANCE(117);
+      END_STATE();
+    case 118:
       ACCEPT_TOKEN(sym__spacing);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(112);
-      END_STATE();
-    case 113:
-      ACCEPT_TOKEN(anon_sym_if);
-      END_STATE();
-    case 114:
-      ACCEPT_TOKEN(anon_sym_if);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 115:
-      ACCEPT_TOKEN(anon_sym_while);
-      END_STATE();
-    case 116:
-      ACCEPT_TOKEN(anon_sym_while);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
-      END_STATE();
-    case 117:
-      ACCEPT_TOKEN(anon_sym_catch);
-      END_STATE();
-    case 118:
-      ACCEPT_TOKEN(anon_sym_catch);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+          lookahead == ' ') ADVANCE(118);
       END_STATE();
     case 119:
-      ACCEPT_TOKEN(anon_sym_include);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      ACCEPT_TOKEN(anon_sym_if);
       END_STATE();
     case 120:
-      ACCEPT_TOKEN(anon_sym_in);
+      ACCEPT_TOKEN(anon_sym_if);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     case 121:
-      ACCEPT_TOKEN(anon_sym_use);
+      ACCEPT_TOKEN(anon_sym_while);
       END_STATE();
     case 122:
+      ACCEPT_TOKEN(anon_sym_while);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 123:
+      ACCEPT_TOKEN(anon_sym_catch);
+      END_STATE();
+    case 124:
+      ACCEPT_TOKEN(anon_sym_catch);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 125:
+      ACCEPT_TOKEN(anon_sym_include);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
+      END_STATE();
+    case 126:
+      ACCEPT_TOKEN(anon_sym_in);
+      END_STATE();
+    case 127:
       ACCEPT_TOKEN(anon_sym_use);
-      if (!sym_identifier_character_set_1(lookahead)) ADVANCE(92);
+      END_STATE();
+    case 128:
+      ACCEPT_TOKEN(anon_sym_use);
+      if ((!eof && set_contains(sym_identifier_character_set_1, 10, lookahead))) ADVANCE(96);
       END_STATE();
     default:
       return false;
@@ -1242,18 +1354,18 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [1] = {.lex_state = 43},
   [2] = {.lex_state = 43},
   [3] = {.lex_state = 43},
-  [4] = {.lex_state = 3},
-  [5] = {.lex_state = 43},
+  [4] = {.lex_state = 43},
+  [5] = {.lex_state = 3},
   [6] = {.lex_state = 43},
   [7] = {.lex_state = 43},
-  [8] = {.lex_state = 43},
+  [8] = {.lex_state = 4},
   [9] = {.lex_state = 43},
-  [10] = {.lex_state = 3},
-  [11] = {.lex_state = 3},
+  [10] = {.lex_state = 43},
+  [11] = {.lex_state = 43},
   [12] = {.lex_state = 43},
-  [13] = {.lex_state = 43},
+  [13] = {.lex_state = 3},
   [14] = {.lex_state = 43},
-  [15] = {.lex_state = 43},
+  [15] = {.lex_state = 3},
   [16] = {.lex_state = 43},
   [17] = {.lex_state = 43},
   [18] = {.lex_state = 43},
@@ -1269,145 +1381,145 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [28] = {.lex_state = 43},
   [29] = {.lex_state = 43},
   [30] = {.lex_state = 3},
-  [31] = {.lex_state = 3},
-  [32] = {.lex_state = 3},
+  [31] = {.lex_state = 6},
+  [32] = {.lex_state = 6},
   [33] = {.lex_state = 1},
   [34] = {.lex_state = 1},
-  [35] = {.lex_state = 4},
-  [36] = {.lex_state = 1},
-  [37] = {.lex_state = 1},
-  [38] = {.lex_state = 1},
-  [39] = {.lex_state = 4},
-  [40] = {.lex_state = 4},
-  [41] = {.lex_state = 2},
-  [42] = {.lex_state = 4},
-  [43] = {.lex_state = 4},
-  [44] = {.lex_state = 4},
-  [45] = {.lex_state = 2},
-  [46] = {.lex_state = 2},
-  [47] = {.lex_state = 4},
-  [48] = {.lex_state = 4},
-  [49] = {.lex_state = 4},
-  [50] = {.lex_state = 40},
+  [35] = {.lex_state = 6},
+  [36] = {.lex_state = 6},
+  [37] = {.lex_state = 6},
+  [38] = {.lex_state = 6},
+  [39] = {.lex_state = 6},
+  [40] = {.lex_state = 5},
+  [41] = {.lex_state = 1},
+  [42] = {.lex_state = 1},
+  [43] = {.lex_state = 1},
+  [44] = {.lex_state = 6},
+  [45] = {.lex_state = 6},
+  [46] = {.lex_state = 6},
+  [47] = {.lex_state = 6},
+  [48] = {.lex_state = 5},
+  [49] = {.lex_state = 5},
+  [50] = {.lex_state = 6},
   [51] = {.lex_state = 5},
-  [52] = {.lex_state = 5},
-  [53] = {.lex_state = 4},
-  [54] = {.lex_state = 4},
-  [55] = {.lex_state = 4},
-  [56] = {.lex_state = 4},
-  [57] = {.lex_state = 4},
-  [58] = {.lex_state = 4},
-  [59] = {.lex_state = 4},
-  [60] = {.lex_state = 4},
-  [61] = {.lex_state = 4},
-  [62] = {.lex_state = 4},
+  [52] = {.lex_state = 6},
+  [53] = {.lex_state = 6},
+  [54] = {.lex_state = 2},
+  [55] = {.lex_state = 6},
+  [56] = {.lex_state = 6},
+  [57] = {.lex_state = 6},
+  [58] = {.lex_state = 6},
+  [59] = {.lex_state = 6},
+  [60] = {.lex_state = 5},
+  [61] = {.lex_state = 6},
+  [62] = {.lex_state = 6},
   [63] = {.lex_state = 5},
-  [64] = {.lex_state = 5},
-  [65] = {.lex_state = 5},
-  [66] = {.lex_state = 0},
-  [67] = {.lex_state = 40},
-  [68] = {.lex_state = 5},
-  [69] = {.lex_state = 4},
-  [70] = {.lex_state = 4},
-  [71] = {.lex_state = 40},
-  [72] = {.lex_state = 4},
-  [73] = {.lex_state = 1},
-  [74] = {.lex_state = 4},
-  [75] = {.lex_state = 1},
-  [76] = {.lex_state = 5},
-  [77] = {.lex_state = 5},
-  [78] = {.lex_state = 5},
-  [79] = {.lex_state = 5},
-  [80] = {.lex_state = 5},
-  [81] = {.lex_state = 5},
-  [82] = {.lex_state = 0},
-  [83] = {.lex_state = 5},
-  [84] = {.lex_state = 5},
-  [85] = {.lex_state = 5},
-  [86] = {.lex_state = 5},
-  [87] = {.lex_state = 5},
+  [64] = {.lex_state = 6},
+  [65] = {.lex_state = 6},
+  [66] = {.lex_state = 5},
+  [67] = {.lex_state = 6},
+  [68] = {.lex_state = 6},
+  [69] = {.lex_state = 6},
+  [70] = {.lex_state = 6},
+  [71] = {.lex_state = 6},
+  [72] = {.lex_state = 6},
+  [73] = {.lex_state = 6},
+  [74] = {.lex_state = 6},
+  [75] = {.lex_state = 6},
+  [76] = {.lex_state = 6},
+  [77] = {.lex_state = 6},
+  [78] = {.lex_state = 2},
+  [79] = {.lex_state = 6},
+  [80] = {.lex_state = 6},
+  [81] = {.lex_state = 6},
+  [82] = {.lex_state = 6},
+  [83] = {.lex_state = 2},
+  [84] = {.lex_state = 6},
+  [85] = {.lex_state = 6},
+  [86] = {.lex_state = 6},
+  [87] = {.lex_state = 6},
   [88] = {.lex_state = 5},
   [89] = {.lex_state = 5},
-  [90] = {.lex_state = 5},
-  [91] = {.lex_state = 5},
+  [90] = {.lex_state = 1},
+  [91] = {.lex_state = 1},
   [92] = {.lex_state = 5},
-  [93] = {.lex_state = 40},
+  [93] = {.lex_state = 5},
   [94] = {.lex_state = 5},
-  [95] = {.lex_state = 5},
+  [95] = {.lex_state = 40},
   [96] = {.lex_state = 5},
   [97] = {.lex_state = 5},
   [98] = {.lex_state = 5},
   [99] = {.lex_state = 5},
-  [100] = {.lex_state = 4},
+  [100] = {.lex_state = 40},
   [101] = {.lex_state = 5},
   [102] = {.lex_state = 5},
-  [103] = {.lex_state = 5},
-  [104] = {.lex_state = 0},
+  [103] = {.lex_state = 0},
+  [104] = {.lex_state = 40},
   [105] = {.lex_state = 5},
   [106] = {.lex_state = 5},
   [107] = {.lex_state = 5},
   [108] = {.lex_state = 5},
   [109] = {.lex_state = 5},
-  [110] = {.lex_state = 5},
-  [111] = {.lex_state = 5},
-  [112] = {.lex_state = 5},
-  [113] = {.lex_state = 5},
-  [114] = {.lex_state = 5},
-  [115] = {.lex_state = 5},
-  [116] = {.lex_state = 5},
+  [110] = {.lex_state = 6},
+  [111] = {.lex_state = 0},
+  [112] = {.lex_state = 6},
+  [113] = {.lex_state = 6},
+  [114] = {.lex_state = 6},
+  [115] = {.lex_state = 40},
+  [116] = {.lex_state = 0},
   [117] = {.lex_state = 0},
-  [118] = {.lex_state = 0},
-  [119] = {.lex_state = 5},
-  [120] = {.lex_state = 0},
-  [121] = {.lex_state = 5},
-  [122] = {.lex_state = 5},
-  [123] = {.lex_state = 5},
-  [124] = {.lex_state = 5},
-  [125] = {.lex_state = 5},
-  [126] = {.lex_state = 5},
-  [127] = {.lex_state = 5},
-  [128] = {.lex_state = 5},
-  [129] = {.lex_state = 5},
-  [130] = {.lex_state = 5},
-  [131] = {.lex_state = 5},
-  [132] = {.lex_state = 4},
-  [133] = {.lex_state = 5},
-  [134] = {.lex_state = 0},
-  [135] = {.lex_state = 0},
-  [136] = {.lex_state = 0},
+  [118] = {.lex_state = 6},
+  [119] = {.lex_state = 6},
+  [120] = {.lex_state = 6},
+  [121] = {.lex_state = 0},
+  [122] = {.lex_state = 0},
+  [123] = {.lex_state = 6},
+  [124] = {.lex_state = 6},
+  [125] = {.lex_state = 6},
+  [126] = {.lex_state = 6},
+  [127] = {.lex_state = 0},
+  [128] = {.lex_state = 6},
+  [129] = {.lex_state = 0},
+  [130] = {.lex_state = 6},
+  [131] = {.lex_state = 6},
+  [132] = {.lex_state = 6},
+  [133] = {.lex_state = 6},
+  [134] = {.lex_state = 5},
+  [135] = {.lex_state = 6},
+  [136] = {.lex_state = 6},
   [137] = {.lex_state = 0},
-  [138] = {.lex_state = 5},
-  [139] = {.lex_state = 4},
-  [140] = {.lex_state = 0},
-  [141] = {.lex_state = 5},
+  [138] = {.lex_state = 0},
+  [139] = {.lex_state = 0},
+  [140] = {.lex_state = 6},
+  [141] = {.lex_state = 0},
   [142] = {.lex_state = 0},
-  [143] = {.lex_state = 5},
+  [143] = {.lex_state = 6},
   [144] = {.lex_state = 5},
-  [145] = {.lex_state = 4},
-  [146] = {.lex_state = 5},
-  [147] = {.lex_state = 0},
-  [148] = {.lex_state = 0},
+  [145] = {.lex_state = 6},
+  [146] = {.lex_state = 6},
+  [147] = {.lex_state = 6},
+  [148] = {.lex_state = 6},
   [149] = {.lex_state = 5},
   [150] = {.lex_state = 5},
-  [151] = {.lex_state = 5},
-  [152] = {.lex_state = 4},
-  [153] = {.lex_state = 5},
-  [154] = {.lex_state = 5},
-  [155] = {.lex_state = 5},
+  [151] = {.lex_state = 6},
+  [152] = {.lex_state = 0},
+  [153] = {.lex_state = 6},
+  [154] = {.lex_state = 0},
+  [155] = {.lex_state = 6},
   [156] = {.lex_state = 5},
-  [157] = {.lex_state = 5},
-  [158] = {.lex_state = 5},
-  [159] = {.lex_state = 5},
-  [160] = {.lex_state = 5},
-  [161] = {.lex_state = 5},
-  [162] = {.lex_state = 4},
-  [163] = {.lex_state = 5},
-  [164] = {.lex_state = 5},
-  [165] = {.lex_state = 5},
-  [166] = {.lex_state = 0},
-  [167] = {.lex_state = 4},
-  [168] = {.lex_state = 4},
-  [169] = {.lex_state = 5},
+  [157] = {.lex_state = 6},
+  [158] = {.lex_state = 6},
+  [159] = {.lex_state = 6},
+  [160] = {.lex_state = 6},
+  [161] = {.lex_state = 6},
+  [162] = {.lex_state = 6},
+  [163] = {.lex_state = 6},
+  [164] = {.lex_state = 6},
+  [165] = {.lex_state = 6},
+  [166] = {.lex_state = 5},
+  [167] = {.lex_state = 6},
+  [168] = {.lex_state = 5},
+  [169] = {.lex_state = 6},
 };
 
 static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
@@ -1425,7 +1537,8 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_number] = ACTIONS(1),
     [anon_sym_DQUOTE] = ACTIONS(1),
     [aux_sym_string_token1] = ACTIONS(1),
-    [anon_sym_LT_LBRACE] = ACTIONS(1),
+    [anon_sym_LT] = ACTIONS(1),
+    [anon_sym_GT] = ACTIONS(1),
     [anon_sym_with] = ACTIONS(1),
     [anon_sym_LBRACK] = ACTIONS(1),
     [anon_sym_RBRACK] = ACTIONS(1),
@@ -1441,25 +1554,26 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(1),
   },
   [1] = {
-    [sym_source_file] = STATE(148),
-    [sym__statement] = STATE(21),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(21),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym_source_file] = STATE(154),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(22),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(22),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [ts_builtin_sym_end] = ACTIONS(3),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
@@ -1468,7 +1582,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -1480,72 +1594,74 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [2] = {
+    [sym__unspaced_statement] = STATE(151),
     [sym__statement] = STATE(2),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
     [aux_sym_source_file_repeat1] = STATE(2),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [ts_builtin_sym_end] = ACTIONS(39),
     [anon_sym_AMP] = ACTIONS(41),
     [anon_sym_func] = ACTIONS(44),
     [anon_sym_LBRACE] = ACTIONS(47),
-    [anon_sym_RBRACE] = ACTIONS(39),
-    [sym_identifier] = ACTIONS(50),
-    [anon_sym_COLON] = ACTIONS(53),
-    [sym_number] = ACTIONS(56),
-    [anon_sym_DQUOTE] = ACTIONS(59),
-    [anon_sym_LT_LBRACE] = ACTIONS(62),
-    [anon_sym_with] = ACTIONS(65),
-    [anon_sym_LBRACK] = ACTIONS(68),
-    [anon_sym_def] = ACTIONS(71),
-    [anon_sym_construct] = ACTIONS(74),
-    [anon_sym_if] = ACTIONS(77),
-    [anon_sym_while] = ACTIONS(80),
-    [anon_sym_catch] = ACTIONS(83),
-    [anon_sym_include] = ACTIONS(86),
-    [anon_sym_use] = ACTIONS(89),
+    [anon_sym_RBRACE] = ACTIONS(50),
+    [sym_identifier] = ACTIONS(52),
+    [anon_sym_COLON] = ACTIONS(55),
+    [sym_number] = ACTIONS(58),
+    [anon_sym_DQUOTE] = ACTIONS(61),
+    [anon_sym_LT] = ACTIONS(64),
+    [anon_sym_with] = ACTIONS(67),
+    [anon_sym_LBRACK] = ACTIONS(70),
+    [anon_sym_def] = ACTIONS(73),
+    [anon_sym_construct] = ACTIONS(76),
+    [anon_sym_if] = ACTIONS(79),
+    [anon_sym_while] = ACTIONS(82),
+    [anon_sym_catch] = ACTIONS(85),
+    [anon_sym_include] = ACTIONS(88),
+    [anon_sym_use] = ACTIONS(91),
   },
   [3] = {
-    [sym__statement] = STATE(24),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(24),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(2),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(2),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(92),
+    [anon_sym_RBRACE] = ACTIONS(94),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -1557,35 +1673,36 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [4] = {
-    [sym__statement] = STATE(11),
-    [sym_function_definition] = STATE(84),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(76),
-    [sym_string] = STATE(84),
-    [sym_expression] = STATE(84),
-    [sym_with_expr] = STATE(84),
-    [sym_array] = STATE(84),
-    [sym_type_definition] = STATE(84),
-    [sym_if] = STATE(84),
-    [sym_while] = STATE(84),
-    [sym_catch] = STATE(84),
-    [sym_include] = STATE(84),
-    [sym_use] = STATE(84),
-    [sym_def] = STATE(84),
-    [aux_sym_source_file_repeat1] = STATE(11),
-    [aux_sym__statement_repeat1] = STATE(39),
-    [anon_sym_AMP] = ACTIONS(94),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(2),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(2),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
+    [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
+    [anon_sym_RBRACE] = ACTIONS(96),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
-    [sym_number] = ACTIONS(96),
+    [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
-    [anon_sym_RBRACK] = ACTIONS(98),
     [anon_sym_def] = ACTIONS(25),
     [anon_sym_construct] = ACTIONS(27),
     [anon_sym_if] = ACTIONS(29),
@@ -1595,71 +1712,73 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [5] = {
-    [sym__statement] = STATE(18),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(18),
-    [aux_sym__statement_repeat1] = STATE(35),
-    [anon_sym_AMP] = ACTIONS(5),
-    [anon_sym_func] = ACTIONS(7),
-    [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(100),
-    [sym_identifier] = ACTIONS(11),
-    [anon_sym_COLON] = ACTIONS(13),
-    [sym_number] = ACTIONS(15),
-    [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
-    [anon_sym_with] = ACTIONS(21),
-    [anon_sym_LBRACK] = ACTIONS(23),
-    [anon_sym_def] = ACTIONS(25),
-    [anon_sym_construct] = ACTIONS(27),
-    [anon_sym_if] = ACTIONS(29),
-    [anon_sym_while] = ACTIONS(31),
-    [anon_sym_catch] = ACTIONS(33),
-    [anon_sym_include] = ACTIONS(35),
-    [anon_sym_use] = ACTIONS(37),
+    [sym__unspaced_statement] = STATE(167),
+    [sym__statement] = STATE(5),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(5),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
+    [anon_sym_AMP] = ACTIONS(41),
+    [anon_sym_func] = ACTIONS(44),
+    [anon_sym_LBRACE] = ACTIONS(47),
+    [sym_identifier] = ACTIONS(52),
+    [anon_sym_COLON] = ACTIONS(55),
+    [sym_number] = ACTIONS(58),
+    [anon_sym_DQUOTE] = ACTIONS(61),
+    [anon_sym_LT] = ACTIONS(64),
+    [anon_sym_with] = ACTIONS(67),
+    [anon_sym_LBRACK] = ACTIONS(70),
+    [anon_sym_RBRACK] = ACTIONS(50),
+    [anon_sym_def] = ACTIONS(73),
+    [anon_sym_construct] = ACTIONS(76),
+    [anon_sym_if] = ACTIONS(79),
+    [anon_sym_while] = ACTIONS(82),
+    [anon_sym_catch] = ACTIONS(85),
+    [anon_sym_include] = ACTIONS(88),
+    [anon_sym_use] = ACTIONS(91),
   },
   [6] = {
-    [sym__statement] = STATE(26),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(26),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(2),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(2),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(102),
+    [anon_sym_RBRACE] = ACTIONS(98),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -1671,33 +1790,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [7] = {
+    [sym__unspaced_statement] = STATE(151),
     [sym__statement] = STATE(2),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
     [aux_sym_source_file_repeat1] = STATE(2),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(104),
+    [anon_sym_RBRACE] = ACTIONS(100),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -1709,37 +1829,38 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [8] = {
-    [sym__statement] = STATE(19),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(19),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(113),
+    [sym__statement] = STATE(26),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(26),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(106),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
     [anon_sym_construct] = ACTIONS(27),
+    [sym__spacing] = ACTIONS(102),
     [anon_sym_if] = ACTIONS(29),
     [anon_sym_while] = ACTIONS(31),
     [anon_sym_catch] = ACTIONS(33),
@@ -1747,33 +1868,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [9] = {
+    [sym__unspaced_statement] = STATE(151),
     [sym__statement] = STATE(2),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
     [aux_sym_source_file_repeat1] = STATE(2),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(108),
+    [anon_sym_RBRACE] = ACTIONS(104),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -1785,35 +1907,36 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [10] = {
-    [sym__statement] = STATE(4),
-    [sym_function_definition] = STATE(84),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(76),
-    [sym_string] = STATE(84),
-    [sym_expression] = STATE(84),
-    [sym_with_expr] = STATE(84),
-    [sym_array] = STATE(84),
-    [sym_type_definition] = STATE(84),
-    [sym_if] = STATE(84),
-    [sym_while] = STATE(84),
-    [sym_catch] = STATE(84),
-    [sym_include] = STATE(84),
-    [sym_use] = STATE(84),
-    [sym_def] = STATE(84),
-    [aux_sym_source_file_repeat1] = STATE(4),
-    [aux_sym__statement_repeat1] = STATE(39),
-    [anon_sym_AMP] = ACTIONS(94),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(21),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(21),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
+    [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
+    [anon_sym_RBRACE] = ACTIONS(106),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
-    [sym_number] = ACTIONS(96),
+    [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
-    [anon_sym_RBRACK] = ACTIONS(110),
     [anon_sym_def] = ACTIONS(25),
     [anon_sym_construct] = ACTIONS(27),
     [anon_sym_if] = ACTIONS(29),
@@ -1823,71 +1946,73 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [11] = {
-    [sym__statement] = STATE(11),
-    [sym_function_definition] = STATE(84),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(76),
-    [sym_string] = STATE(84),
-    [sym_expression] = STATE(84),
-    [sym_with_expr] = STATE(84),
-    [sym_array] = STATE(84),
-    [sym_type_definition] = STATE(84),
-    [sym_if] = STATE(84),
-    [sym_while] = STATE(84),
-    [sym_catch] = STATE(84),
-    [sym_include] = STATE(84),
-    [sym_use] = STATE(84),
-    [sym_def] = STATE(84),
-    [aux_sym_source_file_repeat1] = STATE(11),
-    [aux_sym__statement_repeat1] = STATE(39),
-    [anon_sym_AMP] = ACTIONS(112),
-    [anon_sym_func] = ACTIONS(44),
-    [anon_sym_LBRACE] = ACTIONS(47),
-    [sym_identifier] = ACTIONS(50),
-    [anon_sym_COLON] = ACTIONS(53),
-    [sym_number] = ACTIONS(115),
-    [anon_sym_DQUOTE] = ACTIONS(59),
-    [anon_sym_LT_LBRACE] = ACTIONS(62),
-    [anon_sym_with] = ACTIONS(65),
-    [anon_sym_LBRACK] = ACTIONS(68),
-    [anon_sym_RBRACK] = ACTIONS(118),
-    [anon_sym_def] = ACTIONS(71),
-    [anon_sym_construct] = ACTIONS(74),
-    [anon_sym_if] = ACTIONS(77),
-    [anon_sym_while] = ACTIONS(80),
-    [anon_sym_catch] = ACTIONS(83),
-    [anon_sym_include] = ACTIONS(86),
-    [anon_sym_use] = ACTIONS(89),
-  },
-  [12] = {
-    [sym__statement] = STATE(20),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(20),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(2),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(2),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(120),
+    [anon_sym_RBRACE] = ACTIONS(106),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
+    [anon_sym_with] = ACTIONS(21),
+    [anon_sym_LBRACK] = ACTIONS(23),
+    [anon_sym_def] = ACTIONS(25),
+    [anon_sym_construct] = ACTIONS(27),
+    [anon_sym_if] = ACTIONS(29),
+    [anon_sym_while] = ACTIONS(31),
+    [anon_sym_catch] = ACTIONS(33),
+    [anon_sym_include] = ACTIONS(35),
+    [anon_sym_use] = ACTIONS(37),
+  },
+  [12] = {
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(2),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(2),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
+    [anon_sym_AMP] = ACTIONS(5),
+    [anon_sym_func] = ACTIONS(7),
+    [anon_sym_LBRACE] = ACTIONS(9),
+    [anon_sym_RBRACE] = ACTIONS(108),
+    [sym_identifier] = ACTIONS(11),
+    [anon_sym_COLON] = ACTIONS(13),
+    [sym_number] = ACTIONS(15),
+    [anon_sym_DQUOTE] = ACTIONS(17),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -1899,35 +2024,36 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [13] = {
-    [sym__statement] = STATE(23),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(23),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(167),
+    [sym__statement] = STATE(5),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(5),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(122),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
+    [anon_sym_RBRACK] = ACTIONS(110),
     [anon_sym_def] = ACTIONS(25),
     [anon_sym_construct] = ACTIONS(27),
     [anon_sym_if] = ACTIONS(29),
@@ -1937,33 +2063,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [14] = {
-    [sym__statement] = STATE(17),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(17),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(2),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(2),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(124),
+    [anon_sym_RBRACE] = ACTIONS(112),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -1975,35 +2102,36 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [15] = {
-    [sym__statement] = STATE(9),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(9),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(167),
+    [sym__statement] = STATE(13),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(13),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(126),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
+    [anon_sym_RBRACK] = ACTIONS(114),
     [anon_sym_def] = ACTIONS(25),
     [anon_sym_construct] = ACTIONS(27),
     [anon_sym_if] = ACTIONS(29),
@@ -2013,33 +2141,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [16] = {
-    [sym__statement] = STATE(2),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(2),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(6),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(6),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(128),
+    [anon_sym_RBRACE] = ACTIONS(116),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -2051,33 +2180,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [17] = {
-    [sym__statement] = STATE(2),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(2),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(11),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(11),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(130),
+    [anon_sym_RBRACE] = ACTIONS(118),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -2089,33 +2219,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [18] = {
-    [sym__statement] = STATE(2),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(2),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(9),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(9),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(126),
+    [anon_sym_RBRACE] = ACTIONS(120),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -2127,33 +2258,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [19] = {
-    [sym__statement] = STATE(2),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(2),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(12),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(12),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(132),
+    [anon_sym_RBRACE] = ACTIONS(122),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -2165,33 +2297,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [20] = {
-    [sym__statement] = STATE(2),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(2),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(14),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(14),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(134),
+    [anon_sym_RBRACE] = ACTIONS(124),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -2203,33 +2336,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [21] = {
+    [sym__unspaced_statement] = STATE(151),
     [sym__statement] = STATE(2),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
     [aux_sym_source_file_repeat1] = STATE(2),
-    [aux_sym__statement_repeat1] = STATE(35),
-    [ts_builtin_sym_end] = ACTIONS(136),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
+    [anon_sym_RBRACE] = ACTIONS(126),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -2241,33 +2375,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [22] = {
-    [sym__statement] = STATE(7),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(7),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(2),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(2),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
+    [ts_builtin_sym_end] = ACTIONS(128),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(138),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -2279,33 +2414,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [23] = {
-    [sym__statement] = STATE(2),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(2),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(7),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(7),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(124),
+    [anon_sym_RBRACE] = ACTIONS(130),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -2317,33 +2453,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [24] = {
-    [sym__statement] = STATE(2),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(2),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(4),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(4),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(140),
+    [anon_sym_RBRACE] = ACTIONS(104),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -2355,33 +2492,34 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [25] = {
-    [sym__statement] = STATE(16),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
-    [aux_sym_source_file_repeat1] = STATE(16),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [sym__unspaced_statement] = STATE(151),
+    [sym__statement] = STATE(3),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(3),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(142),
+    [anon_sym_RBRACE] = ACTIONS(112),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -2393,33 +2531,109 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_use] = ACTIONS(37),
   },
   [26] = {
+    [sym__unspaced_statement] = STATE(110),
     [sym__statement] = STATE(2),
-    [sym_function_definition] = STATE(83),
-    [sym_func] = STATE(79),
-    [sym_block] = STATE(79),
-    [sym_call] = STATE(68),
-    [sym_string] = STATE(83),
-    [sym_expression] = STATE(83),
-    [sym_with_expr] = STATE(83),
-    [sym_array] = STATE(83),
-    [sym_type_definition] = STATE(83),
-    [sym_if] = STATE(83),
-    [sym_while] = STATE(83),
-    [sym_catch] = STATE(83),
-    [sym_include] = STATE(83),
-    [sym_use] = STATE(83),
-    [sym_def] = STATE(83),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
     [aux_sym_source_file_repeat1] = STATE(2),
-    [aux_sym__statement_repeat1] = STATE(35),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
     [anon_sym_AMP] = ACTIONS(5),
     [anon_sym_func] = ACTIONS(7),
     [anon_sym_LBRACE] = ACTIONS(9),
-    [anon_sym_RBRACE] = ACTIONS(142),
     [sym_identifier] = ACTIONS(11),
     [anon_sym_COLON] = ACTIONS(13),
     [sym_number] = ACTIONS(15),
     [anon_sym_DQUOTE] = ACTIONS(17),
-    [anon_sym_LT_LBRACE] = ACTIONS(19),
+    [anon_sym_LT] = ACTIONS(19),
+    [anon_sym_with] = ACTIONS(21),
+    [anon_sym_LBRACK] = ACTIONS(23),
+    [anon_sym_def] = ACTIONS(25),
+    [anon_sym_construct] = ACTIONS(27),
+    [anon_sym_if] = ACTIONS(29),
+    [anon_sym_while] = ACTIONS(31),
+    [anon_sym_catch] = ACTIONS(33),
+    [anon_sym_include] = ACTIONS(35),
+    [anon_sym_use] = ACTIONS(37),
+  },
+  [27] = {
+    [sym__unspaced_statement] = STATE(114),
+    [sym__statement] = STATE(2),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(2),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
+    [anon_sym_AMP] = ACTIONS(5),
+    [anon_sym_func] = ACTIONS(7),
+    [anon_sym_LBRACE] = ACTIONS(9),
+    [sym_identifier] = ACTIONS(11),
+    [anon_sym_COLON] = ACTIONS(13),
+    [sym_number] = ACTIONS(15),
+    [anon_sym_DQUOTE] = ACTIONS(17),
+    [anon_sym_LT] = ACTIONS(19),
+    [anon_sym_with] = ACTIONS(21),
+    [anon_sym_LBRACK] = ACTIONS(23),
+    [anon_sym_def] = ACTIONS(25),
+    [anon_sym_construct] = ACTIONS(27),
+    [anon_sym_if] = ACTIONS(29),
+    [anon_sym_while] = ACTIONS(31),
+    [anon_sym_catch] = ACTIONS(33),
+    [anon_sym_include] = ACTIONS(35),
+    [anon_sym_use] = ACTIONS(37),
+  },
+  [28] = {
+    [sym__unspaced_statement] = STATE(110),
+    [sym__statement] = STATE(27),
+    [sym_function_definition] = STATE(37),
+    [sym_func] = STATE(47),
+    [sym_block] = STATE(47),
+    [sym_call] = STATE(31),
+    [sym_string] = STATE(37),
+    [sym_call_expr] = STATE(37),
+    [sym_with_expr] = STATE(37),
+    [sym_array] = STATE(37),
+    [sym_type_definition] = STATE(37),
+    [sym_if] = STATE(37),
+    [sym_while] = STATE(37),
+    [sym_catch] = STATE(37),
+    [sym_include] = STATE(37),
+    [sym_use] = STATE(37),
+    [sym_def] = STATE(37),
+    [aux_sym_source_file_repeat1] = STATE(27),
+    [aux_sym__unspaced_statement_repeat1] = STATE(40),
+    [anon_sym_AMP] = ACTIONS(5),
+    [anon_sym_func] = ACTIONS(7),
+    [anon_sym_LBRACE] = ACTIONS(9),
+    [sym_identifier] = ACTIONS(11),
+    [anon_sym_COLON] = ACTIONS(13),
+    [sym_number] = ACTIONS(15),
+    [anon_sym_DQUOTE] = ACTIONS(17),
+    [anon_sym_LT] = ACTIONS(19),
     [anon_sym_with] = ACTIONS(21),
     [anon_sym_LBRACK] = ACTIONS(23),
     [anon_sym_def] = ACTIONS(25),
@@ -2434,18 +2648,18 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
 
 static const uint16_t ts_small_parse_table[] = {
   [0] = 2,
-    ACTIONS(144), 7,
+    ACTIONS(132), 1,
       ts_builtin_sym_end,
+    ACTIONS(134), 18,
       anon_sym_AMP,
+      anon_sym_func,
       anon_sym_LBRACE,
       anon_sym_RBRACE,
-      anon_sym_COLON,
-      anon_sym_DQUOTE,
-      anon_sym_LT_LBRACE,
-    ACTIONS(146), 12,
-      anon_sym_func,
       sym_identifier,
+      anon_sym_COLON,
       sym_number,
+      anon_sym_DQUOTE,
+      anon_sym_LT,
       anon_sym_with,
       anon_sym_LBRACK,
       anon_sym_def,
@@ -2455,61 +2669,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_catch,
       anon_sym_include,
       anon_sym_use,
-  [24] = 2,
-    ACTIONS(148), 7,
-      ts_builtin_sym_end,
+  [24] = 1,
+    ACTIONS(134), 18,
       anon_sym_AMP,
-      anon_sym_LBRACE,
-      anon_sym_RBRACE,
-      anon_sym_COLON,
-      anon_sym_DQUOTE,
-      anon_sym_LT_LBRACE,
-    ACTIONS(150), 12,
       anon_sym_func,
-      sym_identifier,
-      sym_number,
-      anon_sym_with,
-      anon_sym_LBRACK,
-      anon_sym_def,
-      anon_sym_construct,
-      anon_sym_if,
-      anon_sym_while,
-      anon_sym_catch,
-      anon_sym_include,
-      anon_sym_use,
-  [48] = 2,
-    ACTIONS(152), 7,
-      ts_builtin_sym_end,
-      anon_sym_AMP,
       anon_sym_LBRACE,
-      anon_sym_RBRACE,
-      anon_sym_COLON,
-      anon_sym_DQUOTE,
-      anon_sym_LT_LBRACE,
-    ACTIONS(154), 12,
-      anon_sym_func,
       sym_identifier,
-      sym_number,
-      anon_sym_with,
-      anon_sym_LBRACK,
-      anon_sym_def,
-      anon_sym_construct,
-      anon_sym_if,
-      anon_sym_while,
-      anon_sym_catch,
-      anon_sym_include,
-      anon_sym_use,
-  [72] = 2,
-    ACTIONS(144), 5,
-      anon_sym_AMP,
-      anon_sym_LBRACE,
       anon_sym_COLON,
-      anon_sym_DQUOTE,
-      anon_sym_LT_LBRACE,
-    ACTIONS(146), 13,
-      anon_sym_func,
-      sym_identifier,
       sym_number,
+      anon_sym_DQUOTE,
+      anon_sym_LT,
       anon_sym_with,
       anon_sym_LBRACK,
       anon_sym_RBRACK,
@@ -2520,1157 +2689,1229 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_catch,
       anon_sym_include,
       anon_sym_use,
-  [95] = 2,
-    ACTIONS(152), 5,
-      anon_sym_AMP,
-      anon_sym_LBRACE,
+  [45] = 6,
+    ACTIONS(19), 1,
+      anon_sym_LT,
+    ACTIONS(136), 1,
+      anon_sym_SEMI,
+    ACTIONS(138), 1,
       anon_sym_COLON,
-      anon_sym_DQUOTE,
-      anon_sym_LT_LBRACE,
-    ACTIONS(154), 13,
-      anon_sym_func,
-      sym_identifier,
-      sym_number,
-      anon_sym_with,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_def,
-      anon_sym_construct,
-      anon_sym_if,
-      anon_sym_while,
-      anon_sym_catch,
-      anon_sym_include,
-      anon_sym_use,
-  [118] = 2,
-    ACTIONS(148), 5,
-      anon_sym_AMP,
-      anon_sym_LBRACE,
+    ACTIONS(140), 1,
+      anon_sym_GT,
+    ACTIONS(142), 1,
+      sym__spacing,
+    STATE(112), 1,
+      sym_call_expr,
+  [64] = 6,
+    ACTIONS(19), 1,
+      anon_sym_LT,
+    ACTIONS(138), 1,
       anon_sym_COLON,
-      anon_sym_DQUOTE,
-      anon_sym_LT_LBRACE,
-    ACTIONS(150), 13,
-      anon_sym_func,
-      sym_identifier,
-      sym_number,
-      anon_sym_with,
-      anon_sym_LBRACK,
-      anon_sym_RBRACK,
-      anon_sym_def,
-      anon_sym_construct,
-      anon_sym_if,
-      anon_sym_while,
-      anon_sym_catch,
-      anon_sym_include,
-      anon_sym_use,
-  [141] = 4,
+    ACTIONS(144), 1,
+      anon_sym_SEMI,
+    ACTIONS(146), 1,
+      anon_sym_GT,
+    ACTIONS(148), 1,
+      sym__spacing,
+    STATE(118), 1,
+      sym_call_expr,
+  [83] = 4,
+    ACTIONS(150), 1,
+      anon_sym_LBRACE,
+    ACTIONS(152), 1,
+      aux_sym_blocky_token1,
+    ACTIONS(154), 1,
+      anon_sym_RBRACE,
+    STATE(42), 2,
+      sym_blocky,
+      aux_sym_blocky_repeat1,
+  [97] = 4,
+    ACTIONS(150), 1,
+      anon_sym_LBRACE,
     ACTIONS(156), 1,
-      anon_sym_LBRACE,
+      aux_sym_blocky_token1,
     ACTIONS(158), 1,
-      aux_sym_blocky_token1,
-    ACTIONS(160), 1,
       anon_sym_RBRACE,
-    STATE(36), 2,
+    STATE(33), 2,
       sym_blocky,
       aux_sym_blocky_repeat1,
-  [155] = 4,
+  [111] = 2,
     ACTIONS(162), 1,
-      anon_sym_LBRACE,
-    ACTIONS(165), 1,
-      aux_sym_blocky_token1,
-    ACTIONS(168), 1,
-      anon_sym_RBRACE,
-    STATE(34), 2,
-      sym_blocky,
-      aux_sym_blocky_repeat1,
+      sym__spacing,
+    ACTIONS(160), 4,
+      anon_sym_SEMI,
+      anon_sym_COLON,
+      anon_sym_LT,
+      anon_sym_GT,
+  [121] = 2,
+    ACTIONS(166), 1,
+      sym__spacing,
+    ACTIONS(164), 4,
+      anon_sym_SEMI,
+      anon_sym_COLON,
+      anon_sym_LT,
+      anon_sym_GT,
+  [131] = 5,
+    ACTIONS(19), 1,
+      anon_sym_LT,
+    ACTIONS(136), 1,
+      anon_sym_SEMI,
+    ACTIONS(140), 1,
+      anon_sym_GT,
+    ACTIONS(142), 1,
+      sym__spacing,
+    STATE(112), 1,
+      sym_call_expr,
+  [147] = 2,
+    ACTIONS(170), 1,
+      sym__spacing,
+    ACTIONS(168), 4,
+      anon_sym_SEMI,
+      anon_sym_COLON,
+      anon_sym_LT,
+      anon_sym_GT,
+  [157] = 3,
+    ACTIONS(138), 1,
+      anon_sym_COLON,
+    ACTIONS(174), 1,
+      sym__spacing,
+    ACTIONS(172), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
   [169] = 5,
     ACTIONS(13), 1,
       anon_sym_COLON,
-    ACTIONS(170), 1,
-      anon_sym_AMP,
-    ACTIONS(172), 1,
-      sym_identifier,
-    STATE(48), 1,
-      aux_sym__statement_repeat1,
-    STATE(52), 1,
-      sym_call,
-  [185] = 4,
-    ACTIONS(156), 1,
-      anon_sym_LBRACE,
-    ACTIONS(174), 1,
-      aux_sym_blocky_token1,
     ACTIONS(176), 1,
-      anon_sym_RBRACE,
-    STATE(34), 2,
-      sym_blocky,
-      aux_sym_blocky_repeat1,
-  [199] = 4,
-    ACTIONS(156), 1,
-      anon_sym_LBRACE,
+      anon_sym_AMP,
     ACTIONS(178), 1,
-      aux_sym_blocky_token1,
-    ACTIONS(180), 1,
-      anon_sym_RBRACE,
-    STATE(38), 2,
-      sym_blocky,
-      aux_sym_blocky_repeat1,
-  [213] = 4,
-    ACTIONS(156), 1,
+      sym_identifier,
+    STATE(32), 1,
+      sym_call,
+    STATE(48), 1,
+      aux_sym__unspaced_statement_repeat1,
+  [185] = 4,
+    ACTIONS(150), 1,
       anon_sym_LBRACE,
-    ACTIONS(174), 1,
+    ACTIONS(180), 1,
       aux_sym_blocky_token1,
     ACTIONS(182), 1,
       anon_sym_RBRACE,
-    STATE(34), 2,
+    STATE(43), 2,
       sym_blocky,
       aux_sym_blocky_repeat1,
-  [227] = 5,
-    ACTIONS(13), 1,
-      anon_sym_COLON,
-    ACTIONS(170), 1,
-      anon_sym_AMP,
-    ACTIONS(172), 1,
-      sym_identifier,
-    STATE(48), 1,
-      aux_sym__statement_repeat1,
-    STATE(77), 1,
-      sym_call,
-  [243] = 4,
+  [199] = 4,
     ACTIONS(184), 1,
-      anon_sym_SEMI,
-    ACTIONS(186), 1,
+      anon_sym_LBRACE,
+    ACTIONS(187), 1,
+      aux_sym_blocky_token1,
+    ACTIONS(190), 1,
       anon_sym_RBRACE,
-    ACTIONS(188), 1,
-      sym_identifier,
-    STATE(44), 1,
-      aux_sym_type_definition_repeat1,
-  [256] = 3,
+    STATE(42), 2,
+      sym_blocky,
+      aux_sym_blocky_repeat1,
+  [213] = 4,
+    ACTIONS(150), 1,
+      anon_sym_LBRACE,
+    ACTIONS(152), 1,
+      aux_sym_blocky_token1,
     ACTIONS(192), 1,
-      anon_sym_DQUOTE,
-    STATE(45), 1,
-      aux_sym_string_repeat1,
-    ACTIONS(190), 2,
-      aux_sym_blocky_token1,
-      aux_sym_string_token1,
-  [267] = 4,
-    ACTIONS(188), 1,
-      sym_identifier,
-    ACTIONS(194), 1,
-      anon_sym_SEMI,
+      anon_sym_RBRACE,
+    STATE(42), 2,
+      sym_blocky,
+      aux_sym_blocky_repeat1,
+  [227] = 2,
     ACTIONS(196), 1,
-      anon_sym_RBRACE,
-    STATE(40), 1,
-      aux_sym_type_definition_repeat1,
-  [280] = 4,
-    ACTIONS(188), 1,
-      sym_identifier,
-    ACTIONS(198), 1,
+      sym__spacing,
+    ACTIONS(194), 3,
       anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [236] = 2,
     ACTIONS(200), 1,
-      anon_sym_RBRACE,
-    STATE(44), 1,
-      aux_sym_type_definition_repeat1,
-  [293] = 3,
+      sym__spacing,
+    ACTIONS(198), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [245] = 2,
     ACTIONS(204), 1,
-      sym_identifier,
-    STATE(44), 1,
-      aux_sym_type_definition_repeat1,
-    ACTIONS(202), 2,
-      anon_sym_SEMI,
-      anon_sym_RBRACE,
-  [304] = 3,
-    ACTIONS(210), 1,
-      anon_sym_DQUOTE,
-    STATE(45), 1,
-      aux_sym_string_repeat1,
-    ACTIONS(207), 2,
-      aux_sym_blocky_token1,
-      aux_sym_string_token1,
-  [315] = 3,
-    ACTIONS(214), 1,
-      anon_sym_DQUOTE,
-    STATE(41), 1,
-      aux_sym_string_repeat1,
-    ACTIONS(212), 2,
-      aux_sym_blocky_token1,
-      aux_sym_string_token1,
-  [326] = 4,
-    ACTIONS(188), 1,
-      sym_identifier,
-    ACTIONS(216), 1,
-      anon_sym_SEMI,
-    ACTIONS(218), 1,
-      anon_sym_RBRACE,
-    STATE(43), 1,
-      aux_sym_type_definition_repeat1,
-  [339] = 3,
-    ACTIONS(220), 1,
-      anon_sym_AMP,
-    STATE(48), 1,
-      aux_sym__statement_repeat1,
-    ACTIONS(223), 2,
-      sym_identifier,
-      anon_sym_COLON,
-  [350] = 3,
-    ACTIONS(200), 1,
-      anon_sym_RBRACE,
-    ACTIONS(225), 1,
-      sym_identifier,
-    STATE(53), 1,
-      aux_sym_type_definition_repeat2,
-  [360] = 3,
-    ACTIONS(227), 1,
-      aux_sym_block_token1,
-    ACTIONS(229), 1,
-      anon_sym_PIPE,
-    STATE(71), 1,
-      aux_sym_block_repeat1,
-  [370] = 2,
-    ACTIONS(233), 1,
       sym__spacing,
-    ACTIONS(231), 2,
-      anon_sym_SEMI,
-      anon_sym_COLON,
-  [378] = 3,
-    ACTIONS(235), 1,
-      anon_sym_SEMI,
-    ACTIONS(237), 1,
-      anon_sym_COLON,
-    ACTIONS(239), 1,
-      sym__spacing,
-  [388] = 3,
-    ACTIONS(241), 1,
-      anon_sym_RBRACE,
-    ACTIONS(243), 1,
-      sym_identifier,
-    STATE(53), 1,
-      aux_sym_type_definition_repeat2,
-  [398] = 3,
-    ACTIONS(246), 1,
-      anon_sym_SEMI,
-    ACTIONS(248), 1,
-      sym_identifier,
-    STATE(74), 1,
-      aux_sym_with_expr_repeat1,
-  [408] = 3,
-    ACTIONS(218), 1,
-      anon_sym_RBRACE,
-    ACTIONS(225), 1,
-      sym_identifier,
-    STATE(49), 1,
-      aux_sym_type_definition_repeat2,
-  [418] = 3,
-    ACTIONS(13), 1,
-      anon_sym_COLON,
-    ACTIONS(172), 1,
-      sym_identifier,
-    STATE(63), 1,
-      sym_call,
-  [428] = 1,
     ACTIONS(202), 3,
       anon_sym_SEMI,
-      anon_sym_RBRACE,
+      anon_sym_LT,
+      anon_sym_GT,
+  [254] = 2,
+    ACTIONS(208), 1,
+      sym__spacing,
+    ACTIONS(206), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [263] = 4,
+    ACTIONS(210), 1,
+      anon_sym_AMP,
+    ACTIONS(213), 1,
       sym_identifier,
-  [434] = 3,
-    ACTIONS(218), 1,
+    ACTIONS(215), 1,
+      anon_sym_COLON,
+    STATE(48), 1,
+      aux_sym__unspaced_statement_repeat1,
+  [276] = 4,
+    ACTIONS(217), 1,
+      anon_sym_SEMI,
+    ACTIONS(219), 1,
       anon_sym_RBRACE,
+    ACTIONS(221), 1,
+      sym_identifier,
+    STATE(60), 1,
+      aux_sym_type_definition_repeat1,
+  [289] = 2,
     ACTIONS(225), 1,
+      sym__spacing,
+    ACTIONS(223), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [298] = 3,
+    ACTIONS(229), 1,
       sym_identifier,
-    STATE(53), 1,
-      aux_sym_type_definition_repeat2,
-  [444] = 3,
-    ACTIONS(200), 1,
+    STATE(51), 1,
+      aux_sym_type_definition_repeat1,
+    ACTIONS(227), 2,
+      anon_sym_SEMI,
       anon_sym_RBRACE,
-    ACTIONS(225), 1,
+  [309] = 2,
+    ACTIONS(234), 1,
+      sym__spacing,
+    ACTIONS(232), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [318] = 2,
+    ACTIONS(238), 1,
+      sym__spacing,
+    ACTIONS(236), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [327] = 3,
+    ACTIONS(243), 1,
+      anon_sym_DQUOTE,
+    STATE(54), 1,
+      aux_sym_string_repeat1,
+    ACTIONS(240), 2,
+      aux_sym_blocky_token1,
+      aux_sym_string_token1,
+  [338] = 2,
+    ACTIONS(247), 1,
+      sym__spacing,
+    ACTIONS(245), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [347] = 2,
+    ACTIONS(251), 1,
+      sym__spacing,
+    ACTIONS(249), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [356] = 2,
+    ACTIONS(255), 1,
+      sym__spacing,
+    ACTIONS(253), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [365] = 2,
+    ACTIONS(259), 1,
+      sym__spacing,
+    ACTIONS(257), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [374] = 2,
+    ACTIONS(263), 1,
+      sym__spacing,
+    ACTIONS(261), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [383] = 4,
+    ACTIONS(221), 1,
       sym_identifier,
-    STATE(69), 1,
-      aux_sym_type_definition_repeat2,
-  [454] = 3,
+    ACTIONS(265), 1,
+      anon_sym_SEMI,
+    ACTIONS(267), 1,
+      anon_sym_RBRACE,
+    STATE(51), 1,
+      aux_sym_type_definition_repeat1,
+  [396] = 2,
+    ACTIONS(271), 1,
+      sym__spacing,
+    ACTIONS(269), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [405] = 2,
+    ACTIONS(275), 1,
+      sym__spacing,
+    ACTIONS(273), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [414] = 4,
+    ACTIONS(221), 1,
+      sym_identifier,
+    ACTIONS(277), 1,
+      anon_sym_SEMI,
+    ACTIONS(279), 1,
+      anon_sym_RBRACE,
+    STATE(51), 1,
+      aux_sym_type_definition_repeat1,
+  [427] = 2,
+    ACTIONS(283), 1,
+      sym__spacing,
+    ACTIONS(281), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [436] = 2,
+    ACTIONS(287), 1,
+      sym__spacing,
+    ACTIONS(285), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [445] = 4,
+    ACTIONS(221), 1,
+      sym_identifier,
+    ACTIONS(289), 1,
+      anon_sym_SEMI,
+    ACTIONS(291), 1,
+      anon_sym_RBRACE,
+    STATE(63), 1,
+      aux_sym_type_definition_repeat1,
+  [458] = 2,
+    ACTIONS(295), 1,
+      sym__spacing,
+    ACTIONS(293), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [467] = 2,
+    ACTIONS(299), 1,
+      sym__spacing,
+    ACTIONS(297), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [476] = 2,
+    ACTIONS(303), 1,
+      sym__spacing,
+    ACTIONS(301), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [485] = 4,
+    ACTIONS(19), 1,
+      anon_sym_LT,
+    ACTIONS(305), 1,
+      anon_sym_GT,
+    ACTIONS(307), 1,
+      sym__spacing,
+    STATE(119), 1,
+      sym_call_expr,
+  [498] = 2,
+    ACTIONS(311), 1,
+      sym__spacing,
+    ACTIONS(309), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [507] = 2,
+    ACTIONS(315), 1,
+      sym__spacing,
+    ACTIONS(313), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [516] = 2,
+    ACTIONS(319), 1,
+      sym__spacing,
+    ACTIONS(317), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [525] = 2,
+    ACTIONS(323), 1,
+      sym__spacing,
+    ACTIONS(321), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [534] = 2,
+    ACTIONS(327), 1,
+      sym__spacing,
+    ACTIONS(325), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [543] = 2,
+    ACTIONS(331), 1,
+      sym__spacing,
+    ACTIONS(329), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [552] = 2,
+    ACTIONS(335), 1,
+      sym__spacing,
+    ACTIONS(333), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [561] = 3,
+    ACTIONS(339), 1,
+      anon_sym_DQUOTE,
+    STATE(83), 1,
+      aux_sym_string_repeat1,
+    ACTIONS(337), 2,
+      aux_sym_blocky_token1,
+      aux_sym_string_token1,
+  [572] = 2,
+    ACTIONS(343), 1,
+      sym__spacing,
+    ACTIONS(341), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [581] = 2,
+    ACTIONS(347), 1,
+      sym__spacing,
+    ACTIONS(345), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [590] = 2,
+    ACTIONS(351), 1,
+      sym__spacing,
+    ACTIONS(349), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [599] = 2,
+    ACTIONS(355), 1,
+      sym__spacing,
+    ACTIONS(353), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [608] = 3,
+    ACTIONS(359), 1,
+      anon_sym_DQUOTE,
+    STATE(54), 1,
+      aux_sym_string_repeat1,
+    ACTIONS(357), 2,
+      aux_sym_blocky_token1,
+      aux_sym_string_token1,
+  [619] = 2,
+    ACTIONS(363), 1,
+      sym__spacing,
+    ACTIONS(361), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [628] = 4,
+    ACTIONS(19), 1,
+      anon_sym_LT,
+    ACTIONS(146), 1,
+      anon_sym_GT,
+    ACTIONS(148), 1,
+      sym__spacing,
+    STATE(118), 1,
+      sym_call_expr,
+  [641] = 2,
+    ACTIONS(367), 1,
+      sym__spacing,
+    ACTIONS(365), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [650] = 2,
+    ACTIONS(371), 1,
+      sym__spacing,
+    ACTIONS(369), 3,
+      anon_sym_SEMI,
+      anon_sym_LT,
+      anon_sym_GT,
+  [659] = 3,
     ACTIONS(13), 1,
       anon_sym_COLON,
-    ACTIONS(172), 1,
+    ACTIONS(178), 1,
       sym_identifier,
-    STATE(114), 1,
+    STATE(39), 1,
       sym_call,
-  [464] = 3,
-    ACTIONS(186), 1,
-      anon_sym_RBRACE,
-    ACTIONS(225), 1,
-      sym_identifier,
-    STATE(58), 1,
-      aux_sym_type_definition_repeat2,
-  [474] = 3,
-    ACTIONS(250), 1,
+  [669] = 3,
+    ACTIONS(373), 1,
       anon_sym_SEMI,
-    ACTIONS(252), 1,
+    ACTIONS(375), 1,
       sym_identifier,
-    STATE(54), 1,
+    STATE(96), 1,
       aux_sym_with_expr_repeat1,
-  [484] = 3,
-    ACTIONS(237), 1,
-      anon_sym_COLON,
-    ACTIONS(254), 1,
-      anon_sym_SEMI,
-    ACTIONS(256), 1,
-      sym__spacing,
-  [494] = 2,
-    ACTIONS(260), 1,
-      sym__spacing,
-    ACTIONS(258), 2,
-      anon_sym_SEMI,
-      anon_sym_COLON,
-  [502] = 2,
-    ACTIONS(264), 1,
-      sym__spacing,
-    ACTIONS(262), 2,
-      anon_sym_SEMI,
-      anon_sym_COLON,
-  [510] = 3,
-    ACTIONS(9), 1,
-      anon_sym_LBRACE,
-    ACTIONS(266), 1,
-      anon_sym_AT,
-    STATE(78), 1,
-      sym_block,
-  [520] = 3,
-    ACTIONS(227), 1,
-      aux_sym_block_token1,
-    ACTIONS(268), 1,
-      anon_sym_PIPE,
-    STATE(50), 1,
-      aux_sym_block_repeat1,
-  [530] = 3,
-    ACTIONS(237), 1,
-      anon_sym_COLON,
-    ACTIONS(270), 1,
-      anon_sym_SEMI,
-    ACTIONS(272), 1,
-      sym__spacing,
-  [540] = 3,
-    ACTIONS(225), 1,
-      sym_identifier,
-    ACTIONS(274), 1,
-      anon_sym_RBRACE,
-    STATE(53), 1,
-      aux_sym_type_definition_repeat2,
-  [550] = 3,
-    ACTIONS(225), 1,
-      sym_identifier,
-    ACTIONS(274), 1,
-      anon_sym_RBRACE,
-    STATE(72), 1,
-      aux_sym_type_definition_repeat2,
-  [560] = 3,
-    ACTIONS(276), 1,
-      aux_sym_block_token1,
-    ACTIONS(279), 1,
-      anon_sym_PIPE,
-    STATE(71), 1,
-      aux_sym_block_repeat1,
-  [570] = 3,
-    ACTIONS(225), 1,
-      sym_identifier,
-    ACTIONS(281), 1,
-      anon_sym_RBRACE,
-    STATE(53), 1,
-      aux_sym_type_definition_repeat2,
-  [580] = 1,
-    ACTIONS(283), 3,
+  [679] = 1,
+    ACTIONS(261), 3,
       anon_sym_LBRACE,
       aux_sym_blocky_token1,
       anon_sym_RBRACE,
-  [586] = 3,
-    ACTIONS(285), 1,
-      anon_sym_SEMI,
-    ACTIONS(287), 1,
-      sym_identifier,
-    STATE(74), 1,
-      aux_sym_with_expr_repeat1,
-  [596] = 1,
-    ACTIONS(290), 3,
+  [685] = 1,
+    ACTIONS(202), 3,
       anon_sym_LBRACE,
       aux_sym_blocky_token1,
       anon_sym_RBRACE,
-  [602] = 3,
-    ACTIONS(237), 1,
-      anon_sym_COLON,
-    ACTIONS(292), 1,
-      anon_sym_SEMI,
-    ACTIONS(294), 1,
-      sym__spacing,
-  [612] = 3,
-    ACTIONS(237), 1,
-      anon_sym_COLON,
-    ACTIONS(296), 1,
-      anon_sym_SEMI,
-    ACTIONS(298), 1,
-      sym__spacing,
-  [622] = 2,
-    ACTIONS(300), 1,
-      anon_sym_SEMI,
-    ACTIONS(302), 1,
-      sym__spacing,
-  [629] = 2,
-    ACTIONS(304), 1,
-      anon_sym_SEMI,
-    ACTIONS(306), 1,
-      sym__spacing,
-  [636] = 2,
-    ACTIONS(308), 1,
-      anon_sym_SEMI,
-    ACTIONS(310), 1,
-      sym__spacing,
-  [643] = 2,
-    ACTIONS(312), 1,
-      anon_sym_SEMI,
-    ACTIONS(314), 1,
-      sym__spacing,
-  [650] = 2,
-    ACTIONS(316), 1,
-      anon_sym_LBRACE,
-    ACTIONS(318), 1,
-      anon_sym_namespace,
-  [657] = 2,
-    ACTIONS(270), 1,
-      anon_sym_SEMI,
-    ACTIONS(272), 1,
-      sym__spacing,
-  [664] = 2,
-    ACTIONS(292), 1,
-      anon_sym_SEMI,
-    ACTIONS(294), 1,
-      sym__spacing,
-  [671] = 2,
-    ACTIONS(320), 1,
-      anon_sym_SEMI,
-    ACTIONS(322), 1,
-      sym__spacing,
-  [678] = 2,
-    ACTIONS(324), 1,
-      anon_sym_SEMI,
-    ACTIONS(326), 1,
-      sym__spacing,
-  [685] = 2,
-    ACTIONS(328), 1,
-      anon_sym_SEMI,
-    ACTIONS(330), 1,
-      sym__spacing,
-  [692] = 2,
-    ACTIONS(332), 1,
-      anon_sym_SEMI,
-    ACTIONS(334), 1,
-      sym__spacing,
-  [699] = 2,
-    ACTIONS(336), 1,
-      anon_sym_SEMI,
-    ACTIONS(338), 1,
-      sym__spacing,
-  [706] = 2,
-    ACTIONS(340), 1,
-      anon_sym_SEMI,
-    ACTIONS(342), 1,
-      sym__spacing,
-  [713] = 2,
-    ACTIONS(344), 1,
-      anon_sym_SEMI,
-    ACTIONS(346), 1,
-      sym__spacing,
-  [720] = 2,
-    ACTIONS(348), 1,
-      anon_sym_SEMI,
-    ACTIONS(350), 1,
-      sym__spacing,
-  [727] = 1,
-    ACTIONS(279), 2,
-      aux_sym_block_token1,
-      anon_sym_PIPE,
-  [732] = 2,
-    ACTIONS(352), 1,
-      anon_sym_SEMI,
-    ACTIONS(354), 1,
-      sym__spacing,
-  [739] = 2,
-    ACTIONS(356), 1,
-      anon_sym_SEMI,
-    ACTIONS(358), 1,
-      sym__spacing,
-  [746] = 2,
-    ACTIONS(360), 1,
-      anon_sym_SEMI,
-    ACTIONS(362), 1,
-      sym__spacing,
-  [753] = 2,
-    ACTIONS(364), 1,
-      anon_sym_SEMI,
-    ACTIONS(366), 1,
-      sym__spacing,
-  [760] = 2,
-    ACTIONS(368), 1,
-      anon_sym_SEMI,
-    ACTIONS(370), 1,
-      sym__spacing,
-  [767] = 2,
-    ACTIONS(372), 1,
-      anon_sym_SEMI,
-    ACTIONS(374), 1,
-      sym__spacing,
-  [774] = 1,
-    ACTIONS(376), 2,
+  [691] = 3,
+    ACTIONS(377), 1,
       anon_sym_RBRACE,
+    ACTIONS(379), 1,
       sym_identifier,
-  [779] = 2,
-    ACTIONS(290), 1,
-      anon_sym_SEMI,
-    ACTIONS(378), 1,
-      sym__spacing,
-  [786] = 2,
-    ACTIONS(380), 1,
-      anon_sym_SEMI,
-    ACTIONS(382), 1,
-      sym__spacing,
-  [793] = 2,
-    ACTIONS(384), 1,
-      anon_sym_SEMI,
-    ACTIONS(386), 1,
-      sym__spacing,
-  [800] = 2,
-    ACTIONS(388), 1,
-      anon_sym_LBRACE,
-    STATE(115), 1,
-      sym_blocky,
-  [807] = 2,
-    ACTIONS(390), 1,
+    STATE(102), 1,
+      aux_sym_type_definition_repeat2,
+  [701] = 3,
+    ACTIONS(379), 1,
+      sym_identifier,
+    ACTIONS(381), 1,
+      anon_sym_RBRACE,
+    STATE(92), 1,
+      aux_sym_type_definition_repeat2,
+  [711] = 3,
+    ACTIONS(379), 1,
+      sym_identifier,
+    ACTIONS(381), 1,
+      anon_sym_RBRACE,
+    STATE(102), 1,
+      aux_sym_type_definition_repeat2,
+  [721] = 3,
+    ACTIONS(383), 1,
+      aux_sym_block_token1,
+    ACTIONS(385), 1,
+      anon_sym_PIPE,
+    STATE(104), 1,
+      aux_sym_block_repeat1,
+  [731] = 3,
+    ACTIONS(387), 1,
       anon_sym_SEMI,
+    ACTIONS(389), 1,
+      sym_identifier,
+    STATE(96), 1,
+      aux_sym_with_expr_repeat1,
+  [741] = 3,
     ACTIONS(392), 1,
-      sym__spacing,
-  [814] = 2,
+      anon_sym_SEMI,
     ACTIONS(394), 1,
-      anon_sym_SEMI,
-    ACTIONS(396), 1,
-      sym__spacing,
-  [821] = 2,
-    ACTIONS(398), 1,
-      anon_sym_SEMI,
-    ACTIONS(400), 1,
-      sym__spacing,
-  [828] = 2,
-    ACTIONS(283), 1,
-      anon_sym_SEMI,
-    ACTIONS(402), 1,
-      sym__spacing,
-  [835] = 2,
-    ACTIONS(404), 1,
-      anon_sym_SEMI,
-    ACTIONS(406), 1,
-      sym__spacing,
-  [842] = 2,
-    ACTIONS(408), 1,
-      anon_sym_SEMI,
-    ACTIONS(410), 1,
-      sym__spacing,
-  [849] = 2,
-    ACTIONS(412), 1,
-      anon_sym_SEMI,
-    ACTIONS(414), 1,
-      sym__spacing,
-  [856] = 2,
-    ACTIONS(416), 1,
-      anon_sym_SEMI,
-    ACTIONS(418), 1,
-      sym__spacing,
-  [863] = 2,
-    ACTIONS(420), 1,
-      anon_sym_SEMI,
-    ACTIONS(422), 1,
-      sym__spacing,
-  [870] = 2,
-    ACTIONS(237), 1,
+      sym_identifier,
+    STATE(89), 1,
+      aux_sym_with_expr_repeat1,
+  [751] = 3,
+    ACTIONS(13), 1,
       anon_sym_COLON,
-    ACTIONS(424), 1,
-      sym__spacing,
-  [877] = 2,
-    ACTIONS(426), 1,
-      anon_sym_SEMI,
-    ACTIONS(428), 1,
-      sym__spacing,
-  [884] = 2,
-    ACTIONS(430), 1,
-      anon_sym_SEMI,
-    ACTIONS(432), 1,
-      sym__spacing,
-  [891] = 2,
-    ACTIONS(9), 1,
+    ACTIONS(178), 1,
+      sym_identifier,
+    STATE(120), 1,
+      sym_call,
+  [761] = 3,
+    ACTIONS(267), 1,
+      anon_sym_RBRACE,
+    ACTIONS(379), 1,
+      sym_identifier,
+    STATE(94), 1,
+      aux_sym_type_definition_repeat2,
+  [771] = 3,
+    ACTIONS(396), 1,
+      aux_sym_block_token1,
+    ACTIONS(399), 1,
+      anon_sym_PIPE,
+    STATE(100), 1,
+      aux_sym_block_repeat1,
+  [781] = 3,
+    ACTIONS(267), 1,
+      anon_sym_RBRACE,
+    ACTIONS(379), 1,
+      sym_identifier,
+    STATE(102), 1,
+      aux_sym_type_definition_repeat2,
+  [791] = 3,
+    ACTIONS(401), 1,
+      anon_sym_RBRACE,
+    ACTIONS(403), 1,
+      sym_identifier,
+    STATE(102), 1,
+      aux_sym_type_definition_repeat2,
+  [801] = 3,
+    ACTIONS(406), 1,
+      anon_sym_AT,
+    ACTIONS(408), 1,
       anon_sym_LBRACE,
-    STATE(129), 1,
+    STATE(86), 1,
       sym_block,
-  [898] = 1,
-    ACTIONS(434), 1,
+  [811] = 3,
+    ACTIONS(383), 1,
+      aux_sym_block_token1,
+    ACTIONS(410), 1,
+      anon_sym_PIPE,
+    STATE(100), 1,
+      aux_sym_block_repeat1,
+  [821] = 2,
+    ACTIONS(412), 1,
+      sym_identifier,
+    ACTIONS(227), 2,
+      anon_sym_SEMI,
+      anon_sym_RBRACE,
+  [829] = 3,
+    ACTIONS(219), 1,
+      anon_sym_RBRACE,
+    ACTIONS(379), 1,
+      sym_identifier,
+    STATE(101), 1,
+      aux_sym_type_definition_repeat2,
+  [839] = 3,
+    ACTIONS(279), 1,
+      anon_sym_RBRACE,
+    ACTIONS(379), 1,
+      sym_identifier,
+    STATE(108), 1,
+      aux_sym_type_definition_repeat2,
+  [849] = 3,
+    ACTIONS(219), 1,
+      anon_sym_RBRACE,
+    ACTIONS(379), 1,
+      sym_identifier,
+    STATE(102), 1,
+      aux_sym_type_definition_repeat2,
+  [859] = 2,
+    ACTIONS(414), 1,
+      anon_sym_RBRACE,
+    ACTIONS(416), 1,
+      sym_identifier,
+  [866] = 2,
+    ACTIONS(418), 1,
+      anon_sym_GT,
+    ACTIONS(420), 1,
+      sym__spacing,
+  [873] = 2,
+    ACTIONS(422), 1,
       anon_sym_LBRACE,
-  [902] = 1,
+    ACTIONS(424), 1,
+      anon_sym_namespace,
+  [880] = 2,
+    ACTIONS(146), 1,
+      anon_sym_GT,
+    ACTIONS(148), 1,
+      sym__spacing,
+  [887] = 2,
+    ACTIONS(420), 1,
+      sym__spacing,
+    ACTIONS(426), 1,
+      anon_sym_GT,
+  [894] = 2,
+    ACTIONS(420), 1,
+      sym__spacing,
+    ACTIONS(428), 1,
+      anon_sym_GT,
+  [901] = 2,
+    ACTIONS(399), 1,
+      anon_sym_PIPE,
+    ACTIONS(430), 1,
+      aux_sym_block_token1,
+  [908] = 2,
+    ACTIONS(432), 1,
+      anon_sym_LBRACE,
+    STATE(55), 1,
+      sym_blocky,
+  [915] = 2,
+    ACTIONS(408), 1,
+      anon_sym_LBRACE,
+    STATE(136), 1,
+      sym_block,
+  [922] = 2,
+    ACTIONS(305), 1,
+      anon_sym_GT,
+    ACTIONS(307), 1,
+      sym__spacing,
+  [929] = 2,
+    ACTIONS(434), 1,
+      anon_sym_GT,
     ACTIONS(436), 1,
       sym__spacing,
-  [906] = 1,
+  [936] = 2,
+    ACTIONS(138), 1,
+      anon_sym_COLON,
     ACTIONS(438), 1,
-      anon_sym_LBRACE,
-  [910] = 1,
+      sym__spacing,
+  [943] = 1,
     ACTIONS(440), 1,
-      sym__spacing,
-  [914] = 1,
-    ACTIONS(239), 1,
-      sym__spacing,
-  [918] = 1,
+      anon_sym_BANG,
+  [947] = 1,
     ACTIONS(442), 1,
-      sym__spacing,
-  [922] = 1,
+      anon_sym_LBRACE,
+  [951] = 1,
     ACTIONS(444), 1,
       sym__spacing,
-  [926] = 1,
+  [955] = 1,
     ACTIONS(446), 1,
       sym__spacing,
-  [930] = 1,
+  [959] = 1,
     ACTIONS(448), 1,
       sym__spacing,
-  [934] = 1,
+  [963] = 1,
     ACTIONS(450), 1,
       sym__spacing,
-  [938] = 1,
+  [967] = 1,
     ACTIONS(452), 1,
-      sym__spacing,
-  [942] = 1,
+      anon_sym_LBRACE,
+  [971] = 1,
     ACTIONS(454), 1,
       sym__spacing,
-  [946] = 1,
+  [975] = 1,
     ACTIONS(456), 1,
-      sym__spacing,
-  [950] = 1,
+      anon_sym_LBRACE,
+  [979] = 1,
     ACTIONS(458), 1,
       sym__spacing,
-  [954] = 1,
+  [983] = 1,
     ACTIONS(460), 1,
-      sym_identifier,
-  [958] = 1,
+      sym__spacing,
+  [987] = 1,
     ACTIONS(462), 1,
       sym__spacing,
-  [962] = 1,
+  [991] = 1,
     ACTIONS(464), 1,
-      anon_sym_LBRACE,
-  [966] = 1,
-    ACTIONS(466), 1,
-      anon_sym_in,
-  [970] = 1,
-    ACTIONS(468), 1,
-      anon_sym_LBRACE,
-  [974] = 1,
-    ACTIONS(470), 1,
-      anon_sym_LBRACE,
-  [978] = 1,
-    ACTIONS(472), 1,
       sym__spacing,
-  [982] = 1,
-    ACTIONS(474), 1,
+  [995] = 1,
+    ACTIONS(466), 1,
       sym_identifier,
-  [986] = 1,
+  [999] = 1,
+    ACTIONS(468), 1,
+      sym__spacing,
+  [1003] = 1,
+    ACTIONS(470), 1,
+      sym__spacing,
+  [1007] = 1,
+    ACTIONS(472), 1,
+      anon_sym_LBRACE,
+  [1011] = 1,
+    ACTIONS(474), 1,
+      anon_sym_in,
+  [1015] = 1,
     ACTIONS(476), 1,
       anon_sym_LBRACE,
-  [990] = 1,
+  [1019] = 1,
     ACTIONS(478), 1,
       sym__spacing,
-  [994] = 1,
+  [1023] = 1,
     ACTIONS(480), 1,
       anon_sym_LBRACE,
-  [998] = 1,
+  [1027] = 1,
     ACTIONS(482), 1,
-      sym__spacing,
-  [1002] = 1,
+      anon_sym_LBRACE,
+  [1031] = 1,
     ACTIONS(484), 1,
       sym__spacing,
-  [1006] = 1,
+  [1035] = 1,
     ACTIONS(486), 1,
       sym_identifier,
-  [1010] = 1,
+  [1039] = 1,
     ACTIONS(488), 1,
       sym__spacing,
-  [1014] = 1,
+  [1043] = 1,
     ACTIONS(490), 1,
-      anon_sym_BANG,
-  [1018] = 1,
+      sym__spacing,
+  [1047] = 1,
     ACTIONS(492), 1,
-      ts_builtin_sym_end,
-  [1022] = 1,
+      sym__spacing,
+  [1051] = 1,
     ACTIONS(494), 1,
       sym__spacing,
-  [1026] = 1,
+  [1055] = 1,
     ACTIONS(496), 1,
-      sym__spacing,
-  [1030] = 1,
-    ACTIONS(498), 1,
-      sym__spacing,
-  [1034] = 1,
-    ACTIONS(500), 1,
       sym_identifier,
-  [1038] = 1,
+  [1059] = 1,
+    ACTIONS(498), 1,
+      sym_identifier,
+  [1063] = 1,
+    ACTIONS(420), 1,
+      sym__spacing,
+  [1067] = 1,
+    ACTIONS(500), 1,
+      anon_sym_LBRACE,
+  [1071] = 1,
     ACTIONS(502), 1,
       sym__spacing,
-  [1042] = 1,
+  [1075] = 1,
     ACTIONS(504), 1,
-      sym__spacing,
-  [1046] = 1,
+      ts_builtin_sym_end,
+  [1079] = 1,
     ACTIONS(506), 1,
       sym__spacing,
-  [1050] = 1,
+  [1083] = 1,
     ACTIONS(508), 1,
-      sym__spacing,
-  [1054] = 1,
+      sym_identifier,
+  [1087] = 1,
     ACTIONS(510), 1,
       sym__spacing,
-  [1058] = 1,
+  [1091] = 1,
     ACTIONS(512), 1,
       sym__spacing,
-  [1062] = 1,
+  [1095] = 1,
     ACTIONS(514), 1,
       sym__spacing,
-  [1066] = 1,
+  [1099] = 1,
     ACTIONS(516), 1,
       sym__spacing,
-  [1070] = 1,
+  [1103] = 1,
     ACTIONS(518), 1,
       sym__spacing,
-  [1074] = 1,
+  [1107] = 1,
     ACTIONS(520), 1,
-      sym_identifier,
-  [1078] = 1,
+      sym__spacing,
+  [1111] = 1,
     ACTIONS(522), 1,
       sym__spacing,
-  [1082] = 1,
-    ACTIONS(298), 1,
-      sym__spacing,
-  [1086] = 1,
+  [1115] = 1,
     ACTIONS(524), 1,
       sym__spacing,
-  [1090] = 1,
+  [1119] = 1,
     ACTIONS(526), 1,
-      anon_sym_LBRACE,
-  [1094] = 1,
+      sym__spacing,
+  [1123] = 1,
     ACTIONS(528), 1,
       sym_identifier,
-  [1098] = 1,
+  [1127] = 1,
     ACTIONS(530), 1,
-      sym_identifier,
-  [1102] = 1,
+      sym__spacing,
+  [1131] = 1,
     ACTIONS(532), 1,
+      sym_identifier,
+  [1135] = 1,
+    ACTIONS(534), 1,
       sym__spacing,
 };
 
 static const uint32_t ts_small_parse_table_map[] = {
-  [SMALL_STATE(27)] = 0,
-  [SMALL_STATE(28)] = 24,
-  [SMALL_STATE(29)] = 48,
-  [SMALL_STATE(30)] = 72,
-  [SMALL_STATE(31)] = 95,
-  [SMALL_STATE(32)] = 118,
-  [SMALL_STATE(33)] = 141,
-  [SMALL_STATE(34)] = 155,
-  [SMALL_STATE(35)] = 169,
-  [SMALL_STATE(36)] = 185,
-  [SMALL_STATE(37)] = 199,
-  [SMALL_STATE(38)] = 213,
-  [SMALL_STATE(39)] = 227,
-  [SMALL_STATE(40)] = 243,
-  [SMALL_STATE(41)] = 256,
-  [SMALL_STATE(42)] = 267,
-  [SMALL_STATE(43)] = 280,
-  [SMALL_STATE(44)] = 293,
-  [SMALL_STATE(45)] = 304,
-  [SMALL_STATE(46)] = 315,
-  [SMALL_STATE(47)] = 326,
-  [SMALL_STATE(48)] = 339,
-  [SMALL_STATE(49)] = 350,
-  [SMALL_STATE(50)] = 360,
-  [SMALL_STATE(51)] = 370,
-  [SMALL_STATE(52)] = 378,
-  [SMALL_STATE(53)] = 388,
-  [SMALL_STATE(54)] = 398,
-  [SMALL_STATE(55)] = 408,
-  [SMALL_STATE(56)] = 418,
-  [SMALL_STATE(57)] = 428,
-  [SMALL_STATE(58)] = 434,
-  [SMALL_STATE(59)] = 444,
-  [SMALL_STATE(60)] = 454,
-  [SMALL_STATE(61)] = 464,
-  [SMALL_STATE(62)] = 474,
-  [SMALL_STATE(63)] = 484,
-  [SMALL_STATE(64)] = 494,
-  [SMALL_STATE(65)] = 502,
-  [SMALL_STATE(66)] = 510,
-  [SMALL_STATE(67)] = 520,
-  [SMALL_STATE(68)] = 530,
-  [SMALL_STATE(69)] = 540,
-  [SMALL_STATE(70)] = 550,
-  [SMALL_STATE(71)] = 560,
-  [SMALL_STATE(72)] = 570,
-  [SMALL_STATE(73)] = 580,
-  [SMALL_STATE(74)] = 586,
-  [SMALL_STATE(75)] = 596,
-  [SMALL_STATE(76)] = 602,
-  [SMALL_STATE(77)] = 612,
-  [SMALL_STATE(78)] = 622,
-  [SMALL_STATE(79)] = 629,
-  [SMALL_STATE(80)] = 636,
-  [SMALL_STATE(81)] = 643,
-  [SMALL_STATE(82)] = 650,
-  [SMALL_STATE(83)] = 657,
-  [SMALL_STATE(84)] = 664,
-  [SMALL_STATE(85)] = 671,
-  [SMALL_STATE(86)] = 678,
-  [SMALL_STATE(87)] = 685,
-  [SMALL_STATE(88)] = 692,
-  [SMALL_STATE(89)] = 699,
-  [SMALL_STATE(90)] = 706,
-  [SMALL_STATE(91)] = 713,
-  [SMALL_STATE(92)] = 720,
-  [SMALL_STATE(93)] = 727,
-  [SMALL_STATE(94)] = 732,
-  [SMALL_STATE(95)] = 739,
-  [SMALL_STATE(96)] = 746,
-  [SMALL_STATE(97)] = 753,
-  [SMALL_STATE(98)] = 760,
-  [SMALL_STATE(99)] = 767,
-  [SMALL_STATE(100)] = 774,
-  [SMALL_STATE(101)] = 779,
-  [SMALL_STATE(102)] = 786,
-  [SMALL_STATE(103)] = 793,
-  [SMALL_STATE(104)] = 800,
-  [SMALL_STATE(105)] = 807,
-  [SMALL_STATE(106)] = 814,
-  [SMALL_STATE(107)] = 821,
-  [SMALL_STATE(108)] = 828,
-  [SMALL_STATE(109)] = 835,
-  [SMALL_STATE(110)] = 842,
-  [SMALL_STATE(111)] = 849,
-  [SMALL_STATE(112)] = 856,
-  [SMALL_STATE(113)] = 863,
-  [SMALL_STATE(114)] = 870,
-  [SMALL_STATE(115)] = 877,
-  [SMALL_STATE(116)] = 884,
-  [SMALL_STATE(117)] = 891,
-  [SMALL_STATE(118)] = 898,
-  [SMALL_STATE(119)] = 902,
-  [SMALL_STATE(120)] = 906,
-  [SMALL_STATE(121)] = 910,
-  [SMALL_STATE(122)] = 914,
-  [SMALL_STATE(123)] = 918,
-  [SMALL_STATE(124)] = 922,
-  [SMALL_STATE(125)] = 926,
-  [SMALL_STATE(126)] = 930,
-  [SMALL_STATE(127)] = 934,
-  [SMALL_STATE(128)] = 938,
-  [SMALL_STATE(129)] = 942,
-  [SMALL_STATE(130)] = 946,
-  [SMALL_STATE(131)] = 950,
-  [SMALL_STATE(132)] = 954,
-  [SMALL_STATE(133)] = 958,
-  [SMALL_STATE(134)] = 962,
-  [SMALL_STATE(135)] = 966,
-  [SMALL_STATE(136)] = 970,
-  [SMALL_STATE(137)] = 974,
-  [SMALL_STATE(138)] = 978,
-  [SMALL_STATE(139)] = 982,
-  [SMALL_STATE(140)] = 986,
-  [SMALL_STATE(141)] = 990,
-  [SMALL_STATE(142)] = 994,
-  [SMALL_STATE(143)] = 998,
-  [SMALL_STATE(144)] = 1002,
-  [SMALL_STATE(145)] = 1006,
-  [SMALL_STATE(146)] = 1010,
-  [SMALL_STATE(147)] = 1014,
-  [SMALL_STATE(148)] = 1018,
-  [SMALL_STATE(149)] = 1022,
-  [SMALL_STATE(150)] = 1026,
-  [SMALL_STATE(151)] = 1030,
-  [SMALL_STATE(152)] = 1034,
-  [SMALL_STATE(153)] = 1038,
-  [SMALL_STATE(154)] = 1042,
-  [SMALL_STATE(155)] = 1046,
-  [SMALL_STATE(156)] = 1050,
-  [SMALL_STATE(157)] = 1054,
-  [SMALL_STATE(158)] = 1058,
-  [SMALL_STATE(159)] = 1062,
-  [SMALL_STATE(160)] = 1066,
-  [SMALL_STATE(161)] = 1070,
-  [SMALL_STATE(162)] = 1074,
-  [SMALL_STATE(163)] = 1078,
-  [SMALL_STATE(164)] = 1082,
-  [SMALL_STATE(165)] = 1086,
-  [SMALL_STATE(166)] = 1090,
-  [SMALL_STATE(167)] = 1094,
-  [SMALL_STATE(168)] = 1098,
-  [SMALL_STATE(169)] = 1102,
+  [SMALL_STATE(29)] = 0,
+  [SMALL_STATE(30)] = 24,
+  [SMALL_STATE(31)] = 45,
+  [SMALL_STATE(32)] = 64,
+  [SMALL_STATE(33)] = 83,
+  [SMALL_STATE(34)] = 97,
+  [SMALL_STATE(35)] = 111,
+  [SMALL_STATE(36)] = 121,
+  [SMALL_STATE(37)] = 131,
+  [SMALL_STATE(38)] = 147,
+  [SMALL_STATE(39)] = 157,
+  [SMALL_STATE(40)] = 169,
+  [SMALL_STATE(41)] = 185,
+  [SMALL_STATE(42)] = 199,
+  [SMALL_STATE(43)] = 213,
+  [SMALL_STATE(44)] = 227,
+  [SMALL_STATE(45)] = 236,
+  [SMALL_STATE(46)] = 245,
+  [SMALL_STATE(47)] = 254,
+  [SMALL_STATE(48)] = 263,
+  [SMALL_STATE(49)] = 276,
+  [SMALL_STATE(50)] = 289,
+  [SMALL_STATE(51)] = 298,
+  [SMALL_STATE(52)] = 309,
+  [SMALL_STATE(53)] = 318,
+  [SMALL_STATE(54)] = 327,
+  [SMALL_STATE(55)] = 338,
+  [SMALL_STATE(56)] = 347,
+  [SMALL_STATE(57)] = 356,
+  [SMALL_STATE(58)] = 365,
+  [SMALL_STATE(59)] = 374,
+  [SMALL_STATE(60)] = 383,
+  [SMALL_STATE(61)] = 396,
+  [SMALL_STATE(62)] = 405,
+  [SMALL_STATE(63)] = 414,
+  [SMALL_STATE(64)] = 427,
+  [SMALL_STATE(65)] = 436,
+  [SMALL_STATE(66)] = 445,
+  [SMALL_STATE(67)] = 458,
+  [SMALL_STATE(68)] = 467,
+  [SMALL_STATE(69)] = 476,
+  [SMALL_STATE(70)] = 485,
+  [SMALL_STATE(71)] = 498,
+  [SMALL_STATE(72)] = 507,
+  [SMALL_STATE(73)] = 516,
+  [SMALL_STATE(74)] = 525,
+  [SMALL_STATE(75)] = 534,
+  [SMALL_STATE(76)] = 543,
+  [SMALL_STATE(77)] = 552,
+  [SMALL_STATE(78)] = 561,
+  [SMALL_STATE(79)] = 572,
+  [SMALL_STATE(80)] = 581,
+  [SMALL_STATE(81)] = 590,
+  [SMALL_STATE(82)] = 599,
+  [SMALL_STATE(83)] = 608,
+  [SMALL_STATE(84)] = 619,
+  [SMALL_STATE(85)] = 628,
+  [SMALL_STATE(86)] = 641,
+  [SMALL_STATE(87)] = 650,
+  [SMALL_STATE(88)] = 659,
+  [SMALL_STATE(89)] = 669,
+  [SMALL_STATE(90)] = 679,
+  [SMALL_STATE(91)] = 685,
+  [SMALL_STATE(92)] = 691,
+  [SMALL_STATE(93)] = 701,
+  [SMALL_STATE(94)] = 711,
+  [SMALL_STATE(95)] = 721,
+  [SMALL_STATE(96)] = 731,
+  [SMALL_STATE(97)] = 741,
+  [SMALL_STATE(98)] = 751,
+  [SMALL_STATE(99)] = 761,
+  [SMALL_STATE(100)] = 771,
+  [SMALL_STATE(101)] = 781,
+  [SMALL_STATE(102)] = 791,
+  [SMALL_STATE(103)] = 801,
+  [SMALL_STATE(104)] = 811,
+  [SMALL_STATE(105)] = 821,
+  [SMALL_STATE(106)] = 829,
+  [SMALL_STATE(107)] = 839,
+  [SMALL_STATE(108)] = 849,
+  [SMALL_STATE(109)] = 859,
+  [SMALL_STATE(110)] = 866,
+  [SMALL_STATE(111)] = 873,
+  [SMALL_STATE(112)] = 880,
+  [SMALL_STATE(113)] = 887,
+  [SMALL_STATE(114)] = 894,
+  [SMALL_STATE(115)] = 901,
+  [SMALL_STATE(116)] = 908,
+  [SMALL_STATE(117)] = 915,
+  [SMALL_STATE(118)] = 922,
+  [SMALL_STATE(119)] = 929,
+  [SMALL_STATE(120)] = 936,
+  [SMALL_STATE(121)] = 943,
+  [SMALL_STATE(122)] = 947,
+  [SMALL_STATE(123)] = 951,
+  [SMALL_STATE(124)] = 955,
+  [SMALL_STATE(125)] = 959,
+  [SMALL_STATE(126)] = 963,
+  [SMALL_STATE(127)] = 967,
+  [SMALL_STATE(128)] = 971,
+  [SMALL_STATE(129)] = 975,
+  [SMALL_STATE(130)] = 979,
+  [SMALL_STATE(131)] = 983,
+  [SMALL_STATE(132)] = 987,
+  [SMALL_STATE(133)] = 991,
+  [SMALL_STATE(134)] = 995,
+  [SMALL_STATE(135)] = 999,
+  [SMALL_STATE(136)] = 1003,
+  [SMALL_STATE(137)] = 1007,
+  [SMALL_STATE(138)] = 1011,
+  [SMALL_STATE(139)] = 1015,
+  [SMALL_STATE(140)] = 1019,
+  [SMALL_STATE(141)] = 1023,
+  [SMALL_STATE(142)] = 1027,
+  [SMALL_STATE(143)] = 1031,
+  [SMALL_STATE(144)] = 1035,
+  [SMALL_STATE(145)] = 1039,
+  [SMALL_STATE(146)] = 1043,
+  [SMALL_STATE(147)] = 1047,
+  [SMALL_STATE(148)] = 1051,
+  [SMALL_STATE(149)] = 1055,
+  [SMALL_STATE(150)] = 1059,
+  [SMALL_STATE(151)] = 1063,
+  [SMALL_STATE(152)] = 1067,
+  [SMALL_STATE(153)] = 1071,
+  [SMALL_STATE(154)] = 1075,
+  [SMALL_STATE(155)] = 1079,
+  [SMALL_STATE(156)] = 1083,
+  [SMALL_STATE(157)] = 1087,
+  [SMALL_STATE(158)] = 1091,
+  [SMALL_STATE(159)] = 1095,
+  [SMALL_STATE(160)] = 1099,
+  [SMALL_STATE(161)] = 1103,
+  [SMALL_STATE(162)] = 1107,
+  [SMALL_STATE(163)] = 1111,
+  [SMALL_STATE(164)] = 1115,
+  [SMALL_STATE(165)] = 1119,
+  [SMALL_STATE(166)] = 1123,
+  [SMALL_STATE(167)] = 1127,
+  [SMALL_STATE(168)] = 1131,
+  [SMALL_STATE(169)] = 1135,
 };
 
 static const TSParseActionEntry ts_parse_actions[] = {
   [0] = {.entry = {.count = 0, .reusable = false}},
   [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(),
-  [3] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 0),
-  [5] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
-  [7] = {.entry = {.count = 1, .reusable = false}}, SHIFT(153),
-  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(169),
-  [11] = {.entry = {.count = 1, .reusable = false}}, SHIFT(51),
-  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
-  [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(83),
-  [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
-  [19] = {.entry = {.count = 1, .reusable = true}}, SHIFT(144),
-  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(163),
-  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(161),
-  [25] = {.entry = {.count = 1, .reusable = false}}, SHIFT(160),
-  [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(159),
-  [29] = {.entry = {.count = 1, .reusable = false}}, SHIFT(158),
-  [31] = {.entry = {.count = 1, .reusable = false}}, SHIFT(157),
-  [33] = {.entry = {.count = 1, .reusable = false}}, SHIFT(156),
-  [35] = {.entry = {.count = 1, .reusable = false}}, SHIFT(152),
-  [37] = {.entry = {.count = 1, .reusable = false}}, SHIFT(150),
-  [39] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2),
-  [41] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(35),
-  [44] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(153),
-  [47] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(169),
-  [50] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(51),
-  [53] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(168),
-  [56] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(83),
-  [59] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(46),
-  [62] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(144),
-  [65] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(163),
-  [68] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(161),
-  [71] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(160),
-  [74] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(159),
-  [77] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(158),
-  [80] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(157),
-  [83] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(156),
-  [86] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(152),
-  [89] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(150),
-  [92] = {.entry = {.count = 1, .reusable = true}}, SHIFT(149),
-  [94] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
-  [96] = {.entry = {.count = 1, .reusable = false}}, SHIFT(84),
-  [98] = {.entry = {.count = 1, .reusable = false}}, SHIFT(81),
-  [100] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
-  [102] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
-  [104] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
-  [106] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
-  [108] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
-  [110] = {.entry = {.count = 1, .reusable = false}}, SHIFT(112),
-  [112] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(39),
-  [115] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(84),
-  [118] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2),
-  [120] = {.entry = {.count = 1, .reusable = true}}, SHIFT(151),
-  [122] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
-  [124] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
-  [126] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
-  [128] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
-  [130] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
-  [132] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
-  [134] = {.entry = {.count = 1, .reusable = true}}, SHIFT(141),
-  [136] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 1),
-  [138] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110),
-  [140] = {.entry = {.count = 1, .reusable = true}}, SHIFT(138),
-  [142] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
-  [144] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__statement, 2),
-  [146] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__statement, 2),
-  [148] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__statement, 3),
-  [150] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__statement, 3),
-  [152] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__statement, 4),
-  [154] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__statement, 4),
-  [156] = {.entry = {.count = 1, .reusable = false}}, SHIFT(37),
-  [158] = {.entry = {.count = 1, .reusable = false}}, SHIFT(36),
-  [160] = {.entry = {.count = 1, .reusable = false}}, SHIFT(108),
-  [162] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_blocky_repeat1, 2), SHIFT_REPEAT(37),
-  [165] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_blocky_repeat1, 2), SHIFT_REPEAT(34),
-  [168] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_blocky_repeat1, 2),
-  [170] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
-  [172] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
-  [174] = {.entry = {.count = 1, .reusable = false}}, SHIFT(34),
-  [176] = {.entry = {.count = 1, .reusable = false}}, SHIFT(101),
-  [178] = {.entry = {.count = 1, .reusable = false}}, SHIFT(38),
-  [180] = {.entry = {.count = 1, .reusable = false}}, SHIFT(73),
-  [182] = {.entry = {.count = 1, .reusable = false}}, SHIFT(75),
-  [184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
-  [186] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
-  [188] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
-  [190] = {.entry = {.count = 1, .reusable = false}}, SHIFT(45),
-  [192] = {.entry = {.count = 1, .reusable = false}}, SHIFT(109),
-  [194] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61),
-  [196] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
-  [198] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
-  [200] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
-  [202] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_definition_repeat1, 2),
-  [204] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_type_definition_repeat1, 2), SHIFT_REPEAT(130),
-  [207] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 2), SHIFT_REPEAT(45),
-  [210] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 2),
-  [212] = {.entry = {.count = 1, .reusable = false}}, SHIFT(41),
-  [214] = {.entry = {.count = 1, .reusable = false}}, SHIFT(102),
-  [216] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
-  [218] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
-  [220] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__statement_repeat1, 2), SHIFT_REPEAT(48),
-  [223] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__statement_repeat1, 2),
-  [225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
-  [227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
-  [229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
-  [231] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 1),
-  [233] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 1),
-  [235] = {.entry = {.count = 1, .reusable = false}}, SHIFT(146),
-  [237] = {.entry = {.count = 1, .reusable = false}}, SHIFT(132),
-  [239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
-  [241] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_definition_repeat2, 2),
-  [243] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_type_definition_repeat2, 2), SHIFT_REPEAT(117),
-  [246] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
-  [248] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
-  [250] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
-  [252] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
-  [254] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_use, 3),
-  [256] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use, 3),
-  [258] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 3),
-  [260] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 3),
-  [262] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 2),
-  [264] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 2),
-  [266] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
-  [268] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
-  [270] = {.entry = {.count = 1, .reusable = false}}, SHIFT(122),
-  [272] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
-  [274] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
-  [276] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_block_repeat1, 2), SHIFT_REPEAT(128),
-  [279] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_block_repeat1, 2),
-  [281] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
-  [283] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_blocky, 2),
-  [285] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_with_expr_repeat1, 2),
-  [287] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_with_expr_repeat1, 2), SHIFT_REPEAT(74),
-  [290] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_blocky, 3),
-  [292] = {.entry = {.count = 1, .reusable = false}}, SHIFT(164),
-  [294] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
-  [296] = {.entry = {.count = 1, .reusable = false}}, SHIFT(119),
-  [298] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
-  [300] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_func, 5),
-  [302] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_func, 5),
-  [304] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 1),
-  [306] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 1),
-  [308] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_expr, 4),
-  [310] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_expr, 4),
-  [312] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_array, 4),
-  [314] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_array, 4),
-  [316] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
-  [318] = {.entry = {.count = 1, .reusable = true}}, SHIFT(154),
-  [320] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 5),
-  [322] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 5),
-  [324] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_definition, 12),
-  [326] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_definition, 12),
-  [328] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_catch, 11),
-  [330] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_catch, 11),
-  [332] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if, 5),
-  [334] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if, 5),
-  [336] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while, 11),
-  [338] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while, 11),
-  [340] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_definition, 11),
-  [342] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_definition, 11),
-  [344] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 4),
-  [346] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 4),
-  [348] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_catch, 10),
-  [350] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_catch, 10),
-  [352] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_include, 5),
-  [354] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include, 5),
-  [356] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while, 10),
-  [358] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while, 10),
-  [360] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 6),
-  [362] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 6),
-  [364] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression, 4),
-  [366] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression, 4),
-  [368] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_definition, 10),
-  [370] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_definition, 10),
-  [372] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if, 6),
-  [374] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if, 6),
-  [376] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_definition_repeat2, 3),
-  [378] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_blocky, 3),
-  [380] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string, 2),
-  [382] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 2),
-  [384] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_catch, 9),
-  [386] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_catch, 9),
-  [388] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
-  [390] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while, 9),
-  [392] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while, 9),
-  [394] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_definition, 7),
-  [396] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_definition, 7),
-  [398] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_definition, 9),
-  [400] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_definition, 9),
-  [402] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_blocky, 2),
-  [404] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string, 3),
-  [406] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 3),
-  [408] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_expression, 3),
-  [410] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_expression, 3),
-  [412] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_expr, 3),
-  [414] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_expr, 3),
-  [416] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_array, 3),
-  [418] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_array, 3),
-  [420] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_def, 3),
-  [422] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_def, 3),
-  [424] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
-  [426] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_func, 8),
-  [428] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_func, 8),
-  [430] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_definition, 8),
-  [432] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_definition, 8),
-  [434] = {.entry = {.count = 1, .reusable = true}}, SHIFT(125),
-  [436] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
-  [438] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
-  [440] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
-  [442] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13),
-  [444] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
-  [446] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
-  [448] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
-  [450] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
-  [452] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
-  [454] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
-  [456] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
-  [458] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
-  [460] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
-  [462] = {.entry = {.count = 1, .reusable = true}}, SHIFT(135),
-  [464] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
-  [466] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
-  [468] = {.entry = {.count = 1, .reusable = true}}, SHIFT(143),
-  [470] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
-  [472] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
-  [474] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
-  [476] = {.entry = {.count = 1, .reusable = true}}, SHIFT(121),
-  [478] = {.entry = {.count = 1, .reusable = true}}, SHIFT(142),
-  [480] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
-  [482] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
-  [484] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
-  [486] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
-  [488] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
-  [490] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
-  [492] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [494] = {.entry = {.count = 1, .reusable = true}}, SHIFT(140),
-  [496] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
-  [498] = {.entry = {.count = 1, .reusable = true}}, SHIFT(166),
-  [500] = {.entry = {.count = 1, .reusable = true}}, SHIFT(133),
-  [502] = {.entry = {.count = 1, .reusable = true}}, SHIFT(145),
-  [504] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
-  [506] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
-  [508] = {.entry = {.count = 1, .reusable = true}}, SHIFT(134),
-  [510] = {.entry = {.count = 1, .reusable = true}}, SHIFT(136),
-  [512] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
-  [514] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
-  [516] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
-  [518] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
-  [520] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147),
-  [522] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
-  [524] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
-  [526] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
-  [528] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
-  [530] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
-  [532] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
+  [3] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 0, 0, 0),
+  [5] = {.entry = {.count = 1, .reusable = false}}, SHIFT(40),
+  [7] = {.entry = {.count = 1, .reusable = false}}, SHIFT(165),
+  [9] = {.entry = {.count = 1, .reusable = false}}, SHIFT(169),
+  [11] = {.entry = {.count = 1, .reusable = false}}, SHIFT(36),
+  [13] = {.entry = {.count = 1, .reusable = false}}, SHIFT(168),
+  [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(37),
+  [17] = {.entry = {.count = 1, .reusable = false}}, SHIFT(78),
+  [19] = {.entry = {.count = 1, .reusable = false}}, SHIFT(8),
+  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(164),
+  [23] = {.entry = {.count = 1, .reusable = false}}, SHIFT(163),
+  [25] = {.entry = {.count = 1, .reusable = false}}, SHIFT(162),
+  [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(161),
+  [29] = {.entry = {.count = 1, .reusable = false}}, SHIFT(160),
+  [31] = {.entry = {.count = 1, .reusable = false}}, SHIFT(158),
+  [33] = {.entry = {.count = 1, .reusable = false}}, SHIFT(157),
+  [35] = {.entry = {.count = 1, .reusable = false}}, SHIFT(156),
+  [37] = {.entry = {.count = 1, .reusable = false}}, SHIFT(155),
+  [39] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0),
+  [41] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(40),
+  [44] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(165),
+  [47] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(169),
+  [50] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0),
+  [52] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(36),
+  [55] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(168),
+  [58] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(37),
+  [61] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(78),
+  [64] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(8),
+  [67] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(164),
+  [70] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(163),
+  [73] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(162),
+  [76] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(161),
+  [79] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(160),
+  [82] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(158),
+  [85] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(157),
+  [88] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(156),
+  [91] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2, 0, 0), SHIFT_REPEAT(155),
+  [94] = {.entry = {.count = 1, .reusable = false}}, SHIFT(75),
+  [96] = {.entry = {.count = 1, .reusable = false}}, SHIFT(74),
+  [98] = {.entry = {.count = 1, .reusable = false}}, SHIFT(45),
+  [100] = {.entry = {.count = 1, .reusable = false}}, SHIFT(147),
+  [102] = {.entry = {.count = 1, .reusable = false}}, SHIFT(28),
+  [104] = {.entry = {.count = 1, .reusable = false}}, SHIFT(56),
+  [106] = {.entry = {.count = 1, .reusable = false}}, SHIFT(87),
+  [108] = {.entry = {.count = 1, .reusable = false}}, SHIFT(145),
+  [110] = {.entry = {.count = 1, .reusable = false}}, SHIFT(81),
+  [112] = {.entry = {.count = 1, .reusable = false}}, SHIFT(61),
+  [114] = {.entry = {.count = 1, .reusable = false}}, SHIFT(44),
+  [116] = {.entry = {.count = 1, .reusable = false}}, SHIFT(80),
+  [118] = {.entry = {.count = 1, .reusable = false}}, SHIFT(73),
+  [120] = {.entry = {.count = 1, .reusable = false}}, SHIFT(68),
+  [122] = {.entry = {.count = 1, .reusable = false}}, SHIFT(143),
+  [124] = {.entry = {.count = 1, .reusable = false}}, SHIFT(69),
+  [126] = {.entry = {.count = 1, .reusable = false}}, SHIFT(67),
+  [128] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 1, 0, 0),
+  [130] = {.entry = {.count = 1, .reusable = false}}, SHIFT(148),
+  [132] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__statement, 2, 0, 0),
+  [134] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__statement, 2, 0, 0),
+  [136] = {.entry = {.count = 1, .reusable = false}}, SHIFT(85),
+  [138] = {.entry = {.count = 1, .reusable = false}}, SHIFT(134),
+  [140] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__unspaced_statement, 1, 0, 0),
+  [142] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__unspaced_statement, 1, 0, 0),
+  [144] = {.entry = {.count = 1, .reusable = false}}, SHIFT(70),
+  [146] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__unspaced_statement, 2, 0, 0),
+  [148] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__unspaced_statement, 2, 0, 0),
+  [150] = {.entry = {.count = 1, .reusable = false}}, SHIFT(34),
+  [152] = {.entry = {.count = 1, .reusable = false}}, SHIFT(42),
+  [154] = {.entry = {.count = 1, .reusable = false}}, SHIFT(90),
+  [156] = {.entry = {.count = 1, .reusable = false}}, SHIFT(33),
+  [158] = {.entry = {.count = 1, .reusable = false}}, SHIFT(91),
+  [160] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 2, 0, 0),
+  [162] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 2, 0, 0),
+  [164] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 1, 0, 0),
+  [166] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 1, 0, 0),
+  [168] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call, 3, 0, 0),
+  [170] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call, 3, 0, 0),
+  [172] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_use, 3, 0, 0),
+  [174] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use, 3, 0, 0),
+  [176] = {.entry = {.count = 1, .reusable = false}}, SHIFT(48),
+  [178] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
+  [180] = {.entry = {.count = 1, .reusable = false}}, SHIFT(43),
+  [182] = {.entry = {.count = 1, .reusable = false}}, SHIFT(46),
+  [184] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_blocky_repeat1, 2, 0, 0), SHIFT_REPEAT(34),
+  [187] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_blocky_repeat1, 2, 0, 0), SHIFT_REPEAT(42),
+  [190] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_blocky_repeat1, 2, 0, 0),
+  [192] = {.entry = {.count = 1, .reusable = false}}, SHIFT(59),
+  [194] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_array, 3, 0, 0),
+  [196] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_array, 3, 0, 0),
+  [198] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if, 6, 0, 0),
+  [200] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if, 6, 0, 0),
+  [202] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_blocky, 2, 0, 0),
+  [204] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_blocky, 2, 0, 0),
+  [206] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_definition, 1, 0, 0),
+  [208] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_definition, 1, 0, 0),
+  [210] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__unspaced_statement_repeat1, 2, 0, 0), SHIFT_REPEAT(48),
+  [213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__unspaced_statement_repeat1, 2, 0, 0),
+  [215] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym__unspaced_statement_repeat1, 2, 0, 0),
+  [217] = {.entry = {.count = 1, .reusable = false}}, SHIFT(99),
+  [219] = {.entry = {.count = 1, .reusable = false}}, SHIFT(65),
+  [221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
+  [223] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_definition, 10, 0, 0),
+  [225] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_definition, 10, 0, 0),
+  [227] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_type_definition_repeat1, 2, 0, 0),
+  [229] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_type_definition_repeat1, 2, 0, 0), SHIFT_REPEAT(123),
+  [232] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_definition, 8, 0, 0),
+  [234] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_definition, 8, 0, 0),
+  [236] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string, 3, 0, 0),
+  [238] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 3, 0, 0),
+  [240] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 2, 0, 0), SHIFT_REPEAT(54),
+  [243] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_repeat1, 2, 0, 0),
+  [245] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_func, 8, 0, 0),
+  [247] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_func, 8, 0, 0),
+  [249] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while, 10, 0, 0),
+  [251] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while, 10, 0, 0),
+  [253] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_expr, 3, 0, 0),
+  [255] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_expr, 3, 0, 0),
+  [257] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_expr, 3, 0, 0),
+  [259] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_expr, 3, 0, 0),
+  [261] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_blocky, 3, 0, 0),
+  [263] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_blocky, 3, 0, 0),
+  [265] = {.entry = {.count = 1, .reusable = false}}, SHIFT(93),
+  [267] = {.entry = {.count = 1, .reusable = false}}, SHIFT(50),
+  [269] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_catch, 10, 0, 0),
+  [271] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_catch, 10, 0, 0),
+  [273] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_def, 3, 0, 0),
+  [275] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_def, 3, 0, 0),
+  [277] = {.entry = {.count = 1, .reusable = false}}, SHIFT(106),
+  [279] = {.entry = {.count = 1, .reusable = false}}, SHIFT(52),
+  [281] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_definition, 7, 0, 0),
+  [283] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_definition, 7, 0, 0),
+  [285] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_definition, 9, 0, 0),
+  [287] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_definition, 9, 0, 0),
+  [289] = {.entry = {.count = 1, .reusable = false}}, SHIFT(107),
+  [291] = {.entry = {.count = 1, .reusable = false}}, SHIFT(64),
+  [293] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 6, 0, 0),
+  [295] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 6, 0, 0),
+  [297] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while, 9, 0, 0),
+  [299] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while, 9, 0, 0),
+  [301] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_catch, 9, 0, 0),
+  [303] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_catch, 9, 0, 0),
+  [305] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__unspaced_statement, 3, 0, 0),
+  [307] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__unspaced_statement, 3, 0, 0),
+  [309] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_include, 5, 0, 0),
+  [311] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include, 5, 0, 0),
+  [313] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_definition, 11, 0, 0),
+  [315] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_definition, 11, 0, 0),
+  [317] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 4, 0, 0),
+  [319] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 4, 0, 0),
+  [321] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_while, 11, 0, 0),
+  [323] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_while, 11, 0, 0),
+  [325] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_catch, 11, 0, 0),
+  [327] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_catch, 11, 0, 0),
+  [329] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_definition, 12, 0, 0),
+  [331] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_definition, 12, 0, 0),
+  [333] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_expr, 4, 0, 0),
+  [335] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_expr, 4, 0, 0),
+  [337] = {.entry = {.count = 1, .reusable = false}}, SHIFT(83),
+  [339] = {.entry = {.count = 1, .reusable = false}}, SHIFT(84),
+  [341] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_with_expr, 4, 0, 0),
+  [343] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_with_expr, 4, 0, 0),
+  [345] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_if, 5, 0, 0),
+  [347] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_if, 5, 0, 0),
+  [349] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_array, 4, 0, 0),
+  [351] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_array, 4, 0, 0),
+  [353] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_call_expr, 5, 0, 0),
+  [355] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_call_expr, 5, 0, 0),
+  [357] = {.entry = {.count = 1, .reusable = false}}, SHIFT(54),
+  [359] = {.entry = {.count = 1, .reusable = false}}, SHIFT(53),
+  [361] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string, 2, 0, 0),
+  [363] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 2, 0, 0),
+  [365] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_func, 5, 0, 0),
+  [367] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_func, 5, 0, 0),
+  [369] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_block, 5, 0, 0),
+  [371] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 5, 0, 0),
+  [373] = {.entry = {.count = 1, .reusable = false}}, SHIFT(79),
+  [375] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
+  [377] = {.entry = {.count = 1, .reusable = false}}, SHIFT(76),
+  [379] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
+  [381] = {.entry = {.count = 1, .reusable = false}}, SHIFT(72),
+  [383] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
+  [385] = {.entry = {.count = 1, .reusable = false}}, SHIFT(17),
+  [387] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_with_expr_repeat1, 2, 0, 0),
+  [389] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_with_expr_repeat1, 2, 0, 0), SHIFT_REPEAT(96),
+  [392] = {.entry = {.count = 1, .reusable = false}}, SHIFT(58),
+  [394] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
+  [396] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_block_repeat1, 2, 0, 0), SHIFT_REPEAT(130),
+  [399] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_block_repeat1, 2, 0, 0),
+  [401] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_type_definition_repeat2, 2, 0, 0),
+  [403] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_type_definition_repeat2, 2, 0, 0), SHIFT_REPEAT(117),
+  [406] = {.entry = {.count = 1, .reusable = true}}, SHIFT(166),
+  [408] = {.entry = {.count = 1, .reusable = true}}, SHIFT(169),
+  [410] = {.entry = {.count = 1, .reusable = false}}, SHIFT(10),
+  [412] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_definition_repeat1, 2, 0, 0),
+  [414] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_type_definition_repeat2, 3, 0, 0),
+  [416] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_definition_repeat2, 3, 0, 0),
+  [418] = {.entry = {.count = 1, .reusable = false}}, SHIFT(77),
+  [420] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
+  [422] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
+  [424] = {.entry = {.count = 1, .reusable = true}}, SHIFT(153),
+  [426] = {.entry = {.count = 1, .reusable = false}}, SHIFT(57),
+  [428] = {.entry = {.count = 1, .reusable = false}}, SHIFT(82),
+  [430] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_block_repeat1, 2, 0, 0),
+  [432] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
+  [434] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__unspaced_statement, 4, 0, 0),
+  [436] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__unspaced_statement, 4, 0, 0),
+  [438] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
+  [440] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
+  [442] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
+  [444] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
+  [446] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
+  [448] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
+  [450] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
+  [452] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
+  [454] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
+  [456] = {.entry = {.count = 1, .reusable = true}}, SHIFT(133),
+  [458] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
+  [460] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
+  [462] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
+  [464] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
+  [466] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
+  [468] = {.entry = {.count = 1, .reusable = true}}, SHIFT(138),
+  [470] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109),
+  [472] = {.entry = {.count = 1, .reusable = true}}, SHIFT(140),
+  [474] = {.entry = {.count = 1, .reusable = true}}, SHIFT(150),
+  [476] = {.entry = {.count = 1, .reusable = true}}, SHIFT(125),
+  [478] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
+  [480] = {.entry = {.count = 1, .reusable = true}}, SHIFT(146),
+  [482] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
+  [484] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
+  [486] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
+  [488] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
+  [490] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
+  [492] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
+  [494] = {.entry = {.count = 1, .reusable = true}}, SHIFT(152),
+  [496] = {.entry = {.count = 1, .reusable = true}}, SHIFT(132),
+  [498] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
+  [500] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
+  [502] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
+  [504] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [506] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
+  [508] = {.entry = {.count = 1, .reusable = true}}, SHIFT(135),
+  [510] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
+  [512] = {.entry = {.count = 1, .reusable = true}}, SHIFT(141),
+  [514] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
+  [516] = {.entry = {.count = 1, .reusable = true}}, SHIFT(142),
+  [518] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
+  [520] = {.entry = {.count = 1, .reusable = true}}, SHIFT(144),
+  [522] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
+  [524] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
+  [526] = {.entry = {.count = 1, .reusable = true}}, SHIFT(149),
+  [528] = {.entry = {.count = 1, .reusable = true}}, SHIFT(121),
+  [530] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
+  [532] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [534] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
 };
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-#ifdef _WIN32
-#define extern __declspec(dllexport)
+#ifdef TREE_SITTER_HIDE_SYMBOLS
+#define TS_PUBLIC
+#elif defined(_WIN32)
+#define TS_PUBLIC __declspec(dllexport)
+#else
+#define TS_PUBLIC __attribute__((visibility("default")))
 #endif
 
-extern const TSLanguage *tree_sitter_spl(void) {
+TS_PUBLIC const TSLanguage *tree_sitter_spl(void) {
   static const TSLanguage language = {
     .version = LANGUAGE_VERSION,
     .symbol_count = SYMBOL_COUNT,
diff --git a/src/tree_sitter/parser.h b/src/tree_sitter/parser.h
index 2b14ac1..17f0e94 100644
--- a/src/tree_sitter/parser.h
+++ b/src/tree_sitter/parser.h
@@ -13,9 +13,8 @@ extern "C" {
 #define ts_builtin_sym_end 0
 #define TREE_SITTER_SERIALIZATION_BUFFER_SIZE 1024
 
-typedef uint16_t TSStateId;
-
 #ifndef TREE_SITTER_API_H_
+typedef uint16_t TSStateId;
 typedef uint16_t TSSymbol;
 typedef uint16_t TSFieldId;
 typedef struct TSLanguage TSLanguage;
@@ -87,6 +86,11 @@ typedef union {
   } entry;
 } TSParseActionEntry;
 
+typedef struct {
+  int32_t start;
+  int32_t end;
+} TSCharacterRange;
+
 struct TSLanguage {
   uint32_t version;
   uint32_t symbol_count;
@@ -126,13 +130,38 @@ struct TSLanguage {
   const TSStateId *primary_state_ids;
 };
 
+static inline bool set_contains(TSCharacterRange *ranges, uint32_t len, int32_t lookahead) {
+  uint32_t index = 0;
+  uint32_t size = len - index;
+  while (size > 1) {
+    uint32_t half_size = size / 2;
+    uint32_t mid_index = index + half_size;
+    TSCharacterRange *range = &ranges[mid_index];
+    if (lookahead >= range->start && lookahead <= range->end) {
+      return true;
+    } else if (lookahead > range->end) {
+      index = mid_index;
+    }
+    size -= half_size;
+  }
+  TSCharacterRange *range = &ranges[index];
+  return (lookahead >= range->start && lookahead <= range->end);
+}
+
 /*
  *  Lexer Macros
  */
 
+#ifdef _MSC_VER
+#define UNUSED __pragma(warning(suppress : 4101))
+#else
+#define UNUSED __attribute__((unused))
+#endif
+
 #define START_LEXER()           \
   bool result = false;          \
   bool skip = false;            \
+  UNUSED                        \
   bool eof = false;             \
   int32_t lookahead;            \
   goto start;                   \
@@ -148,6 +177,17 @@ struct TSLanguage {
     goto next_state;         \
   }
 
+#define ADVANCE_MAP(...)                                              \
+  {                                                                   \
+    static const uint16_t map[] = { __VA_ARGS__ };                    \
+    for (uint32_t i = 0; i < sizeof(map) / sizeof(map[0]); i += 2) {  \
+      if (map[i] == lookahead) {                                      \
+        state = map[i + 1];                                           \
+        goto next_state;                                              \
+      }                                                               \
+    }                                                                 \
+  }
+
 #define SKIP(state_value) \
   {                       \
     skip = true;          \
@@ -166,7 +206,7 @@ struct TSLanguage {
  *  Parse Table Macros
  */
 
-#define SMALL_STATE(id) id - LARGE_STATE_COUNT
+#define SMALL_STATE(id) ((id) - LARGE_STATE_COUNT)
 
 #define STATE(id) id
 
@@ -176,7 +216,7 @@ struct TSLanguage {
   {{                                  \
     .shift = {                        \
       .type = TSParseActionTypeShift, \
-      .state = state_value            \
+      .state = (state_value)          \
     }                                 \
   }}
 
@@ -184,7 +224,7 @@ struct TSLanguage {
   {{                                  \
     .shift = {                        \
       .type = TSParseActionTypeShift, \
-      .state = state_value,           \
+      .state = (state_value),         \
       .repetition = true              \
     }                                 \
   }}
@@ -197,14 +237,15 @@ struct TSLanguage {
     }                                 \
   }}
 
-#define REDUCE(symbol_val, child_count_val, ...) \
-  {{                                             \
-    .reduce = {                                  \
-      .type = TSParseActionTypeReduce,           \
-      .symbol = symbol_val,                      \
-      .child_count = child_count_val,            \
-      __VA_ARGS__                                \
-    },                                           \
+#define REDUCE(symbol_name, children, precedence, prod_id) \
+  {{                                                       \
+    .reduce = {                                            \
+      .type = TSParseActionTypeReduce,                     \
+      .symbol = symbol_name,                               \
+      .child_count = children,                             \
+      .dynamic_precedence = precedence,                    \
+      .production_id = prod_id                             \
+    },                                                     \
   }}
 
 #define RECOVER()                    \