plum

git clone https://pyrossh.dev/repos/plum.git

A statically typed, imperative programming language inspired by rust, python

ca4e97c2 — Peter John

improve grammar

Files changed (12) hide show

.github/workflows/ci.yml +22 -0
examples/Logger.kt +182 -0
examples/all.kt +115 -0
grammar.js +210 -6
package.json +11 -7
src/grammar.json +155 -18
src/node-types.json +99 -4
src/parser.c +4190 -1674
test/corpus/class_definitions.txt +8 -12
test/corpus/enum_definitions.txt +4 -2
test/corpus/functions.txt +68 -1
test/corpus/import_statements.txt +3 -2

.github/workflows/ci.yml ADDED Viewed

@@ -0,0 +1,22 @@
+name: Build/test
+on:
+  pull_request:
+    branches:
+      - "**"
+  push:
+    branches:
+      - "master"
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 16
+      - run: npm install
+      - run: npm test

examples/Logger.kt ADDED Viewed

@@ -0,0 +1,182 @@
+package logger
+import github/pine/io
+import github/pine/util
+import github/pine/time
+val log = Logger()
+@cache
+fun log() => Logger {
+  return Logger()
+}
+@Handler
+class JULRedirector(
+  val downstream: Logger
+)
+fun JULRedirector.publish(record: LogRecord) => {
+  when (record.level) {
+    Level.SEVERE -> downstream.error(record.message)
+    Level.WARNING -> downstream.warn(record.message)
+    Level.INFO -> downstream.info(record.message)
+    Level.CONFIG -> downstream.debug(record.message)
+    Level.FINE -> downstream.trace(record.message)
+    else -> downstream.deepTrace(record.message)
+  }
+}
+fun JULRedirector.flush() => {}
+fun JULRedirector.close() => {}
+enum class LogLevel(val value: Int) {
+  NONE(100),
+  ERROR(2),
+  WARN(1),
+  INFO(0),
+  DEBUG(-1),
+  TRACE(-2),
+  DEEP_TRACE(-3),
+  ALL(-100)
+}
+class LogMessage(
+  val level: LogLevel,
+  val message: String
+)
+fun LogMessage.formatted() => String {
+    return "[$level] $message"
+}
+class Logger(
+  var outBackend: ((LogMessage) -> Unit)? = null,
+  var errBackend: ((LogMessage) -> Unit)? = null,
+  val outQueue: Queue<LogMessage> = ArrayDeque(),
+  val errQueue: Queue<LogMessage> = ArrayDeque(),
+  val newline: String = System.lineSeparator(),
+  val logTime: Bool = false,
+  var level: LogLevel = LogLevel.INFO,
+)
+fun Logger.outputError(msg: LogMessage) => {
+  if (errBackend == null) {
+    errQueue.offer(msg)
+  } else {
+    errBackend?.invoke(msg)
+  }
+}
+fun Logger.output(msg: LogMessage) => {
+  if (outBackend == null) {
+    outQueue.offer(msg)
+  } else {
+    outBackend?.invoke(msg)
+  }
+}
+fun Logger.log(msgLevel: LogLevel, msg: String, placeholders: Array<out Any?>) => {
+  if (level.value <= msgLevel.value) {
+    output(LogMessage(msgLevel, format(insertPlaceholders(msg, placeholders))))
+  }
+}
+fun Logger.error(msg: String, vararg placeholders: Any?) => {
+  log(LogLevel.ERROR, msg, placeholders)
+}
+fun Logger.warn(msg: String, vararg placeholders: Any?) => {
+  log(LogLevel.WARN, msg, placeholders)
+}
+fun Logger.info(msg: String, vararg placeholders: Any?) => {
+  log(LogLevel.INFO, msg, placeholders)
+}
+fun Logger.debug(msg: String, vararg placeholders: Any?) => {
+  log(LogLevel.DEBUG, msg, placeholders)
+}
+fun Logger.trace(msg: String, vararg placeholders: Any?) => {
+  log(LogLevel.TRACE, msg, placeholders)
+}
+fun Logger.deepTrace(msg: String, vararg placeholders: Any?) => {
+  log(LogLevel.DEEP_TRACE, msg, placeholders)
+}
+fun Logger.connectJULFrontend() => {
+  val rootLogger = java.util.logging.Logger.getLogger("")
+  rootLogger.addHandler(JULRedirector(this))
+}
+fun Logger.connectOutputBackend(outBackend: (LogMessage) -> Unit) => {
+  this.outBackend = outBackend
+  flushOutQueue()
+}
+fun Logger.connectErrorBackend(errBackend: (LogMessage) -> Unit) => {
+  this.errBackend = errBackend
+  flushErrQueue()
+}
+fun Logger.connectStdioBackend() => {
+  connectOutputBackend { println(it.formatted) }
+  connectOutputBackend { System.err.println(it.formatted) }
+}
+fun Logger.insertPlaceholders(msg: String, placeholders: Array<out Any?>) => String {
+  val msgLength = msg.length
+  val lastIndex = msgLength - 1
+  var charIndex = 0
+  var placeholderIndex = 0
+  var result = StringBuilder()
+  while (charIndex < msgLength) {
+    val currentChar = msg.get(charIndex)
+    val nextChar = if (charIndex != lastIndex) msg.get(charIndex + 1) else '?'
+    if ((currentChar == '{') && (nextChar == '}')) {
+      if (placeholderIndex >= placeholders.size) {
+        return "ERROR: Tried to log more '{}' placeholders than there are values"
+      }
+      result.append(placeholders[placeholderIndex] ?: "null")
+      placeholderIndex += 1
+      charIndex += 2
+    } else {
+      result.append(currentChar)
+      charIndex += 1
+    }
+  }
+  return result.toString()
+}
+fun Logger.flushOutQueue() => {
+  while (outQueue.isNotEmpty()) {
+    outBackend?.invoke(outQueue.poll())
+  }
+}
+fun Logger.flushErrQueue() => {
+  while (errQueue.isNotEmpty()) {
+    errBackend?.invoke(errQueue.poll())
+  }
+}
+fun Logger.format(msg: String) => String {
+  val time = if (logTime) "${Instant.now()} " else ""
+  var thread = Thread.currentThread().name
+  return time + shortenOrPad(thread, 10) + msg
+}
+fun Logger.shortenOrPad(str: String, length: Int) => String {
+  if (str.length <= length) {
+    return str.padEnd(length, ' ')
+  } else {
+    return ".." + str.substring(str.length - length + 2)
+  }
+}

examples/all.kt ADDED Viewed

@@ -0,0 +1,115 @@
+import github.com/std/http
+enum Color(val rgb: Int) {
+  RED(0xFF0000),
+  GREEN(0x00FF00),
+  BLUE(0x0000FF)
+}
+fun Color.isReddish() => Bool {
+  return this == Color.Red
+}
+trait List(
+  val name: String
+  fun area(): Float
+)
+class Email(value: String)
+fun Email.init() => {
+  if !value.match("/s\@/s") {
+    throw error("Email not value ${value}")
+  }
+}
+class Array<T>(
+  var items: []T,
+  var size: Int
+)
+fun Array<T>.get(index: Int): T => {
+  return items[int]
+}
+fun Array<T>.set(index: Int, value: T) => {
+  items[i] = value
+}
+fun listOf<T>(elements: ...T): List<T> => {
+  return Array(elements)
+}
+class User(
+  val name: String,
+  val age: Int,
+  val email: Email,
+)
+fun User.init() => {
+  assert(name.size > 5, "name is not valid")
+  assert(age > 0 && age < 130, "age is not valid")
+  assert(email.test("regex"), "email is not valid")
+}
+fun User.invoke() => {
+  println("Hello")
+  listOf(0, 1, 2, 3).map { "Number ${it}" }
+  range(0, 10, 1).each { i, v ->
+    echo i, v
+  }
+}
+fun User.getFullName() => String {
+  return "${name} 123"
+}
+@Get("/about")
+fun about() => HtmlNode {
+  val sir = "John"
+  html {
+    head {
+      title {
+        "Tesla"
+      }
+    }
+    body {
+      div {
+        "Welcome ${sir}"
+      }
+    }
+  }
+}
+fun main(args: List<String>) => {
+  println(hello)
+  val items = args?
+    .map { it.name }
+    .filter { it.isVerified }
+    .each { it -> it.name } ?: listOf()
+  val john = User("John", 2)
+  val jill = User(name = "Jill", age = 3)
+  val jack = john.copy(age = 5)
+  val (name, age) = jack
+  // Pair, Triple
+  val name2 = jill?.let {
+    it.name + "123"
+  }
+  jill?.run {
+    println(it)
+  }
+  names.each { name, i ->
+    println(name, i)
+  }
+  TODO()
+  when message {
+    New -> println("new $id: $quantity")
+    Cancel -> println("cancel $id")
+  }
+}

grammar.js CHANGED Viewed

@@ -2,10 +2,40 @@ const DEC_DIGITS = token(sep1(/[0-9]+/, /_+/));
 const HEX_DIGITS = token(sep1(/[0-9a-fA-F]+/, /_+/));
 const BIN_DIGITS = token(sep1(/[01]/, /_+/));
+const PREC = {
+  POSTFIX: 16,
+  PREFIX: 15,
+  TYPE_RHS: 14,
+  AS: 13,
+  MULTIPLICATIVE: 12,
+  ADDITIVE: 11,
+  RANGE: 10,
+  INFIX: 9,
+  ELVIS: 8,
+  CHECK: 7,
+  COMPARISON: 6,
+  EQUALITY: 5,
+  CONJUNCTION: 4,
+  DISJUNCTION: 3,
+  SPREAD: 2,
+  SIMPLE_USER_TYPE: 2,
+  VAR_DECL: 1,
+  ASSIGNMENT: 1,
+  BLOCK: 1,
+  LAMBDA_LITERAL: 0,
+  RETURN_OR_THROW: 0,
+  COMMENT: 0
+};
 module.exports = grammar({
   name: 'pine',
   conflicts: $ => [
     [$.fun_field],
+    [$.decorator_name],
+  ],
+  extras: $ => [
+    $.comment,
+    /\s+/ // Whitespace
   ],
   rules: {
     source_file: $ => seq(
@@ -16,6 +46,8 @@ module.exports = grammar({
     import_statement: $ => seq('import', $.url),
+    // Definitions
     definitions: $ => choice(
       $.class_definition,
       $.trait_definition,
@@ -24,10 +56,11 @@ module.exports = grammar({
     ),
     class_definition: $ => seq(
-      field('traits', optional(repeat($.trait_name))),
+      field('decorators', optional(repeat($.decorator_name))),
       'class',
       field('name', $.definition_name),
       field('generics', optional($.generic_list)),
+      field('traits', optional($.trait_list)),
       field('fields', seq('(', commaSep1($.type_field), ')')),
     ),
@@ -46,20 +79,21 @@ module.exports = grammar({
     ),
     fun_definition: $ => seq(
+      field('decorators', optional(repeat($.decorator_name))),
       'fun',
       field('name', choice($.identifier, $._extension)),
+      field('generics', optional($.generic_list)),
       field('params', seq('(', optional(commaSep1($.param)), ')')),
       '=>',
       field('returns', optional(commaSep1($.type))),
-      '{', '}',
+      field('body', $._block)
     ),
-    trait_name: $ => seq("@", $.definition_name),
+    decorator_name: $ => seq("@", $.identifier, '(', optional(commaSep1($._primary_expression)), ')'),
     trait_list: $ => seq(
-      '(',
+      ':',
-      commaSep1($.identifier),
+      commaSep1($.definition_name),
-      ')'
     ),
     generic_list: $ => seq(
@@ -98,6 +132,172 @@ module.exports = grammar({
     enum_field: $ => seq($.enum_field_name, '(', commaSep1($._primary_expression), ')'),
+    // Expressions
+    _block: $ => prec(PREC.BLOCK, seq(
+      "{",
+      // optional($.statements),
+      "}"
+    )),
+    // statements: $ => seq(
+    //   $._statement,
+    // ),
+    // _statement: $ => choice(
+    //   choice(
+    //     $.assignment,
+    //     $._loop_statement,
+    //     $._expression
+    //   )
+    // ),
+    // _loop_statement: $ => choice(
+    //   $.for_statement,
+    //   $.while_statement,
+    // ),
+    // for_statement: $ => prec.right(seq(
+    //   "for",
+    //   "(",
+    //   repeat($.annotation),
+    //   choice($.variable_declaration, $.multi_variable_declaration),
+    //   "in",
+    //   $._expression,
+    //   ")",
+    //   optional($.control_structure_body)
+    // )),
+    // while_statement: $ => seq(
+    //   "while",
+    //   "(",
+    //   $._expression,
+    //   ")",
+    //   choice(";", $.control_structure_body)
+    // ),
+    // assignment: $ => choice(
+    //   prec.left(PREC.ASSIGNMENT, seq($.directly_assignable_expression, $._assignment_and_operator, $._expression)),
+    //   prec.left(PREC.ASSIGNMENT, seq($.directly_assignable_expression, "=", $._expression)),
+    //   // TODO
+    // ),
+    // // ==========
+    // // Expressions
+    // // ==========
+    // _expression: $ => choice(
+    //   $._unary_expression,
+    //   $._binary_expression,
+    //   $._primary_expression
+    // ),
+    // // Unary expressions
+    // _unary_expression: $ => choice(
+    //   $.postfix_expression,
+    //   $.call_expression,
+    //   $.indexing_expression,
+    //   $.navigation_expression,
+    //   $.prefix_expression,
+    //   $.as_expression,
+    //   $.spread_expression
+    // ),
+    // postfix_expression: $ => prec.left(PREC.POSTFIX, seq($._expression, $._postfix_unary_operator)),
+    // call_expression: $ => prec.left(PREC.POSTFIX, seq($._expression, $.call_suffix)),
+    // indexing_expression: $ => prec.left(PREC.POSTFIX, seq($._expression, $.indexing_suffix)),
+    // navigation_expression: $ => prec.left(PREC.POSTFIX, seq($._expression, $.navigation_suffix)),
+    // prefix_expression: $ => prec.right(seq(choice($.annotation, $.label, $._prefix_unary_operator), $._expression)),
+    // as_expression: $ => prec.left(PREC.AS, seq($._expression, $._as_operator, $._type)),
+    // spread_expression: $ => prec.left(PREC.SPREAD, seq("*", $._expression)),
+    // _binary_expression: $ => choice(
+    //   $.multiplicative_expression,
+    //   $.additive_expression,
+    //   $.range_expression,
+    //   $.infix_expression,
+    //   $.elvis_expression,
+    //   $.check_expression,
+    //   $.comparison_expression,
+    //   $.equality_expression,
+    //   $.comparison_expression,
+    //   $.equality_expression,
+    //   $.conjunction_expression,
+    //   $.disjunction_expression
+    // ),
+    // multiplicative_expression: $ => prec.left(PREC.MULTIPLICATIVE, seq($._expression, $._multiplicative_operator, $._expression)),
+    // additive_expression: $ => prec.left(PREC.ADDITIVE, seq($._expression, $._additive_operator, $._expression)),
+    // range_expression: $ => prec.left(PREC.RANGE, seq($._expression, "..", $._expression)),
+    // infix_expression: $ => prec.left(PREC.INFIX, seq($._expression, $.simple_identifier, $._expression)),
+    // elvis_expression: $ => prec.left(PREC.ELVIS, seq($._expression, "?:", $._expression)),
+    // check_expression: $ => prec.left(PREC.CHECK, seq($._expression, choice(
+    //   seq($._in_operator, $._expression),
+    //   seq($._is_operator, $._type)))),
+    // comparison_expression: $ => prec.left(PREC.COMPARISON, seq($._expression, $._comparison_operator, $._expression)),
+    // equality_expression: $ => prec.left(PREC.EQUALITY, seq($._expression, $._equality_operator, $._expression)),
+    // conjunction_expression: $ => prec.left(PREC.CONJUNCTION, seq($._expression, "&&", $._expression)),
+    // disjunction_expression: $ => prec.left(PREC.DISJUNCTION, seq($._expression, "||", $._expression)),
+    //  // Suffixes
+    // indexing_suffix: $ => seq("[", sep1($._expression, ","), "]"),
+    // navigation_suffix: $ => seq(
+    //    $._member_access_operator,
+    //    choice(
+    //      $.simple_identifier,
+    //      $.parenthesized_expression,
+    //      "class"
+    //    )
+    // ),
+    // call_suffix: $ => prec.left(seq(
+    //    // this introduces ambiguities with 'less than' for comparisons
+    //    optional($.type_arguments),
+    //    choice(
+    //      seq(optional($.value_arguments), $.annotated_lambda),
+    //      $.value_arguments
+    //    )
+    // )),
+    // variable_declaration: $ => prec.left(PREC.VAR_DECL, seq(
+    //   // repeat($.annotation), TODO
+    //   $.simple_identifier,
+    //   optional(seq(":", $._type))
+    // )),
+    // function_type: $ => seq(
+    //   optional(seq($._simple_user_type, ".")), // TODO: Support "real" types
+    //   $.function_type_parameters,
+    //   "->",
+    //   $._type
+    // ),
+    // function_type_parameters: $ => prec.left(1, seq(
+    //   "(",
+    //   optional(sep1(choice($.parameter, $._type), ",")),
+    //   ")"
+    // )),
+    // parenthesized_type: $ => seq("(", $._type, ")"),
     _primary_expression: $ => choice(
       $._literal_constant,
       $._string_literal,
@@ -180,6 +380,10 @@ module.exports = grammar({
       $.float_literal,
       "null",
     ),
+    comment: $ => token(prec(PREC.COMMENT, choice(
+      seq("#", /.*/),
+    ))),
   }
 });

package.json CHANGED Viewed

@@ -1,20 +1,24 @@
 {
   "name": "tree-sitter-pine",
-  "version": "1.0.0",
+  "version": "0.1.0",
   "main": "bindings/node",
-  "description": "Pine grammar for tree-sitter",
+  "description": "Tree-Sitter grammar for pine",
   "scripts": {
+    "test": "tree-sitter test",
+    "install": "node-gyp rebuild",
-    "build": "tree-sitter generate && node-gyp build",
+    "generate": "tree-sitter generate",
-    "test": "tree-sitter test && script/parse-examples",
     "parse": "tree-sitter parse",
-    "test-windows": "tree-sitter test"
+    "build-wasm": "tree-sitter build-wasm",
+    "playground": "tree-sitter playground"
   },
   "author": "pyrossh",
   "license": "MIT",
   "keywords": [
+    "tree-sitter",
+    "pine",
+    "grammar",
     "parser",
-    "lexer",
+    "lexer"
-    "pine"
   ],
   "dependencies": {
     "nan": "^2.17.0"

src/grammar.json CHANGED Viewed

@@ -72,7 +72,7 @@
       "members": [
         {
           "type": "FIELD",
-          "name": "traits",
+          "name": "decorators",
           "content": {
             "type": "CHOICE",
             "members": [
@@ -80,7 +80,7 @@
                 "type": "REPEAT",
                 "content": {
                   "type": "SYMBOL",
-                  "name": "trait_name"
+                  "name": "decorator_name"
                 }
               },
               {
@@ -117,6 +117,22 @@
             ]
           }
         },
+        {
+          "type": "FIELD",
+          "name": "traits",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "trait_list"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "FIELD",
           "name": "fields",
@@ -340,6 +356,25 @@
     "fun_definition": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "FIELD",
+          "name": "decorators",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "REPEAT",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "decorator_name"
+                }
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "STRING",
           "value": "fun"
@@ -361,6 +396,22 @@
             ]
           }
         },
+        {
+          "type": "FIELD",
+          "name": "generics",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "generic_list"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        },
         {
           "type": "FIELD",
           "name": "params",
@@ -453,16 +504,16 @@
           }
         },
         {
+          "type": "FIELD",
+          "name": "body",
+          "content": {
-          "type": "STRING",
+            "type": "SYMBOL",
-          "value": "{"
+            "name": "_block"
-        },
+          }
-        {
-          "type": "STRING",
-          "value": "}"
         }
       ]
     },
-    "trait_name": {
+    "decorator_name": {
       "type": "SEQ",
       "members": [
         {
@@ -471,7 +522,48 @@
         },
         {
           "type": "SYMBOL",
-          "name": "definition_name"
+          "name": "identifier"
+        },
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_primary_expression"
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": ","
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "_primary_expression"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": ")"
         }
       ]
     },
@@ -480,14 +572,14 @@
       "members": [
         {
           "type": "STRING",
-          "value": "("
+          "value": ":"
         },
         {
           "type": "SEQ",
           "members": [
             {
               "type": "SYMBOL",
-              "name": "identifier"
+              "name": "definition_name"
             },
             {
               "type": "REPEAT",
@@ -500,16 +592,12 @@
                   },
                   {
                     "type": "SYMBOL",
-                    "name": "identifier"
+                    "name": "definition_name"
                   }
                 ]
               }
             }
           ]
-        },
-        {
-          "type": "STRING",
-          "value": ")"
         }
       ]
     },
@@ -789,6 +877,23 @@
         }
       ]
     },
+    "_block": {
+      "type": "PREC",
+      "value": 1,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "{"
+          },
+          {
+            "type": "STRING",
+            "value": "}"
+          }
+        ]
+      }
+    },
     "_primary_expression": {
       "type": "CHOICE",
       "members": [
@@ -1364,17 +1469,49 @@
           "value": "null"
         }
       ]
+    },
+    "comment": {
+      "type": "TOKEN",
+      "content": {
+        "type": "PREC",
+        "value": 0,
+        "content": {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "#"
+                },
+                {
+                  "type": "PATTERN",
+                  "value": ".*"
+                }
+              ]
+            }
+          ]
+        }
+      }
     }
   },
   "extras": [
+    {
+      "type": "SYMBOL",
+      "name": "comment"
+    },
     {
       "type": "PATTERN",
-      "value": "\\s"
+      "value": "\\s+"
     }
   ],
   "conflicts": [
     [
       "fun_field"
+    ],
+    [
+      "decorator_name"
     ]
   ],
   "precedences": [],

src/node-types.json CHANGED Viewed

@@ -28,6 +28,16 @@
     "type": "class_definition",
     "named": true,
     "fields": {
+      "decorators": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "decorator_name",
+            "named": true
+          }
+        ]
+      },
       "fields": {
         "multiple": true,
         "required": true,
@@ -71,17 +81,64 @@
         ]
       },
       "traits": {
-        "multiple": true,
+        "multiple": false,
         "required": false,
         "types": [
           {
-            "type": "trait_name",
+            "type": "trait_list",
             "named": true
           }
         ]
       }
     }
   },
+  {
+    "type": "decorator_name",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "bin_literal",
+          "named": true
+        },
+        {
+          "type": "boolean_literal",
+          "named": true
+        },
+        {
+          "type": "character_literal",
+          "named": true
+        },
+        {
+          "type": "float_literal",
+          "named": true
+        },
+        {
+          "type": "hex_literal",
+          "named": true
+        },
+        {
+          "type": "identifier",
+          "named": true
+        },
+        {
+          "type": "integer_literal",
+          "named": true
+        },
+        {
+          "type": "line_string_literal",
+          "named": true
+        },
+        {
+          "type": "multi_line_string_literal",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "definitions",
     "named": true,
@@ -220,6 +277,40 @@
     "type": "fun_definition",
     "named": true,
     "fields": {
+      "body": {
+        "multiple": true,
+        "required": true,
+        "types": [
+          {
+            "type": "{",
+            "named": false
+          },
+          {
+            "type": "}",
+            "named": false
+          }
+        ]
+      },
+      "decorators": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "decorator_name",
+            "named": true
+          }
+        ]
+      },
+      "generics": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "generic_list",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": true,
         "required": true,
@@ -530,11 +621,11 @@
     }
   },
   {
-    "type": "trait_name",
+    "type": "trait_list",
     "named": true,
     "fields": {},
     "children": {
-      "multiple": false,
+      "multiple": true,
       "required": true,
       "types": [
         {
@@ -662,6 +753,10 @@
     "type": "class",
     "named": false
   },
+  {
+    "type": "comment",
+    "named": true
+  },
   {
     "type": "definition_name",
     "named": true

src/parser.c CHANGED Viewed

@@ -5,16 +5,16 @@
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
-#define LANGUAGE_VERSION 13
+#define LANGUAGE_VERSION 14
-#define STATE_COUNT 203
+#define STATE_COUNT 309
 #define LARGE_STATE_COUNT 2
-#define SYMBOL_COUNT 86
+#define SYMBOL_COUNT 90
 #define ALIAS_COUNT 1
-#define TOKEN_COUNT 42
+#define TOKEN_COUNT 43
 #define EXTERNAL_TOKEN_COUNT 0
-#define FIELD_COUNT 8
+#define FIELD_COUNT 10
-#define MAX_ALIAS_SEQUENCE_LENGTH 11
+#define MAX_ALIAS_SEQUENCE_LENGTH 12
-#define PRODUCTION_ID_COUNT 25
+#define PRODUCTION_ID_COUNT 69
 enum {
   anon_sym_package = 1,
@@ -30,10 +30,10 @@ enum {
   anon_sym_fun = 11,
   anon_sym_EQ_GT = 12,
   anon_sym_AT = 13,
+  anon_sym_COLON = 14,
-  anon_sym_LT = 14,
+  anon_sym_LT = 15,
-  anon_sym_GT = 15,
+  anon_sym_GT = 16,
-  anon_sym_QMARK = 16,
+  anon_sym_QMARK = 17,
-  anon_sym_COLON = 17,
   anon_sym_val = 18,
   anon_sym_DOT = 19,
   aux_sym_url_token1 = 20,
@@ -58,51 +58,55 @@ enum {
   sym__multi_line_str_text = 39,
   anon_sym_DOLLAR = 40,
   anon_sym_null = 41,
+  sym_comment = 42,
-  sym_source_file = 42,
+  sym_source_file = 43,
-  sym_import_statement = 43,
+  sym_import_statement = 44,
-  sym_definitions = 44,
+  sym_definitions = 45,
-  sym_class_definition = 45,
+  sym_class_definition = 46,
-  sym_trait_definition = 46,
+  sym_trait_definition = 47,
-  sym_enum_definition = 47,
+  sym_enum_definition = 48,
-  sym_fun_definition = 48,
+  sym_fun_definition = 49,
+  sym_decorator_name = 50,
-  sym_trait_name = 49,
+  sym_trait_list = 51,
-  sym_generic_list = 50,
+  sym_generic_list = 52,
-  sym_type = 51,
+  sym_type = 53,
-  sym_param = 52,
+  sym_param = 54,
-  sym_type_field = 53,
+  sym_type_field = 55,
-  sym_fun_field = 54,
+  sym_fun_field = 56,
-  sym_trait_field = 55,
+  sym_trait_field = 57,
-  sym_enum_field = 56,
+  sym_enum_field = 58,
+  sym__block = 59,
-  sym__primary_expression = 57,
+  sym__primary_expression = 60,
-  sym__extension = 58,
+  sym__extension = 61,
-  sym_url = 59,
+  sym_url = 62,
-  sym_package = 60,
+  sym_package = 63,
-  sym_identifier = 61,
+  sym_identifier = 64,
-  sym_boolean_literal = 62,
+  sym_boolean_literal = 65,
-  sym_character_literal = 63,
+  sym_character_literal = 66,
-  sym_character_escape_seq = 64,
+  sym_character_escape_seq = 67,
-  sym__uni_character_literal = 65,
+  sym__uni_character_literal = 68,
-  sym__string_literal = 66,
+  sym__string_literal = 69,
-  sym_line_string_literal = 67,
+  sym_line_string_literal = 70,
-  sym_multi_line_string_literal = 68,
+  sym_multi_line_string_literal = 71,
-  sym__line_string_content = 69,
+  sym__line_string_content = 72,
-  sym__multi_line_string_content = 70,
+  sym__multi_line_string_content = 73,
-  sym__interpolation = 71,
+  sym__interpolation = 74,
-  sym__literal_constant = 72,
+  sym__literal_constant = 75,
-  aux_sym_source_file_repeat1 = 73,
+  aux_sym_source_file_repeat1 = 76,
-  aux_sym_source_file_repeat2 = 74,
+  aux_sym_source_file_repeat2 = 77,
-  aux_sym_class_definition_repeat1 = 75,
+  aux_sym_class_definition_repeat1 = 78,
-  aux_sym_class_definition_repeat2 = 76,
+  aux_sym_class_definition_repeat2 = 79,
-  aux_sym_trait_definition_repeat1 = 77,
+  aux_sym_trait_definition_repeat1 = 80,
-  aux_sym_enum_definition_repeat1 = 78,
+  aux_sym_enum_definition_repeat1 = 81,
-  aux_sym_fun_definition_repeat1 = 79,
+  aux_sym_fun_definition_repeat1 = 82,
-  aux_sym_fun_definition_repeat2 = 80,
+  aux_sym_fun_definition_repeat2 = 83,
+  aux_sym_decorator_name_repeat1 = 84,
-  aux_sym_trait_list_repeat1 = 81,
+  aux_sym_trait_list_repeat1 = 85,
-  aux_sym_enum_field_repeat1 = 82,
+  aux_sym_generic_list_repeat1 = 86,
-  aux_sym_url_repeat1 = 83,
+  aux_sym_url_repeat1 = 87,
-  aux_sym_line_string_literal_repeat1 = 84,
+  aux_sym_line_string_literal_repeat1 = 88,
-  aux_sym_multi_line_string_literal_repeat1 = 85,
+  aux_sym_multi_line_string_literal_repeat1 = 89,
-  alias_sym_interpolated_identifier = 86,
+  alias_sym_interpolated_identifier = 90,
 };
 static const char * const ts_symbol_names[] = {
@@ -120,10 +124,10 @@ static const char * const ts_symbol_names[] = {
   [anon_sym_fun] = "fun",
   [anon_sym_EQ_GT] = "=>",
   [anon_sym_AT] = "@",
+  [anon_sym_COLON] = ":",
   [anon_sym_LT] = "<",
   [anon_sym_GT] = ">",
   [anon_sym_QMARK] = "\?",
-  [anon_sym_COLON] = ":",
   [anon_sym_val] = "val",
   [anon_sym_DOT] = ".",
   [aux_sym_url_token1] = "url_token1",
@@ -148,6 +152,7 @@ static const char * const ts_symbol_names[] = {
   [sym__multi_line_str_text] = "_multi_line_str_text",
   [anon_sym_DOLLAR] = "$",
   [anon_sym_null] = "null",
+  [sym_comment] = "comment",
   [sym_source_file] = "source_file",
   [sym_import_statement] = "import_statement",
   [sym_definitions] = "definitions",
@@ -155,7 +160,8 @@ static const char * const ts_symbol_names[] = {
   [sym_trait_definition] = "trait_definition",
   [sym_enum_definition] = "enum_definition",
   [sym_fun_definition] = "fun_definition",
+  [sym_decorator_name] = "decorator_name",
-  [sym_trait_name] = "trait_name",
+  [sym_trait_list] = "trait_list",
   [sym_generic_list] = "generic_list",
   [sym_type] = "type",
   [sym_param] = "param",
@@ -163,6 +169,7 @@ static const char * const ts_symbol_names[] = {
   [sym_fun_field] = "fun_field",
   [sym_trait_field] = "trait_field",
   [sym_enum_field] = "enum_field",
+  [sym__block] = "_block",
   [sym__primary_expression] = "_primary_expression",
   [sym__extension] = "_extension",
   [sym_url] = "url",
@@ -187,8 +194,9 @@ static const char * const ts_symbol_names[] = {
   [aux_sym_enum_definition_repeat1] = "enum_definition_repeat1",
   [aux_sym_fun_definition_repeat1] = "fun_definition_repeat1",
   [aux_sym_fun_definition_repeat2] = "fun_definition_repeat2",
+  [aux_sym_decorator_name_repeat1] = "decorator_name_repeat1",
   [aux_sym_trait_list_repeat1] = "trait_list_repeat1",
-  [aux_sym_enum_field_repeat1] = "enum_field_repeat1",
+  [aux_sym_generic_list_repeat1] = "generic_list_repeat1",
   [aux_sym_url_repeat1] = "url_repeat1",
   [aux_sym_line_string_literal_repeat1] = "line_string_literal_repeat1",
   [aux_sym_multi_line_string_literal_repeat1] = "multi_line_string_literal_repeat1",
@@ -210,10 +218,10 @@ static const TSSymbol ts_symbol_map[] = {
   [anon_sym_fun] = anon_sym_fun,
   [anon_sym_EQ_GT] = anon_sym_EQ_GT,
   [anon_sym_AT] = anon_sym_AT,
+  [anon_sym_COLON] = anon_sym_COLON,
   [anon_sym_LT] = anon_sym_LT,
   [anon_sym_GT] = anon_sym_GT,
   [anon_sym_QMARK] = anon_sym_QMARK,
-  [anon_sym_COLON] = anon_sym_COLON,
   [anon_sym_val] = anon_sym_val,
   [anon_sym_DOT] = anon_sym_DOT,
   [aux_sym_url_token1] = aux_sym_url_token1,
@@ -238,6 +246,7 @@ static const TSSymbol ts_symbol_map[] = {
   [sym__multi_line_str_text] = sym__multi_line_str_text,
   [anon_sym_DOLLAR] = anon_sym_DOLLAR,
   [anon_sym_null] = anon_sym_null,
+  [sym_comment] = sym_comment,
   [sym_source_file] = sym_source_file,
   [sym_import_statement] = sym_import_statement,
   [sym_definitions] = sym_definitions,
@@ -245,7 +254,8 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_trait_definition] = sym_trait_definition,
   [sym_enum_definition] = sym_enum_definition,
   [sym_fun_definition] = sym_fun_definition,
+  [sym_decorator_name] = sym_decorator_name,
-  [sym_trait_name] = sym_trait_name,
+  [sym_trait_list] = sym_trait_list,
   [sym_generic_list] = sym_generic_list,
   [sym_type] = sym_type,
   [sym_param] = sym_param,
@@ -253,6 +263,7 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_fun_field] = sym_fun_field,
   [sym_trait_field] = sym_trait_field,
   [sym_enum_field] = sym_enum_field,
+  [sym__block] = sym__block,
   [sym__primary_expression] = sym__primary_expression,
   [sym__extension] = sym__extension,
   [sym_url] = sym_url,
@@ -277,8 +288,9 @@ static const TSSymbol ts_symbol_map[] = {
   [aux_sym_enum_definition_repeat1] = aux_sym_enum_definition_repeat1,
   [aux_sym_fun_definition_repeat1] = aux_sym_fun_definition_repeat1,
   [aux_sym_fun_definition_repeat2] = aux_sym_fun_definition_repeat2,
+  [aux_sym_decorator_name_repeat1] = aux_sym_decorator_name_repeat1,
   [aux_sym_trait_list_repeat1] = aux_sym_trait_list_repeat1,
-  [aux_sym_enum_field_repeat1] = aux_sym_enum_field_repeat1,
+  [aux_sym_generic_list_repeat1] = aux_sym_generic_list_repeat1,
   [aux_sym_url_repeat1] = aux_sym_url_repeat1,
   [aux_sym_line_string_literal_repeat1] = aux_sym_line_string_literal_repeat1,
   [aux_sym_multi_line_string_literal_repeat1] = aux_sym_multi_line_string_literal_repeat1,
@@ -342,19 +354,19 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_LT] = {
+  [anon_sym_COLON] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_GT] = {
+  [anon_sym_LT] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_QMARK] = {
+  [anon_sym_GT] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_COLON] = {
+  [anon_sym_QMARK] = {
     .visible = true,
     .named = false,
   },
@@ -454,6 +466,10 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
+  [sym_comment] = {
+    .visible = true,
+    .named = true,
+  },
   [sym_source_file] = {
     .visible = true,
     .named = true,
@@ -482,7 +498,11 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
+  [sym_decorator_name] = {
+    .visible = true,
+    .named = true,
+  },
-  [sym_trait_name] = {
+  [sym_trait_list] = {
     .visible = true,
     .named = true,
   },
@@ -514,6 +534,10 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
+  [sym__block] = {
+    .visible = false,
+    .named = true,
+  },
   [sym__primary_expression] = {
     .visible = false,
     .named = true,
@@ -610,11 +634,15 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = false,
   },
+  [aux_sym_decorator_name_repeat1] = {
+    .visible = false,
+    .named = false,
+  },
   [aux_sym_trait_list_repeat1] = {
     .visible = false,
     .named = false,
   },
-  [aux_sym_enum_field_repeat1] = {
+  [aux_sym_generic_list_repeat1] = {
     .visible = false,
     .named = false,
   },
@@ -637,18 +665,22 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
 };
 enum {
+  field_body = 1,
+  field_decorators = 2,
-  field_fields = 1,
+  field_fields = 3,
-  field_generics = 2,
+  field_generics = 4,
-  field_name = 3,
+  field_name = 5,
-  field_params = 4,
+  field_params = 6,
-  field_returns = 5,
+  field_returns = 7,
-  field_traits = 6,
+  field_traits = 8,
-  field_type = 7,
+  field_type = 9,
-  field_types = 8,
+  field_types = 10,
 };
 static const char * const ts_field_names[] = {
   [0] = NULL,
+  [field_body] = "body",
+  [field_decorators] = "decorators",
   [field_fields] = "fields",
   [field_generics] = "generics",
   [field_name] = "name",
@@ -663,26 +695,70 @@ static const TSFieldMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
   [1] = {.index = 0, .length = 4},
   [2] = {.index = 4, .length = 5},
   [3] = {.index = 9, .length = 5},
-  [4] = {.index = 14, .length = 2},
+  [4] = {.index = 14, .length = 5},
-  [5] = {.index = 16, .length = 5},
+  [5] = {.index = 19, .length = 4},
-  [6] = {.index = 21, .length = 2},
+  [6] = {.index = 23, .length = 2},
-  [7] = {.index = 23, .length = 6},
-  [8] = {.index = 29, .length = 3},
+  [8] = {.index = 25, .length = 5},
-  [9] = {.index = 32, .length = 6},
+  [9] = {.index = 30, .length = 2},
-  [10] = {.index = 38, .length = 6},
+  [10] = {.index = 32, .length = 6},
+  [11] = {.index = 38, .length = 6},
-  [11] = {.index = 44, .length = 7},
+  [12] = {.index = 44, .length = 6},
-  [12] = {.index = 51, .length = 4},
-  [13] = {.index = 55, .length = 4},
+  [13] = {.index = 50, .length = 5},
-  [14] = {.index = 59, .length = 7},
+  [14] = {.index = 55, .length = 5},
-  [15] = {.index = 66, .length = 8},
+  [15] = {.index = 60, .length = 5},
-  [16] = {.index = 74, .length = 8},
+  [16] = {.index = 65, .length = 6},
+  [17] = {.index = 71, .length = 6},
+  [18] = {.index = 77, .length = 6},
-  [17] = {.index = 82, .length = 5},
+  [19] = {.index = 83, .length = 5},
-  [18] = {.index = 87, .length = 5},
-  [19] = {.index = 92, .length = 5},
-  [20] = {.index = 97, .length = 9},
+  [20] = {.index = 88, .length = 7},
+  [21] = {.index = 95, .length = 3},
+  [22] = {.index = 98, .length = 7},
-  [21] = {.index = 106, .length = 6},
+  [23] = {.index = 105, .length = 6},
-  [22] = {.index = 112, .length = 6},
+  [24] = {.index = 111, .length = 6},
-  [24] = {.index = 118, .length = 7},
+  [25] = {.index = 117, .length = 6},
+  [26] = {.index = 123, .length = 6},
+  [27] = {.index = 129, .length = 6},
+  [28] = {.index = 135, .length = 7},
+  [29] = {.index = 142, .length = 7},
+  [30] = {.index = 149, .length = 7},
+  [31] = {.index = 156, .length = 6},
+  [32] = {.index = 162, .length = 6},
+  [33] = {.index = 168, .length = 6},
+  [34] = {.index = 174, .length = 4},
+  [35] = {.index = 178, .length = 4},
+  [36] = {.index = 182, .length = 8},
+  [37] = {.index = 190, .length = 8},
+  [38] = {.index = 198, .length = 7},
+  [39] = {.index = 205, .length = 7},
+  [40] = {.index = 212, .length = 7},
+  [41] = {.index = 219, .length = 7},
+  [42] = {.index = 226, .length = 7},
+  [43] = {.index = 233, .length = 8},
+  [44] = {.index = 241, .length = 7},
+  [45] = {.index = 248, .length = 7},
+  [46] = {.index = 255, .length = 7},
+  [47] = {.index = 262, .length = 7},
+  [48] = {.index = 269, .length = 7},
+  [49] = {.index = 276, .length = 5},
+  [50] = {.index = 281, .length = 5},
+  [51] = {.index = 286, .length = 5},
+  [52] = {.index = 291, .length = 9},
+  [53] = {.index = 300, .length = 8},
+  [54] = {.index = 308, .length = 8},
+  [55] = {.index = 316, .length = 8},
+  [56] = {.index = 324, .length = 8},
+  [57] = {.index = 332, .length = 8},
+  [58] = {.index = 340, .length = 8},
+  [59] = {.index = 348, .length = 8},
+  [60] = {.index = 356, .length = 8},
+  [61] = {.index = 364, .length = 6},
+  [62] = {.index = 370, .length = 6},
+  [63] = {.index = 376, .length = 9},
+  [64] = {.index = 385, .length = 9},
+  [65] = {.index = 394, .length = 9},
+  [66] = {.index = 403, .length = 9},
+  [67] = {.index = 412, .length = 7},
+  [68] = {.index = 419, .length = 10},
 };
 static const TSFieldMapEntry ts_field_map_entries[] = {
@@ -701,46 +777,110 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
     {field_fields, 3},
     {field_fields, 4},
     {field_fields, 5},
-    {field_generics, 2},
     {field_name, 1},
+    {field_traits, 2},
   [14] =
+    {field_fields, 3},
+    {field_fields, 4},
+    {field_fields, 5},
+    {field_generics, 2},
+    {field_name, 1},
+  [19] =
+    {field_body, 5},
+    {field_name, 1},
+    {field_params, 2},
+    {field_params, 3},
+  [23] =
     {field_name, 0},
     {field_type, 2},
-  [16] =
+  [25] =
+    {field_decorators, 0},
     {field_fields, 3},
     {field_fields, 4},
     {field_fields, 5},
     {field_name, 2},
-    {field_traits, 0},
-  [21] =
+  [30] =
     {field_name, 1},
     {field_type, 3},
-  [23] =
+  [32] =
+    {field_fields, 3},
+    {field_fields, 4},
+    {field_fields, 5},
+    {field_fields, 6},
+    {field_name, 1},
+    {field_traits, 2},
+  [38] =
     {field_fields, 3},
     {field_fields, 4},
     {field_fields, 5},
     {field_fields, 6},
     {field_generics, 2},
     {field_name, 1},
-  [29] =
+  [44] =
+    {field_fields, 4},
+    {field_fields, 5},
+    {field_fields, 6},
+    {field_generics, 2},
+    {field_name, 1},
+    {field_traits, 3},
+  [50] =
+    {field_body, 6},
     {field_name, 1},
     {field_params, 2},
     {field_params, 3},
+    {field_returns, 5},
-  [32] =
+  [55] =
+    {field_body, 6},
+    {field_name, 1},
+    {field_params, 2},
+    {field_params, 3},
+    {field_params, 4},
+  [60] =
+    {field_body, 6},
+    {field_generics, 2},
+    {field_name, 1},
+    {field_params, 3},
+    {field_params, 4},
+  [65] =
+    {field_decorators, 0},
     {field_fields, 3},
     {field_fields, 4},
     {field_fields, 5},
     {field_fields, 6},
     {field_name, 2},
+  [71] =
+    {field_decorators, 0},
+    {field_fields, 4},
+    {field_fields, 5},
+    {field_fields, 6},
+    {field_name, 2},
-    {field_traits, 0},
+    {field_traits, 3},
-  [38] =
+  [77] =
+    {field_decorators, 0},
     {field_fields, 4},
     {field_fields, 5},
     {field_fields, 6},
     {field_generics, 3},
     {field_name, 2},
+  [83] =
+    {field_body, 6},
+    {field_decorators, 0},
+    {field_name, 2},
+    {field_params, 3},
+    {field_params, 4},
+  [88] =
+    {field_fields, 4},
+    {field_fields, 5},
+    {field_fields, 6},
+    {field_fields, 7},
+    {field_generics, 2},
+    {field_name, 1},
-    {field_traits, 0},
+    {field_traits, 3},
-  [44] =
+  [95] =
+    {field_name, 1},
+    {field_params, 2},
+    {field_params, 3},
+  [98] =
     {field_fields, 5},
     {field_fields, 6},
     {field_fields, 7},
@@ -748,25 +888,97 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
     {field_types, 2},
     {field_types, 3},
     {field_types, 4},
-  [51] =
+  [105] =
+    {field_body, 7},
     {field_name, 1},
     {field_params, 2},
     {field_params, 3},
     {field_returns, 5},
+    {field_returns, 6},
-  [55] =
+  [111] =
+    {field_body, 7},
+    {field_name, 1},
+    {field_params, 2},
+    {field_params, 3},
+    {field_params, 4},
+    {field_returns, 6},
+  [117] =
+    {field_body, 7},
     {field_name, 1},
     {field_params, 2},
     {field_params, 3},
     {field_params, 4},
+    {field_params, 5},
+  [123] =
+    {field_body, 7},
+    {field_generics, 2},
+    {field_name, 1},
+    {field_params, 3},
+    {field_params, 4},
+    {field_returns, 6},
-  [59] =
+  [129] =
+    {field_body, 7},
+    {field_generics, 2},
+    {field_name, 1},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+  [135] =
+    {field_decorators, 0},
+    {field_fields, 4},
+    {field_fields, 5},
+    {field_fields, 6},
+    {field_fields, 7},
+    {field_name, 2},
+    {field_traits, 3},
+  [142] =
+    {field_decorators, 0},
     {field_fields, 4},
     {field_fields, 5},
     {field_fields, 6},
     {field_fields, 7},
     {field_generics, 3},
     {field_name, 2},
+  [149] =
+    {field_decorators, 0},
+    {field_fields, 5},
+    {field_fields, 6},
+    {field_fields, 7},
+    {field_generics, 3},
+    {field_name, 2},
-    {field_traits, 0},
+    {field_traits, 4},
-  [66] =
+  [156] =
+    {field_body, 7},
+    {field_decorators, 0},
+    {field_name, 2},
+    {field_params, 3},
+    {field_params, 4},
+    {field_returns, 6},
+  [162] =
+    {field_body, 7},
+    {field_decorators, 0},
+    {field_name, 2},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+  [168] =
+    {field_body, 7},
+    {field_decorators, 0},
+    {field_generics, 3},
+    {field_name, 2},
+    {field_params, 4},
+    {field_params, 5},
+  [174] =
+    {field_name, 1},
+    {field_params, 2},
+    {field_params, 3},
+    {field_returns, 5},
+  [178] =
+    {field_name, 1},
+    {field_params, 2},
+    {field_params, 3},
+    {field_params, 4},
+  [182] =
     {field_fields, 5},
     {field_fields, 6},
     {field_fields, 7},
@@ -775,7 +987,7 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
     {field_types, 2},
     {field_types, 3},
     {field_types, 4},
-  [74] =
+  [190] =
     {field_fields, 6},
     {field_fields, 7},
     {field_fields, 8},
@@ -784,25 +996,114 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
     {field_types, 3},
     {field_types, 4},
     {field_types, 5},
+  [198] =
+    {field_body, 8},
+    {field_name, 1},
+    {field_params, 2},
+    {field_params, 3},
+    {field_params, 4},
+    {field_returns, 6},
+    {field_returns, 7},
+  [205] =
+    {field_body, 8},
+    {field_name, 1},
+    {field_params, 2},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+    {field_returns, 7},
-  [82] =
+  [212] =
+    {field_body, 8},
+    {field_generics, 2},
+    {field_name, 1},
+    {field_params, 3},
+    {field_params, 4},
+    {field_returns, 6},
+    {field_returns, 7},
+  [219] =
+    {field_body, 8},
+    {field_generics, 2},
+    {field_name, 1},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+    {field_returns, 7},
+  [226] =
+    {field_body, 8},
+    {field_generics, 2},
+    {field_name, 1},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+    {field_params, 6},
+  [233] =
+    {field_decorators, 0},
+    {field_fields, 5},
+    {field_fields, 6},
+    {field_fields, 7},
+    {field_fields, 8},
+    {field_generics, 3},
+    {field_name, 2},
+    {field_traits, 4},
+  [241] =
+    {field_body, 8},
+    {field_decorators, 0},
+    {field_name, 2},
+    {field_params, 3},
+    {field_params, 4},
+    {field_returns, 6},
+    {field_returns, 7},
+  [248] =
+    {field_body, 8},
+    {field_decorators, 0},
+    {field_name, 2},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+    {field_returns, 7},
+  [255] =
+    {field_body, 8},
+    {field_decorators, 0},
+    {field_name, 2},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+    {field_params, 6},
+  [262] =
+    {field_body, 8},
+    {field_decorators, 0},
+    {field_generics, 3},
+    {field_name, 2},
+    {field_params, 4},
+    {field_params, 5},
+    {field_returns, 7},
+  [269] =
+    {field_body, 8},
+    {field_decorators, 0},
+    {field_generics, 3},
+    {field_name, 2},
+    {field_params, 4},
+    {field_params, 5},
+    {field_params, 6},
+  [276] =
     {field_name, 1},
     {field_params, 2},
     {field_params, 3},
     {field_returns, 5},
     {field_returns, 6},
-  [87] =
+  [281] =
     {field_name, 1},
     {field_params, 2},
     {field_params, 3},
     {field_params, 4},
     {field_returns, 6},
-  [92] =
+  [286] =
     {field_name, 1},
     {field_params, 2},
     {field_params, 3},
     {field_params, 4},
     {field_params, 5},
-  [97] =
+  [291] =
     {field_fields, 6},
     {field_fields, 7},
     {field_fields, 8},
@@ -812,21 +1113,133 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
     {field_types, 3},
     {field_types, 4},
     {field_types, 5},
-  [106] =
+  [300] =
+    {field_body, 9},
+    {field_name, 1},
+    {field_params, 2},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+    {field_returns, 7},
+    {field_returns, 8},
+  [308] =
+    {field_body, 9},
+    {field_generics, 2},
+    {field_name, 1},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+    {field_returns, 7},
+    {field_returns, 8},
+  [316] =
+    {field_body, 9},
+    {field_generics, 2},
+    {field_name, 1},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+    {field_params, 6},
+    {field_returns, 8},
+  [324] =
+    {field_body, 9},
+    {field_decorators, 0},
+    {field_name, 2},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+    {field_returns, 7},
+    {field_returns, 8},
+  [332] =
+    {field_body, 9},
+    {field_decorators, 0},
+    {field_name, 2},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+    {field_params, 6},
+    {field_returns, 8},
+  [340] =
+    {field_body, 9},
+    {field_decorators, 0},
+    {field_generics, 3},
+    {field_name, 2},
+    {field_params, 4},
+    {field_params, 5},
+    {field_returns, 7},
+    {field_returns, 8},
+  [348] =
+    {field_body, 9},
+    {field_decorators, 0},
+    {field_generics, 3},
+    {field_name, 2},
+    {field_params, 4},
+    {field_params, 5},
+    {field_params, 6},
+    {field_returns, 8},
+  [356] =
+    {field_body, 9},
+    {field_decorators, 0},
+    {field_generics, 3},
+    {field_name, 2},
+    {field_params, 4},
+    {field_params, 5},
+    {field_params, 6},
+    {field_params, 7},
+  [364] =
     {field_name, 1},
     {field_params, 2},
     {field_params, 3},
     {field_params, 4},
     {field_returns, 6},
     {field_returns, 7},
-  [112] =
+  [370] =
     {field_name, 1},
     {field_params, 2},
     {field_params, 3},
     {field_params, 4},
     {field_params, 5},
     {field_returns, 7},
+  [376] =
+    {field_body, 10},
+    {field_generics, 2},
+    {field_name, 1},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+    {field_params, 6},
+    {field_returns, 8},
+    {field_returns, 9},
+  [385] =
+    {field_body, 10},
+    {field_decorators, 0},
+    {field_name, 2},
+    {field_params, 3},
+    {field_params, 4},
+    {field_params, 5},
+    {field_params, 6},
+    {field_returns, 8},
+    {field_returns, 9},
+  [394] =
+    {field_body, 10},
+    {field_decorators, 0},
+    {field_generics, 3},
+    {field_name, 2},
+    {field_params, 4},
+    {field_params, 5},
+    {field_params, 6},
+    {field_returns, 8},
+    {field_returns, 9},
+  [403] =
+    {field_body, 10},
+    {field_decorators, 0},
+    {field_generics, 3},
+    {field_name, 2},
+    {field_params, 4},
+    {field_params, 5},
+    {field_params, 6},
+    {field_params, 7},
+    {field_returns, 9},
-  [118] =
+  [412] =
     {field_name, 1},
     {field_params, 2},
     {field_params, 3},
@@ -834,11 +1247,22 @@ static const TSFieldMapEntry ts_field_map_entries[] = {
     {field_params, 5},
     {field_returns, 7},
     {field_returns, 8},
+  [419] =
+    {field_body, 11},
+    {field_decorators, 0},
+    {field_generics, 3},
+    {field_name, 2},
+    {field_params, 4},
+    {field_params, 5},
+    {field_params, 6},
+    {field_params, 7},
+    {field_returns, 9},
+    {field_returns, 10},
 };
 static const TSSymbol ts_alias_sequences[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE_LENGTH] = {
   [0] = {0},
-  [23] = {
+  [7] = {
     [1] = alias_sym_interpolated_identifier,
   },
 };
@@ -850,14 +1274,327 @@ static const uint16_t ts_non_terminal_alias_map[] = {
   0,
 };
+static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
+  [0] = 0,
+  [1] = 1,
+  [2] = 2,
+  [3] = 3,
+  [4] = 4,
+  [5] = 5,
+  [6] = 6,
+  [7] = 7,
+  [8] = 8,
+  [9] = 9,
+  [10] = 10,
+  [11] = 11,
+  [12] = 12,
+  [13] = 13,
+  [14] = 14,
+  [15] = 15,
+  [16] = 16,
+  [17] = 17,
+  [18] = 18,
+  [19] = 19,
+  [20] = 20,
+  [21] = 21,
+  [22] = 22,
+  [23] = 23,
+  [24] = 24,
+  [25] = 25,
+  [26] = 26,
+  [27] = 27,
+  [28] = 28,
+  [29] = 29,
+  [30] = 30,
+  [31] = 31,
+  [32] = 32,
+  [33] = 33,
+  [34] = 34,
+  [35] = 35,
+  [36] = 36,
+  [37] = 37,
+  [38] = 38,
+  [39] = 39,
+  [40] = 40,
+  [41] = 41,
+  [42] = 42,
+  [43] = 43,
+  [44] = 44,
+  [45] = 45,
+  [46] = 46,
+  [47] = 47,
+  [48] = 48,
+  [49] = 49,
+  [50] = 50,
+  [51] = 51,
+  [52] = 52,
+  [53] = 53,
+  [54] = 54,
+  [55] = 55,
+  [56] = 56,
+  [57] = 57,
+  [58] = 58,
+  [59] = 59,
+  [60] = 60,
+  [61] = 61,
+  [62] = 62,
+  [63] = 63,
+  [64] = 64,
+  [65] = 65,
+  [66] = 66,
+  [67] = 67,
+  [68] = 68,
+  [69] = 69,
+  [70] = 70,
+  [71] = 71,
+  [72] = 72,
+  [73] = 73,
+  [74] = 74,
+  [75] = 75,
+  [76] = 76,
+  [77] = 77,
+  [78] = 78,
+  [79] = 79,
+  [80] = 80,
+  [81] = 81,
+  [82] = 82,
+  [83] = 83,
+  [84] = 84,
+  [85] = 85,
+  [86] = 10,
+  [87] = 87,
+  [88] = 88,
+  [89] = 89,
+  [90] = 90,
+  [91] = 91,
+  [92] = 92,
+  [93] = 93,
+  [94] = 94,
+  [95] = 95,
+  [96] = 96,
+  [97] = 97,
+  [98] = 98,
+  [99] = 99,
+  [100] = 100,
+  [101] = 101,
+  [102] = 102,
+  [103] = 103,
+  [104] = 10,
+  [105] = 105,
+  [106] = 106,
+  [107] = 107,
+  [108] = 108,
+  [109] = 109,
+  [110] = 110,
+  [111] = 111,
+  [112] = 112,
+  [113] = 113,
+  [114] = 114,
+  [115] = 115,
+  [116] = 116,
+  [117] = 117,
+  [118] = 118,
+  [119] = 119,
+  [120] = 120,
+  [121] = 121,
+  [122] = 122,
+  [123] = 123,
+  [124] = 124,
+  [125] = 125,
+  [126] = 126,
+  [127] = 127,
+  [128] = 128,
+  [129] = 129,
+  [130] = 130,
+  [131] = 131,
+  [132] = 132,
+  [133] = 133,
+  [134] = 134,
+  [135] = 135,
+  [136] = 136,
+  [137] = 137,
+  [138] = 138,
+  [139] = 139,
+  [140] = 140,
+  [141] = 141,
+  [142] = 88,
+  [143] = 143,
+  [144] = 144,
+  [145] = 145,
+  [146] = 146,
+  [147] = 147,
+  [148] = 148,
+  [149] = 149,
+  [150] = 150,
+  [151] = 151,
+  [152] = 152,
+  [153] = 153,
+  [154] = 154,
+  [155] = 155,
+  [156] = 156,
+  [157] = 157,
+  [158] = 158,
+  [159] = 159,
+  [160] = 160,
+  [161] = 161,
+  [162] = 162,
+  [163] = 163,
+  [164] = 164,
+  [165] = 165,
+  [166] = 166,
+  [167] = 167,
+  [168] = 168,
+  [169] = 169,
+  [170] = 170,
+  [171] = 171,
+  [172] = 172,
+  [173] = 173,
+  [174] = 174,
+  [175] = 175,
+  [176] = 176,
+  [177] = 177,
+  [178] = 178,
+  [179] = 179,
+  [180] = 180,
+  [181] = 181,
+  [182] = 182,
+  [183] = 183,
+  [184] = 184,
+  [185] = 185,
+  [186] = 186,
+  [187] = 187,
+  [188] = 188,
+  [189] = 189,
+  [190] = 190,
+  [191] = 191,
+  [192] = 192,
+  [193] = 193,
+  [194] = 194,
+  [195] = 195,
+  [196] = 196,
+  [197] = 197,
+  [198] = 198,
+  [199] = 199,
+  [200] = 200,
+  [201] = 201,
+  [202] = 202,
+  [203] = 203,
+  [204] = 204,
+  [205] = 205,
+  [206] = 206,
+  [207] = 207,
+  [208] = 208,
+  [209] = 209,
+  [210] = 210,
+  [211] = 211,
+  [212] = 212,
+  [213] = 213,
+  [214] = 214,
+  [215] = 215,
+  [216] = 216,
+  [217] = 217,
+  [218] = 218,
+  [219] = 219,
+  [220] = 220,
+  [221] = 221,
+  [222] = 222,
+  [223] = 223,
+  [224] = 224,
+  [225] = 225,
+  [226] = 226,
+  [227] = 227,
+  [228] = 228,
+  [229] = 229,
+  [230] = 230,
+  [231] = 231,
+  [232] = 232,
+  [233] = 233,
+  [234] = 234,
+  [235] = 235,
+  [236] = 220,
+  [237] = 237,
+  [238] = 238,
+  [239] = 239,
+  [240] = 240,
+  [241] = 241,
+  [242] = 242,
+  [243] = 243,
+  [244] = 244,
+  [245] = 245,
+  [246] = 246,
+  [247] = 247,
+  [248] = 248,
+  [249] = 249,
+  [250] = 250,
+  [251] = 251,
+  [252] = 252,
+  [253] = 253,
+  [254] = 254,
+  [255] = 255,
+  [256] = 256,
+  [257] = 257,
+  [258] = 258,
+  [259] = 259,
+  [260] = 260,
+  [261] = 261,
+  [262] = 262,
+  [263] = 263,
+  [264] = 264,
+  [265] = 265,
+  [266] = 266,
+  [267] = 267,
+  [268] = 268,
+  [269] = 269,
+  [270] = 270,
+  [271] = 271,
+  [272] = 272,
+  [273] = 273,
+  [274] = 274,
+  [275] = 275,
+  [276] = 276,
+  [277] = 277,
+  [278] = 278,
+  [279] = 279,
+  [280] = 280,
+  [281] = 281,
+  [282] = 282,
+  [283] = 283,
+  [284] = 284,
+  [285] = 285,
+  [286] = 286,
+  [287] = 287,
+  [288] = 288,
+  [289] = 289,
+  [290] = 89,
+  [291] = 291,
+  [292] = 87,
+  [293] = 293,
+  [294] = 294,
+  [295] = 295,
+  [296] = 296,
+  [297] = 297,
+  [298] = 298,
+  [299] = 299,
+  [300] = 300,
+  [301] = 301,
+  [302] = 302,
+  [303] = 303,
+  [304] = 304,
+  [305] = 305,
+  [306] = 306,
+  [307] = 299,
+  [308] = 308,
+};
 static bool ts_lex(TSLexer *lexer, TSStateId state) {
   START_LEXER();
   eof = lexer->eof(lexer);
   switch (state) {
     case 0:
       if (eof) ADVANCE(59);
-      if (lookahead == '"') ADVANCE(113);
+      if (lookahead == '"') ADVANCE(114);
+      if (lookahead == '#') ADVANCE(125);
-      if (lookahead == '$') ADVANCE(120);
+      if (lookahead == '$') ADVANCE(123);
       if (lookahead == '\'') ADVANCE(107);
       if (lookahead == '(') ADVANCE(63);
       if (lookahead == ')') ADVANCE(65);
@@ -865,24 +1602,24 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead == '.') ADVANCE(78);
       if (lookahead == '/') ADVANCE(80);
       if (lookahead == '0') ADVANCE(97);
-      if (lookahead == ':') ADVANCE(76);
+      if (lookahead == ':') ADVANCE(73);
-      if (lookahead == '<') ADVANCE(73);
+      if (lookahead == '<') ADVANCE(74);
-      if (lookahead == '=') ADVANCE(5);
+      if (lookahead == '=') ADVANCE(8);
-      if (lookahead == '>') ADVANCE(74);
+      if (lookahead == '>') ADVANCE(75);
-      if (lookahead == '?') ADVANCE(75);
+      if (lookahead == '?') ADVANCE(76);
       if (lookahead == '@') ADVANCE(72);
-      if (lookahead == '\\') ADVANCE(46);
+      if (lookahead == '\\') ADVANCE(48);
       if (lookahead == '_') ADVANCE(92);
-      if (lookahead == '`') ADVANCE(114);
+      if (lookahead == '`') ADVANCE(115);
-      if (lookahead == 'c') ADVANCE(30);
+      if (lookahead == 'c') ADVANCE(32);
-      if (lookahead == 'e') ADVANCE(35);
+      if (lookahead == 'e') ADVANCE(37);
-      if (lookahead == 'f') ADVANCE(16);
+      if (lookahead == 'f') ADVANCE(18);
-      if (lookahead == 'i') ADVANCE(32);
+      if (lookahead == 'i') ADVANCE(34);
-      if (lookahead == 'n') ADVANCE(47);
+      if (lookahead == 'n') ADVANCE(49);
-      if (lookahead == 'p') ADVANCE(12);
+      if (lookahead == 'p') ADVANCE(14);
-      if (lookahead == 't') ADVANCE(38);
+      if (lookahead == 't') ADVANCE(40);
-      if (lookahead == 'v') ADVANCE(17);
+      if (lookahead == 'v') ADVANCE(19);
-      if (lookahead == '{') ADVANCE(68);
+      if (lookahead == '{') ADVANCE(68);
       if (lookahead == '}') ADVANCE(69);
       if (('a' <= lookahead && lookahead <= 'd')) ADVANCE(58);
       if (lookahead == '\t' ||
@@ -894,19 +1631,30 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (('G' <= lookahead && lookahead <= 'Z')) ADVANCE(87);
       END_STATE();
     case 1:
-      if (lookahead == '"') ADVANCE(113);
+      if (lookahead == '"') ADVANCE(114);
-      if (lookahead == '$') ADVANCE(120);
+      if (lookahead == '#') ADVANCE(125);
+      if (lookahead == '\'') ADVANCE(107);
+      if (lookahead == ')') ADVANCE(65);
+      if (lookahead == ',') ADVANCE(64);
+      if (lookahead == '.') ADVANCE(54);
+      if (lookahead == '0') ADVANCE(95);
+      if (lookahead == '`') ADVANCE(115);
+      if (lookahead == 'f') ADVANCE(20);
-      if (lookahead == '\\') ADVANCE(46);
+      if (lookahead == 'n') ADVANCE(49);
+      if (lookahead == 't') ADVANCE(42);
+      if (lookahead == '{') ADVANCE(68);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(116);
+          lookahead == ' ') SKIP(1)
-      if (lookahead != 0) ADVANCE(117);
+      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(96);
+      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(86);
       END_STATE();
     case 2:
-      if (lookahead == '"') ADVANCE(113);
+      if (lookahead == '"') ADVANCE(114);
+      if (lookahead == '#') ADVANCE(117);
-      if (lookahead == '$') ADVANCE(120);
+      if (lookahead == '$') ADVANCE(123);
-      if (lookahead == '`') ADVANCE(115);
+      if (lookahead == '\\') ADVANCE(48);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
@@ -914,25 +1662,18 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       if (lookahead != 0) ADVANCE(119);
       END_STATE();
     case 3:
-      if (lookahead == '"') ADVANCE(113);
+      if (lookahead == '"') ADVANCE(114);
-      if (lookahead == '\'') ADVANCE(107);
-      if (lookahead == ')') ADVANCE(65);
+      if (lookahead == '#') ADVANCE(120);
-      if (lookahead == ',') ADVANCE(64);
+      if (lookahead == '$') ADVANCE(123);
-      if (lookahead == '.') ADVANCE(54);
-      if (lookahead == '0') ADVANCE(95);
-      if (lookahead == '`') ADVANCE(114);
+      if (lookahead == '`') ADVANCE(116);
-      if (lookahead == 'f') ADVANCE(18);
-      if (lookahead == 'n') ADVANCE(47);
-      if (lookahead == 't') ADVANCE(40);
-      if (lookahead == '{') ADVANCE(68);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
-          lookahead == ' ') SKIP(3)
+          lookahead == ' ') ADVANCE(121);
-      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(96);
+      if (lookahead != 0) ADVANCE(122);
-      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(86);
       END_STATE();
     case 4:
+      if (lookahead == '#') ADVANCE(125);
       if (lookahead == ')') ADVANCE(65);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
@@ -943,158 +1684,179 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == '_') ADVANCE(92);
       END_STATE();
     case 5:
-      if (lookahead == '>') ADVANCE(71);
+      if (lookahead == '#') ADVANCE(125);
+      if (lookahead == '\t' ||
+          lookahead == '\n' ||
+          lookahead == '\r' ||
+          lookahead == ' ') SKIP(5)
+      if (('A' <= lookahead && lookahead <= 'Z') ||
+          lookahead == '_' ||
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(79);
       END_STATE();
     case 6:
+      if (lookahead == '#') ADVANCE(125);
+      if (lookahead == '\t' ||
+          lookahead == '\n' ||
+          lookahead == '\r' ||
+          lookahead == ' ') SKIP(6)
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(58);
+      END_STATE();
+    case 7:
+      if (lookahead == '#') ADVANCE(110);
-      if (lookahead == '\\') ADVANCE(46);
+      if (lookahead == '\\') ADVANCE(48);
       if (lookahead == '\t' ||
           lookahead == ' ') ADVANCE(109);
       if (lookahead == '\n' ||
-          lookahead == '\r') SKIP(6)
+          lookahead == '\r') SKIP(7)
       if (lookahead != 0 &&
           lookahead != '\'') ADVANCE(108);
       END_STATE();
-    case 7:
-      if (lookahead == '_') ADVANCE(7);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(98);
-      END_STATE();
     case 8:
-      if (lookahead == '_') ADVANCE(8);
+      if (lookahead == '>') ADVANCE(71);
-      if (lookahead == '0' ||
-          lookahead == '1') ADVANCE(103);
       END_STATE();
     case 9:
       if (lookahead == '_') ADVANCE(9);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(102);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(98);
       END_STATE();
     case 10:
       if (lookahead == '_') ADVANCE(10);
+      if (lookahead == '0' ||
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(96);
+          lookahead == '1') ADVANCE(103);
       END_STATE();
     case 11:
       if (lookahead == '_') ADVANCE(11);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(106);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(102);
       END_STATE();
     case 12:
-      if (lookahead == 'a') ADVANCE(19);
+      if (lookahead == '_') ADVANCE(12);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(96);
       END_STATE();
     case 13:
-      if (lookahead == 'a') ADVANCE(43);
+      if (lookahead == '_') ADVANCE(13);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(106);
       END_STATE();
     case 14:
-      if (lookahead == 'a') ADVANCE(24);
+      if (lookahead == 'a') ADVANCE(21);
-      if (lookahead == 'u') ADVANCE(20);
       END_STATE();
     case 15:
-      if (lookahead == 'a') ADVANCE(23);
+      if (lookahead == 'a') ADVANCE(45);
       END_STATE();
     case 16:
-      if (lookahead == 'a') ADVANCE(29);
+      if (lookahead == 'a') ADVANCE(26);
-      if (lookahead == 'u') ADVANCE(34);
+      if (lookahead == 'u') ADVANCE(22);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('b' <= lookahead && lookahead <= 'f')) ADVANCE(57);
       END_STATE();
     case 17:
-      if (lookahead == 'a') ADVANCE(26);
+      if (lookahead == 'a') ADVANCE(25);
       END_STATE();
     case 18:
-      if (lookahead == 'a') ADVANCE(28);
+      if (lookahead == 'a') ADVANCE(31);
+      if (lookahead == 'u') ADVANCE(36);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('b' <= lookahead && lookahead <= 'f')) ADVANCE(57);
       END_STATE();
     case 19:
-      if (lookahead == 'c') ADVANCE(25);
+      if (lookahead == 'a') ADVANCE(28);
       END_STATE();
     case 20:
-      if (lookahead == 'e') ADVANCE(93);
+      if (lookahead == 'a') ADVANCE(30);
       END_STATE();
     case 21:
-      if (lookahead == 'e') ADVANCE(94);
+      if (lookahead == 'c') ADVANCE(27);
       END_STATE();
     case 22:
-      if (lookahead == 'e') ADVANCE(60);
+      if (lookahead == 'e') ADVANCE(93);
       END_STATE();
     case 23:
-      if (lookahead == 'g') ADVANCE(22);
+      if (lookahead == 'e') ADVANCE(94);
       END_STATE();
     case 24:
-      if (lookahead == 'i') ADVANCE(44);
+      if (lookahead == 'e') ADVANCE(60);
       END_STATE();
     case 25:
-      if (lookahead == 'k') ADVANCE(15);
+      if (lookahead == 'g') ADVANCE(24);
       END_STATE();
     case 26:
-      if (lookahead == 'l') ADVANCE(77);
+      if (lookahead == 'i') ADVANCE(46);
       END_STATE();
     case 27:
-      if (lookahead == 'l') ADVANCE(121);
+      if (lookahead == 'k') ADVANCE(17);
       END_STATE();
     case 28:
-      if (lookahead == 'l') ADVANCE(42);
+      if (lookahead == 'l') ADVANCE(77);
       END_STATE();
     case 29:
+      if (lookahead == 'l') ADVANCE(124);
+      END_STATE();
+    case 30:
-      if (lookahead == 'l') ADVANCE(42);
+      if (lookahead == 'l') ADVANCE(44);
+      END_STATE();
+    case 31:
+      if (lookahead == 'l') ADVANCE(44);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
           ('a' <= lookahead && lookahead <= 'f')) ADVANCE(56);
       END_STATE();
-    case 30:
+    case 32:
-      if (lookahead == 'l') ADVANCE(13);
+      if (lookahead == 'l') ADVANCE(15);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
           ('a' <= lookahead && lookahead <= 'f')) ADVANCE(57);
       END_STATE();
-    case 31:
-      if (lookahead == 'l') ADVANCE(27);
-      END_STATE();
-    case 32:
-      if (lookahead == 'm') ADVANCE(37);
-      END_STATE();
     case 33:
-      if (lookahead == 'm') ADVANCE(67);
+      if (lookahead == 'l') ADVANCE(29);
       END_STATE();
     case 34:
-      if (lookahead == 'n') ADVANCE(70);
+      if (lookahead == 'm') ADVANCE(39);
       END_STATE();
     case 35:
-      if (lookahead == 'n') ADVANCE(49);
+      if (lookahead == 'm') ADVANCE(67);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(57);
       END_STATE();
     case 36:
-      if (lookahead == 'o') ADVANCE(39);
+      if (lookahead == 'n') ADVANCE(70);
       END_STATE();
     case 37:
-      if (lookahead == 'p') ADVANCE(36);
+      if (lookahead == 'n') ADVANCE(51);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'F') ||
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(57);
       END_STATE();
     case 38:
-      if (lookahead == 'r') ADVANCE(14);
+      if (lookahead == 'o') ADVANCE(41);
       END_STATE();
     case 39:
-      if (lookahead == 'r') ADVANCE(45);
+      if (lookahead == 'p') ADVANCE(38);
       END_STATE();
     case 40:
-      if (lookahead == 'r') ADVANCE(48);
+      if (lookahead == 'r') ADVANCE(16);
       END_STATE();
     case 41:
-      if (lookahead == 's') ADVANCE(62);
+      if (lookahead == 'r') ADVANCE(47);
       END_STATE();
     case 42:
-      if (lookahead == 's') ADVANCE(21);
+      if (lookahead == 'r') ADVANCE(50);
       END_STATE();
     case 43:
-      if (lookahead == 's') ADVANCE(41);
+      if (lookahead == 's') ADVANCE(62);
       END_STATE();
     case 44:
-      if (lookahead == 't') ADVANCE(66);
+      if (lookahead == 's') ADVANCE(23);
       END_STATE();
     case 45:
-      if (lookahead == 't') ADVANCE(61);
+      if (lookahead == 's') ADVANCE(43);
       END_STATE();
     case 46:
+      if (lookahead == 't') ADVANCE(66);
+      END_STATE();
+    case 47:
+      if (lookahead == 't') ADVANCE(61);
+      END_STATE();
+    case 48:
-      if (lookahead == 'u') ADVANCE(110);
+      if (lookahead == 'u') ADVANCE(111);
       if (lookahead == '"' ||
           lookahead == '$' ||
           lookahead == '\'' ||
@@ -1102,46 +1864,28 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead == 'b' ||
           lookahead == 'n' ||
           lookahead == 'r' ||
-          lookahead == 't') ADVANCE(112);
+          lookahead == 't') ADVANCE(113);
-      END_STATE();
-    case 47:
-      if (lookahead == 'u') ADVANCE(31);
-      END_STATE();
-    case 48:
-      if (lookahead == 'u') ADVANCE(20);
       END_STATE();
     case 49:
       if (lookahead == 'u') ADVANCE(33);
       END_STATE();
     case 50:
+      if (lookahead == 'u') ADVANCE(22);
+      END_STATE();
+    case 51:
+      if (lookahead == 'u') ADVANCE(35);
+      END_STATE();
+    case 52:
       if (lookahead == '0' ||
           lookahead == '1') ADVANCE(104);
       if (('2' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
           ('a' <= lookahead && lookahead <= 'f')) ADVANCE(56);
       END_STATE();
-    case 51:
+    case 53:
       if (lookahead == '0' ||
           lookahead == '1') ADVANCE(103);
       END_STATE();
-    case 52:
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') SKIP(52)
-      if (('A' <= lookahead && lookahead <= 'Z') ||
-          lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(79);
-      END_STATE();
-    case 53:
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') SKIP(53)
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(58);
-      END_STATE();
     case 54:
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(106);
       END_STATE();
@@ -1153,7 +1897,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 56:
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(111);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(112);
       END_STATE();
     case 57:
       if (('0' <= lookahead && lookahead <= '9') ||
@@ -1208,16 +1952,16 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       ACCEPT_TOKEN(anon_sym_AT);
       END_STATE();
     case 73:
-      ACCEPT_TOKEN(anon_sym_LT);
+      ACCEPT_TOKEN(anon_sym_COLON);
       END_STATE();
     case 74:
-      ACCEPT_TOKEN(anon_sym_GT);
+      ACCEPT_TOKEN(anon_sym_LT);
       END_STATE();
     case 75:
-      ACCEPT_TOKEN(anon_sym_QMARK);
+      ACCEPT_TOKEN(anon_sym_GT);
       END_STATE();
     case 76:
-      ACCEPT_TOKEN(anon_sym_COLON);
+      ACCEPT_TOKEN(anon_sym_QMARK);
       END_STATE();
     case 77:
       ACCEPT_TOKEN(anon_sym_val);
@@ -1247,7 +1991,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       ACCEPT_TOKEN(sym_definition_name);
       if (('A' <= lookahead && lookahead <= 'F')) ADVANCE(86);
       if (('a' <= lookahead && lookahead <= 'f')) ADVANCE(85);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(111);
+      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(112);
       if (('G' <= lookahead && lookahead <= 'Z')) ADVANCE(86);
       if (('g' <= lookahead && lookahead <= 'z')) ADVANCE(85);
       END_STATE();
@@ -1264,7 +2008,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       ACCEPT_TOKEN(sym_definition_name);
       if (('a' <= lookahead && lookahead <= 'f')) ADVANCE(85);
       if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F')) ADVANCE(111);
+          ('A' <= lookahead && lookahead <= 'F')) ADVANCE(112);
       if (('g' <= lookahead && lookahead <= 'z')) ADVANCE(85);
       END_STATE();
     case 85:
@@ -1294,7 +2038,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 90:
       ACCEPT_TOKEN(sym_enum_field_name);
-      if (('a' <= lookahead && lookahead <= 'f')) ADVANCE(111);
+      if (('a' <= lookahead && lookahead <= 'f')) ADVANCE(112);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F')) ADVANCE(92);
       if (('G' <= lookahead && lookahead <= 'Z') ||
@@ -1323,9 +2067,9 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 95:
       ACCEPT_TOKEN(sym_integer_literal);
       if (lookahead == '.') ADVANCE(54);
-      if (lookahead == '_') ADVANCE(10);
+      if (lookahead == '_') ADVANCE(12);
       if (lookahead == 'B' ||
-          lookahead == 'b') ADVANCE(51);
+          lookahead == 'b') ADVANCE(53);
       if (lookahead == 'F' ||
           lookahead == 'f') ADVANCE(105);
       if (lookahead == 'X' ||
@@ -1335,16 +2079,16 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
     case 96:
       ACCEPT_TOKEN(sym_integer_literal);
       if (lookahead == '.') ADVANCE(54);
-      if (lookahead == '_') ADVANCE(10);
+      if (lookahead == '_') ADVANCE(12);
       if (lookahead == 'F' ||
           lookahead == 'f') ADVANCE(105);
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(96);
       END_STATE();
     case 97:
       ACCEPT_TOKEN(sym_integer_literal);
-      if (lookahead == '_') ADVANCE(7);
+      if (lookahead == '_') ADVANCE(9);
       if (lookahead == 'B' ||
-          lookahead == 'b') ADVANCE(50);
+          lookahead == 'b') ADVANCE(52);
       if (lookahead == 'X' ||
           lookahead == 'x') ADVANCE(55);
       if (('A' <= lookahead && lookahead <= 'F') ||
@@ -1353,54 +2097,54 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 98:
       ACCEPT_TOKEN(sym_integer_literal);
-      if (lookahead == '_') ADVANCE(7);
+      if (lookahead == '_') ADVANCE(9);
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(98);
       END_STATE();
     case 99:
       ACCEPT_TOKEN(sym_integer_literal);
-      if (lookahead == '_') ADVANCE(7);
+      if (lookahead == '_') ADVANCE(9);
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(98);
       if (('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(111);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(112);
       END_STATE();
     case 100:
       ACCEPT_TOKEN(sym_integer_literal);
-      if (lookahead == '_') ADVANCE(7);
+      if (lookahead == '_') ADVANCE(9);
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(101);
       if (('A' <= lookahead && lookahead <= 'F') ||
           ('a' <= lookahead && lookahead <= 'f')) ADVANCE(57);
       END_STATE();
     case 101:
       ACCEPT_TOKEN(sym_integer_literal);
-      if (lookahead == '_') ADVANCE(7);
+      if (lookahead == '_') ADVANCE(9);
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(99);
       if (('A' <= lookahead && lookahead <= 'F') ||
           ('a' <= lookahead && lookahead <= 'f')) ADVANCE(56);
       END_STATE();
     case 102:
       ACCEPT_TOKEN(sym_hex_literal);
-      if (lookahead == '_') ADVANCE(9);
+      if (lookahead == '_') ADVANCE(11);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
           ('a' <= lookahead && lookahead <= 'f')) ADVANCE(102);
       END_STATE();
     case 103:
       ACCEPT_TOKEN(sym_bin_literal);
-      if (lookahead == '_') ADVANCE(8);
+      if (lookahead == '_') ADVANCE(10);
       END_STATE();
     case 104:
       ACCEPT_TOKEN(sym_bin_literal);
-      if (lookahead == '_') ADVANCE(8);
+      if (lookahead == '_') ADVANCE(10);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(111);
+          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(112);
       END_STATE();
     case 105:
       ACCEPT_TOKEN(sym_float_literal);
       END_STATE();
     case 106:
       ACCEPT_TOKEN(sym_float_literal);
-      if (lookahead == '_') ADVANCE(11);
+      if (lookahead == '_') ADVANCE(13);
       if (lookahead == 'F' ||
           lookahead == 'f') ADVANCE(105);
       if (('0' <= lookahead && lookahead <= '9')) ADVANCE(106);
@@ -1413,6 +2157,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
       END_STATE();
     case 109:
       ACCEPT_TOKEN(aux_sym_character_literal_token1);
+      if (lookahead == '#') ADVANCE(110);
       if (lookahead == '\t' ||
           lookahead == ' ') ADVANCE(109);
       if (lookahead != 0 &&
@@ -1422,67 +2167,92 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           lookahead != '\\') ADVANCE(108);
       END_STATE();
     case 110:
-      ACCEPT_TOKEN(anon_sym_BSLASHu);
+      ACCEPT_TOKEN(aux_sym_character_literal_token1);
+      if (lookahead != 0 &&
+          lookahead != '\n') ADVANCE(125);
       END_STATE();
     case 111:
-      ACCEPT_TOKEN(aux_sym__uni_character_literal_token1);
+      ACCEPT_TOKEN(anon_sym_BSLASHu);
       END_STATE();
     case 112:
-      ACCEPT_TOKEN(sym__escaped_identifier);
+      ACCEPT_TOKEN(aux_sym__uni_character_literal_token1);
       END_STATE();
     case 113:
-      ACCEPT_TOKEN(anon_sym_DQUOTE);
+      ACCEPT_TOKEN(sym__escaped_identifier);
       END_STATE();
     case 114:
-      ACCEPT_TOKEN(anon_sym_BQUOTE);
+      ACCEPT_TOKEN(anon_sym_DQUOTE);
       END_STATE();
     case 115:
+      ACCEPT_TOKEN(anon_sym_BQUOTE);
+      END_STATE();
+    case 116:
       ACCEPT_TOKEN(anon_sym_BQUOTE);
       if (lookahead != 0 &&
           lookahead != '"' &&
-          lookahead != '$') ADVANCE(119);
+          lookahead != '$') ADVANCE(122);
       END_STATE();
-    case 116:
+    case 117:
+      ACCEPT_TOKEN(sym__line_str_text);
+      if (lookahead == '\n') ADVANCE(119);
+      if (lookahead == '"' ||
+          lookahead == '$' ||
+          lookahead == '\\') ADVANCE(125);
+      if (lookahead != 0) ADVANCE(117);
+      END_STATE();
+    case 118:
       ACCEPT_TOKEN(sym__line_str_text);
+      if (lookahead == '#') ADVANCE(117);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(116);
+          lookahead == ' ') ADVANCE(118);
       if (lookahead != 0 &&
-          lookahead != '"' &&
+          (lookahead < '"' || '$' < lookahead) &&
-          lookahead != '$' &&
-          lookahead != '\\') ADVANCE(117);
+          lookahead != '\\') ADVANCE(119);
       END_STATE();
-    case 117:
+    case 119:
       ACCEPT_TOKEN(sym__line_str_text);
       if (lookahead != 0 &&
           lookahead != '"' &&
           lookahead != '$' &&
-          lookahead != '\\') ADVANCE(117);
+          lookahead != '\\') ADVANCE(119);
       END_STATE();
-    case 118:
+    case 120:
       ACCEPT_TOKEN(sym__multi_line_str_text);
+      if (lookahead == '\n') ADVANCE(122);
+      if (lookahead == '"' ||
+          lookahead == '$') ADVANCE(125);
+      if (lookahead != 0) ADVANCE(120);
+      END_STATE();
+    case 121:
+      ACCEPT_TOKEN(sym__multi_line_str_text);
+      if (lookahead == '#') ADVANCE(120);
-      if (lookahead == '`') ADVANCE(115);
+      if (lookahead == '`') ADVANCE(116);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(118);
+          lookahead == ' ') ADVANCE(121);
       if (lookahead != 0 &&
-          lookahead != '"' &&
-          lookahead != '$') ADVANCE(119);
+          (lookahead < '"' || '$' < lookahead)) ADVANCE(122);
       END_STATE();
-    case 119:
+    case 122:
       ACCEPT_TOKEN(sym__multi_line_str_text);
       if (lookahead != 0 &&
           lookahead != '"' &&
-          lookahead != '$') ADVANCE(119);
+          lookahead != '$') ADVANCE(122);
       END_STATE();
-    case 120:
+    case 123:
       ACCEPT_TOKEN(anon_sym_DOLLAR);
       END_STATE();
-    case 121:
+    case 124:
       ACCEPT_TOKEN(anon_sym_null);
       END_STATE();
+    case 125:
+      ACCEPT_TOKEN(sym_comment);
+      if (lookahead != 0 &&
+          lookahead != '\n') ADVANCE(125);
+      END_STATE();
     default:
       return false;
   }
@@ -1491,28 +2261,28 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
 static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [0] = {.lex_state = 0},
   [1] = {.lex_state = 0},
-  [2] = {.lex_state = 0},
+  [2] = {.lex_state = 1},
-  [3] = {.lex_state = 3},
+  [3] = {.lex_state = 0},
-  [4] = {.lex_state = 3},
+  [4] = {.lex_state = 1},
-  [5] = {.lex_state = 0},
+  [5] = {.lex_state = 1},
   [6] = {.lex_state = 0},
   [7] = {.lex_state = 0},
   [8] = {.lex_state = 0},
   [9] = {.lex_state = 0},
-  [10] = {.lex_state = 1},
+  [10] = {.lex_state = 0},
-  [11] = {.lex_state = 1},
+  [11] = {.lex_state = 2},
-  [12] = {.lex_state = 1},
+  [12] = {.lex_state = 2},
-  [13] = {.lex_state = 0},
+  [13] = {.lex_state = 2},
   [14] = {.lex_state = 0},
   [15] = {.lex_state = 0},
   [16] = {.lex_state = 0},
   [17] = {.lex_state = 0},
-  [18] = {.lex_state = 2},
+  [18] = {.lex_state = 0},
-  [19] = {.lex_state = 2},
+  [19] = {.lex_state = 0},
   [20] = {.lex_state = 0},
-  [21] = {.lex_state = 0},
+  [21] = {.lex_state = 3},
-  [22] = {.lex_state = 2},
+  [22] = {.lex_state = 3},
-  [23] = {.lex_state = 0},
+  [23] = {.lex_state = 3},
   [24] = {.lex_state = 0},
   [25] = {.lex_state = 0},
   [26] = {.lex_state = 0},
@@ -1538,28 +2308,28 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [46] = {.lex_state = 0},
   [47] = {.lex_state = 0},
   [48] = {.lex_state = 0},
-  [49] = {.lex_state = 1},
+  [49] = {.lex_state = 0},
   [50] = {.lex_state = 0},
-  [51] = {.lex_state = 1},
+  [51] = {.lex_state = 0},
-  [52] = {.lex_state = 1},
+  [52] = {.lex_state = 0},
-  [53] = {.lex_state = 6},
+  [53] = {.lex_state = 0},
   [54] = {.lex_state = 0},
   [55] = {.lex_state = 0},
-  [56] = {.lex_state = 1},
+  [56] = {.lex_state = 0},
-  [57] = {.lex_state = 2},
+  [57] = {.lex_state = 0},
-  [58] = {.lex_state = 3},
+  [58] = {.lex_state = 0},
   [59] = {.lex_state = 0},
-  [60] = {.lex_state = 3},
+  [60] = {.lex_state = 0},
   [61] = {.lex_state = 0},
-  [62] = {.lex_state = 3},
+  [62] = {.lex_state = 0},
   [63] = {.lex_state = 0},
   [64] = {.lex_state = 0},
-  [65] = {.lex_state = 2},
+  [65] = {.lex_state = 0},
   [66] = {.lex_state = 0},
   [67] = {.lex_state = 0},
   [68] = {.lex_state = 0},
   [69] = {.lex_state = 0},
-  [70] = {.lex_state = 52},
+  [70] = {.lex_state = 0},
   [71] = {.lex_state = 0},
   [72] = {.lex_state = 0},
   [73] = {.lex_state = 0},
@@ -1567,7 +2337,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [75] = {.lex_state = 0},
   [76] = {.lex_state = 0},
   [77] = {.lex_state = 0},
-  [78] = {.lex_state = 3},
+  [78] = {.lex_state = 0},
   [79] = {.lex_state = 0},
   [80] = {.lex_state = 0},
   [81] = {.lex_state = 0},
@@ -1575,123 +2345,229 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [83] = {.lex_state = 0},
   [84] = {.lex_state = 0},
   [85] = {.lex_state = 0},
-  [86] = {.lex_state = 0},
+  [86] = {.lex_state = 2},
-  [87] = {.lex_state = 0},
+  [87] = {.lex_state = 2},
-  [88] = {.lex_state = 0},
+  [88] = {.lex_state = 2},
-  [89] = {.lex_state = 0},
+  [89] = {.lex_state = 2},
   [90] = {.lex_state = 0},
   [91] = {.lex_state = 0},
-  [92] = {.lex_state = 4},
+  [92] = {.lex_state = 0},
   [93] = {.lex_state = 0},
   [94] = {.lex_state = 0},
   [95] = {.lex_state = 0},
-  [96] = {.lex_state = 4},
+  [96] = {.lex_state = 0},
-  [97] = {.lex_state = 0},
+  [97] = {.lex_state = 7},
   [98] = {.lex_state = 0},
   [99] = {.lex_state = 0},
-  [100] = {.lex_state = 0},
+  [100] = {.lex_state = 1},
-  [101] = {.lex_state = 0},
+  [101] = {.lex_state = 1},
-  [102] = {.lex_state = 3},
+  [102] = {.lex_state = 0},
   [103] = {.lex_state = 0},
-  [104] = {.lex_state = 0},
+  [104] = {.lex_state = 3},
-  [105] = {.lex_state = 52},
+  [105] = {.lex_state = 1},
   [106] = {.lex_state = 0},
-  [107] = {.lex_state = 0},
+  [107] = {.lex_state = 1},
-  [108] = {.lex_state = 0},
+  [108] = {.lex_state = 1},
   [109] = {.lex_state = 0},
   [110] = {.lex_state = 0},
   [111] = {.lex_state = 0},
   [112] = {.lex_state = 0},
   [113] = {.lex_state = 0},
   [114] = {.lex_state = 0},
-  [115] = {.lex_state = 0},
+  [115] = {.lex_state = 1},
-  [116] = {.lex_state = 3},
+  [116] = {.lex_state = 0},
   [117] = {.lex_state = 0},
-  [118] = {.lex_state = 0},
+  [118] = {.lex_state = 1},
   [119] = {.lex_state = 0},
   [120] = {.lex_state = 0},
   [121] = {.lex_state = 0},
-  [122] = {.lex_state = 0},
+  [122] = {.lex_state = 1},
-  [123] = {.lex_state = 52},
+  [123] = {.lex_state = 1},
-  [124] = {.lex_state = 3},
+  [124] = {.lex_state = 1},
-  [125] = {.lex_state = 52},
+  [125] = {.lex_state = 0},
-  [126] = {.lex_state = 52},
+  [126] = {.lex_state = 0},
   [127] = {.lex_state = 0},
-  [128] = {.lex_state = 0},
+  [128] = {.lex_state = 1},
-  [129] = {.lex_state = 0},
+  [129] = {.lex_state = 1},
-  [130] = {.lex_state = 3},
+  [130] = {.lex_state = 0},
-  [131] = {.lex_state = 4},
+  [131] = {.lex_state = 0},
-  [132] = {.lex_state = 52},
+  [132] = {.lex_state = 0},
-  [133] = {.lex_state = 4},
+  [133] = {.lex_state = 0},
   [134] = {.lex_state = 0},
-  [135] = {.lex_state = 4},
+  [135] = {.lex_state = 0},
-  [136] = {.lex_state = 0},
+  [136] = {.lex_state = 1},
-  [137] = {.lex_state = 0},
+  [137] = {.lex_state = 1},
-  [138] = {.lex_state = 52},
+  [138] = {.lex_state = 1},
   [139] = {.lex_state = 0},
   [140] = {.lex_state = 0},
   [141] = {.lex_state = 0},
-  [142] = {.lex_state = 0},
+  [142] = {.lex_state = 3},
-  [143] = {.lex_state = 3},
+  [143] = {.lex_state = 0},
   [144] = {.lex_state = 0},
   [145] = {.lex_state = 0},
   [146] = {.lex_state = 0},
-  [147] = {.lex_state = 0},
+  [147] = {.lex_state = 4},
-  [148] = {.lex_state = 0},
+  [148] = {.lex_state = 5},
   [149] = {.lex_state = 0},
   [150] = {.lex_state = 0},
-  [151] = {.lex_state = 52},
+  [151] = {.lex_state = 0},
-  [152] = {.lex_state = 52},
+  [152] = {.lex_state = 0},
   [153] = {.lex_state = 0},
   [154] = {.lex_state = 0},
-  [155] = {.lex_state = 4},
+  [155] = {.lex_state = 0},
   [156] = {.lex_state = 0},
-  [157] = {.lex_state = 0},
+  [157] = {.lex_state = 5},
   [158] = {.lex_state = 0},
   [159] = {.lex_state = 0},
   [160] = {.lex_state = 0},
-  [161] = {.lex_state = 0},
+  [161] = {.lex_state = 4},
   [162] = {.lex_state = 0},
   [163] = {.lex_state = 0},
   [164] = {.lex_state = 0},
   [165] = {.lex_state = 0},
   [166] = {.lex_state = 0},
   [167] = {.lex_state = 0},
-  [168] = {.lex_state = 53},
+  [168] = {.lex_state = 0},
   [169] = {.lex_state = 0},
   [170] = {.lex_state = 0},
   [171] = {.lex_state = 0},
-  [172] = {.lex_state = 52},
+  [172] = {.lex_state = 0},
   [173] = {.lex_state = 0},
-  [174] = {.lex_state = 3},
+  [174] = {.lex_state = 0},
-  [175] = {.lex_state = 4},
+  [175] = {.lex_state = 0},
   [176] = {.lex_state = 0},
   [177] = {.lex_state = 0},
   [178] = {.lex_state = 0},
-  [179] = {.lex_state = 0},
+  [179] = {.lex_state = 5},
   [180] = {.lex_state = 0},
   [181] = {.lex_state = 0},
   [182] = {.lex_state = 0},
-  [183] = {.lex_state = 0},
+  [183] = {.lex_state = 4},
   [184] = {.lex_state = 0},
   [185] = {.lex_state = 0},
   [186] = {.lex_state = 0},
   [187] = {.lex_state = 0},
   [188] = {.lex_state = 0},
   [189] = {.lex_state = 0},
-  [190] = {.lex_state = 3},
+  [190] = {.lex_state = 0},
   [191] = {.lex_state = 0},
-  [192] = {.lex_state = 0},
+  [192] = {.lex_state = 4},
   [193] = {.lex_state = 0},
   [194] = {.lex_state = 0},
   [195] = {.lex_state = 0},
-  [196] = {.lex_state = 3},
+  [196] = {.lex_state = 4},
-  [197] = {.lex_state = 3},
+  [197] = {.lex_state = 0},
-  [198] = {.lex_state = 3},
+  [198] = {.lex_state = 0},
   [199] = {.lex_state = 0},
   [200] = {.lex_state = 0},
-  [201] = {.lex_state = 53},
+  [201] = {.lex_state = 0},
   [202] = {.lex_state = 0},
+  [203] = {.lex_state = 0},
+  [204] = {.lex_state = 0},
+  [205] = {.lex_state = 0},
+  [206] = {.lex_state = 0},
+  [207] = {.lex_state = 0},
+  [208] = {.lex_state = 0},
+  [209] = {.lex_state = 0},
+  [210] = {.lex_state = 0},
+  [211] = {.lex_state = 0},
+  [212] = {.lex_state = 0},
+  [213] = {.lex_state = 0},
+  [214] = {.lex_state = 0},
+  [215] = {.lex_state = 0},
+  [216] = {.lex_state = 0},
+  [217] = {.lex_state = 0},
+  [218] = {.lex_state = 1},
+  [219] = {.lex_state = 0},
+  [220] = {.lex_state = 5},
+  [221] = {.lex_state = 4},
+  [222] = {.lex_state = 5},
+  [223] = {.lex_state = 0},
+  [224] = {.lex_state = 4},
+  [225] = {.lex_state = 0},
+  [226] = {.lex_state = 0},
+  [227] = {.lex_state = 5},
+  [228] = {.lex_state = 0},
+  [229] = {.lex_state = 0},
+  [230] = {.lex_state = 0},
+  [231] = {.lex_state = 0},
+  [232] = {.lex_state = 0},
+  [233] = {.lex_state = 5},
+  [234] = {.lex_state = 0},
+  [235] = {.lex_state = 0},
+  [236] = {.lex_state = 5},
+  [237] = {.lex_state = 5},
+  [238] = {.lex_state = 0},
+  [239] = {.lex_state = 0},
+  [240] = {.lex_state = 0},
+  [241] = {.lex_state = 0},
+  [242] = {.lex_state = 4},
+  [243] = {.lex_state = 5},
+  [244] = {.lex_state = 0},
+  [245] = {.lex_state = 0},
+  [246] = {.lex_state = 0},
+  [247] = {.lex_state = 0},
+  [248] = {.lex_state = 0},
+  [249] = {.lex_state = 0},
+  [250] = {.lex_state = 0},
+  [251] = {.lex_state = 0},
+  [252] = {.lex_state = 1},
+  [253] = {.lex_state = 0},
+  [254] = {.lex_state = 0},
+  [255] = {.lex_state = 1},
+  [256] = {.lex_state = 0},
+  [257] = {.lex_state = 4},
+  [258] = {.lex_state = 0},
+  [259] = {.lex_state = 0},
+  [260] = {.lex_state = 0},
+  [261] = {.lex_state = 0},
+  [262] = {.lex_state = 5},
+  [263] = {.lex_state = 0},
+  [264] = {.lex_state = 0},
+  [265] = {.lex_state = 0},
+  [266] = {.lex_state = 0},
+  [267] = {.lex_state = 0},
+  [268] = {.lex_state = 0},
+  [269] = {.lex_state = 0},
+  [270] = {.lex_state = 0},
+  [271] = {.lex_state = 0},
+  [272] = {.lex_state = 0},
+  [273] = {.lex_state = 4},
+  [274] = {.lex_state = 0},
+  [275] = {.lex_state = 0},
+  [276] = {.lex_state = 0},
+  [277] = {.lex_state = 0},
+  [278] = {.lex_state = 0},
+  [279] = {.lex_state = 0},
+  [280] = {.lex_state = 0},
+  [281] = {.lex_state = 0},
+  [282] = {.lex_state = 0},
+  [283] = {.lex_state = 0},
+  [284] = {.lex_state = 0},
+  [285] = {.lex_state = 0},
+  [286] = {.lex_state = 1},
+  [287] = {.lex_state = 1},
+  [288] = {.lex_state = 0},
+  [289] = {.lex_state = 5},
+  [290] = {.lex_state = 0},
+  [291] = {.lex_state = 1},
+  [292] = {.lex_state = 0},
+  [293] = {.lex_state = 0},
+  [294] = {.lex_state = 0},
+  [295] = {.lex_state = 0},
+  [296] = {.lex_state = 0},
+  [297] = {.lex_state = 0},
+  [298] = {.lex_state = 0},
+  [299] = {.lex_state = 6},
+  [300] = {.lex_state = 0},
+  [301] = {.lex_state = 0},
+  [302] = {.lex_state = 1},
+  [303] = {.lex_state = 1},
+  [304] = {.lex_state = 1},
+  [305] = {.lex_state = 0},
+  [306] = {.lex_state = 0},
+  [307] = {.lex_state = 6},
+  [308] = {.lex_state = 0},
 };
 static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
@@ -1710,10 +2586,10 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_fun] = ACTIONS(1),
     [anon_sym_EQ_GT] = ACTIONS(1),
     [anon_sym_AT] = ACTIONS(1),
+    [anon_sym_COLON] = ACTIONS(1),
     [anon_sym_LT] = ACTIONS(1),
     [anon_sym_GT] = ACTIONS(1),
     [anon_sym_QMARK] = ACTIONS(1),
-    [anon_sym_COLON] = ACTIONS(1),
     [anon_sym_val] = ACTIONS(1),
     [anon_sym_DOT] = ACTIONS(1),
     [anon_sym_SLASH] = ACTIONS(1),
@@ -1732,61 +2608,96 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [anon_sym_BQUOTE] = ACTIONS(1),
     [anon_sym_DOLLAR] = ACTIONS(1),
     [anon_sym_null] = ACTIONS(1),
+    [sym_comment] = ACTIONS(3),
   },
   [1] = {
-    [sym_source_file] = STATE(200),
+    [sym_source_file] = STATE(306),
-    [anon_sym_package] = ACTIONS(3),
+    [anon_sym_package] = ACTIONS(5),
+    [sym_comment] = ACTIONS(3),
   },
 };
 static const uint16_t ts_small_parse_table[] = {
-  [0] = 11,
+  [0] = 9,
-    ACTIONS(5), 1,
+    ACTIONS(3), 1,
-      ts_builtin_sym_end,
+      sym_comment,
     ACTIONS(7), 1,
+      anon_sym_RPAREN,
+    ACTIONS(11), 1,
+      sym_integer_literal,
+    ACTIONS(15), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(17), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(19), 1,
+      anon_sym_BQUOTE,
+    ACTIONS(9), 2,
+      anon_sym_true,
+      anon_sym_false,
+    ACTIONS(13), 4,
+      sym_hex_literal,
+      sym_bin_literal,
+      sym_float_literal,
+      anon_sym_null,
+    STATE(186), 7,
+      sym__primary_expression,
+      sym_boolean_literal,
+      sym_character_literal,
+      sym__string_literal,
+      sym_line_string_literal,
+      sym_multi_line_string_literal,
+      sym__literal_constant,
+  [38] = 12,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(21), 1,
+      ts_builtin_sym_end,
+    ACTIONS(23), 1,
       anon_sym_import,
-    ACTIONS(9), 1,
+    ACTIONS(25), 1,
       anon_sym_class,
-    ACTIONS(11), 1,
+    ACTIONS(27), 1,
       anon_sym_trait,
-    ACTIONS(13), 1,
+    ACTIONS(29), 1,
       anon_sym_enum,
-    ACTIONS(15), 1,
+    ACTIONS(31), 1,
       anon_sym_fun,
-    ACTIONS(17), 1,
+    ACTIONS(33), 1,
       anon_sym_AT,
+    STATE(6), 2,
+      sym_import_statement,
+      aux_sym_source_file_repeat1,
     STATE(8), 2,
       sym_definitions,
       aux_sym_source_file_repeat2,
-    STATE(16), 2,
+    STATE(90), 2,
-      sym_import_statement,
-      aux_sym_source_file_repeat1,
-    STATE(61), 2,
-      sym_trait_name,
+      sym_decorator_name,
       aux_sym_class_definition_repeat1,
-    STATE(38), 4,
+    STATE(26), 4,
       sym_class_definition,
       sym_trait_definition,
       sym_enum_definition,
       sym_fun_definition,
-  [40] = 7,
+  [81] = 8,
-    ACTIONS(21), 1,
+    ACTIONS(3), 1,
-      sym_integer_literal,
+      sym_comment,
-    ACTIONS(25), 1,
+    ACTIONS(15), 1,
       anon_sym_SQUOTE,
-    ACTIONS(27), 1,
+    ACTIONS(17), 1,
       anon_sym_DQUOTE,
-    ACTIONS(29), 1,
+    ACTIONS(19), 1,
       anon_sym_BQUOTE,
+    ACTIONS(35), 1,
+      sym_integer_literal,
-    ACTIONS(19), 2,
+    ACTIONS(9), 2,
       anon_sym_true,
       anon_sym_false,
-    ACTIONS(23), 4,
+    ACTIONS(37), 4,
       sym_hex_literal,
       sym_bin_literal,
       sym_float_literal,
       anon_sym_null,
-    STATE(97), 7,
+    STATE(245), 7,
       sym__primary_expression,
       sym_boolean_literal,
       sym_character_literal,
@@ -1794,24 +2705,26 @@ static const uint16_t ts_small_parse_table[] = {
       sym_line_string_literal,
       sym_multi_line_string_literal,
       sym__literal_constant,
-  [72] = 7,
+  [116] = 8,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(25), 1,
+    ACTIONS(15), 1,
       anon_sym_SQUOTE,
-    ACTIONS(27), 1,
+    ACTIONS(17), 1,
       anon_sym_DQUOTE,
-    ACTIONS(29), 1,
+    ACTIONS(19), 1,
       anon_sym_BQUOTE,
-    ACTIONS(31), 1,
+    ACTIONS(39), 1,
       sym_integer_literal,
-    ACTIONS(19), 2,
+    ACTIONS(9), 2,
       anon_sym_true,
       anon_sym_false,
-    ACTIONS(33), 4,
+    ACTIONS(41), 4,
       sym_hex_literal,
       sym_bin_literal,
       sym_float_literal,
       anon_sym_null,
-    STATE(128), 7,
+    STATE(191), 7,
       sym__primary_expression,
       sym_boolean_literal,
       sym_character_literal,
@@ -1819,109 +2732,119 @@ static const uint16_t ts_small_parse_table[] = {
       sym_line_string_literal,
       sym_multi_line_string_literal,
       sym__literal_constant,
-  [104] = 11,
+  [151] = 12,
-    ACTIONS(7), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(23), 1,
       anon_sym_import,
-    ACTIONS(9), 1,
+    ACTIONS(25), 1,
       anon_sym_class,
-    ACTIONS(11), 1,
+    ACTIONS(27), 1,
       anon_sym_trait,
-    ACTIONS(13), 1,
+    ACTIONS(29), 1,
       anon_sym_enum,
-    ACTIONS(15), 1,
+    ACTIONS(31), 1,
       anon_sym_fun,
-    ACTIONS(17), 1,
+    ACTIONS(33), 1,
       anon_sym_AT,
-    ACTIONS(35), 1,
+    ACTIONS(43), 1,
       ts_builtin_sym_end,
-    STATE(2), 2,
+    STATE(7), 2,
-      sym_import_statement,
-      aux_sym_source_file_repeat1,
-    STATE(6), 2,
       sym_definitions,
       aux_sym_source_file_repeat2,
-    STATE(61), 2,
+    STATE(16), 2,
+      sym_import_statement,
+      aux_sym_source_file_repeat1,
+    STATE(90), 2,
-      sym_trait_name,
+      sym_decorator_name,
       aux_sym_class_definition_repeat1,
-    STATE(38), 4,
+    STATE(26), 4,
       sym_class_definition,
       sym_trait_definition,
       sym_enum_definition,
       sym_fun_definition,
-  [144] = 9,
+  [194] = 10,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(5), 1,
+    ACTIONS(25), 1,
-      ts_builtin_sym_end,
-    ACTIONS(9), 1,
       anon_sym_class,
-    ACTIONS(11), 1,
+    ACTIONS(27), 1,
       anon_sym_trait,
-    ACTIONS(13), 1,
+    ACTIONS(29), 1,
       anon_sym_enum,
-    ACTIONS(15), 1,
+    ACTIONS(31), 1,
       anon_sym_fun,
-    ACTIONS(17), 1,
+    ACTIONS(33), 1,
       anon_sym_AT,
+    ACTIONS(45), 1,
+      ts_builtin_sym_end,
-    STATE(7), 2,
+    STATE(9), 2,
       sym_definitions,
       aux_sym_source_file_repeat2,
-    STATE(61), 2,
+    STATE(90), 2,
-      sym_trait_name,
+      sym_decorator_name,
       aux_sym_class_definition_repeat1,
-    STATE(38), 4,
+    STATE(26), 4,
       sym_class_definition,
       sym_trait_definition,
       sym_enum_definition,
       sym_fun_definition,
-  [177] = 9,
+  [230] = 10,
-    ACTIONS(37), 1,
+    ACTIONS(3), 1,
-      ts_builtin_sym_end,
+      sym_comment,
-    ACTIONS(39), 1,
+    ACTIONS(25), 1,
       anon_sym_class,
-    ACTIONS(42), 1,
+    ACTIONS(27), 1,
       anon_sym_trait,
-    ACTIONS(45), 1,
+    ACTIONS(29), 1,
       anon_sym_enum,
-    ACTIONS(48), 1,
+    ACTIONS(31), 1,
       anon_sym_fun,
-    ACTIONS(51), 1,
+    ACTIONS(33), 1,
       anon_sym_AT,
+    ACTIONS(43), 1,
+      ts_builtin_sym_end,
-    STATE(7), 2,
+    STATE(9), 2,
       sym_definitions,
       aux_sym_source_file_repeat2,
-    STATE(61), 2,
+    STATE(90), 2,
-      sym_trait_name,
+      sym_decorator_name,
       aux_sym_class_definition_repeat1,
-    STATE(38), 4,
+    STATE(26), 4,
       sym_class_definition,
       sym_trait_definition,
       sym_enum_definition,
       sym_fun_definition,
-  [210] = 9,
+  [266] = 10,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(47), 1,
+      ts_builtin_sym_end,
-    ACTIONS(9), 1,
+    ACTIONS(49), 1,
       anon_sym_class,
-    ACTIONS(11), 1,
+    ACTIONS(52), 1,
       anon_sym_trait,
-    ACTIONS(13), 1,
+    ACTIONS(55), 1,
       anon_sym_enum,
-    ACTIONS(15), 1,
+    ACTIONS(58), 1,
       anon_sym_fun,
-    ACTIONS(17), 1,
+    ACTIONS(61), 1,
       anon_sym_AT,
-    ACTIONS(54), 1,
-      ts_builtin_sym_end,
-    STATE(7), 2,
+    STATE(9), 2,
       sym_definitions,
       aux_sym_source_file_repeat2,
-    STATE(61), 2,
+    STATE(90), 2,
-      sym_trait_name,
+      sym_decorator_name,
       aux_sym_class_definition_repeat1,
-    STATE(38), 4,
+    STATE(26), 4,
       sym_class_definition,
       sym_trait_definition,
       sym_enum_definition,
       sym_fun_definition,
-  [243] = 1,
+  [302] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(56), 11,
+    ACTIONS(64), 12,
       ts_builtin_sym_end,
       anon_sym_import,
       anon_sym_class,
@@ -1931,68 +2854,77 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
+      anon_sym_LT,
       anon_sym_GT,
       anon_sym_DOT,
-  [257] = 7,
+  [320] = 8,
-    ACTIONS(58), 1,
+    ACTIONS(66), 1,
       anon_sym_BSLASHu,
-    ACTIONS(60), 1,
+    ACTIONS(69), 1,
       sym__escaped_identifier,
-    ACTIONS(62), 1,
+    ACTIONS(72), 1,
       anon_sym_DQUOTE,
-    ACTIONS(64), 1,
+    ACTIONS(74), 1,
       sym__line_str_text,
-    ACTIONS(66), 1,
+    ACTIONS(77), 1,
       anon_sym_DOLLAR,
+    ACTIONS(80), 1,
+      sym_comment,
-    STATE(51), 1,
+    STATE(89), 1,
       sym__uni_character_literal,
-    STATE(12), 4,
+    STATE(11), 4,
       sym_character_escape_seq,
       sym__line_string_content,
       sym__interpolation,
       aux_sym_line_string_literal_repeat1,
-  [282] = 7,
+  [348] = 8,
-    ACTIONS(68), 1,
+    ACTIONS(80), 1,
+      sym_comment,
+    ACTIONS(82), 1,
       anon_sym_BSLASHu,
-    ACTIONS(71), 1,
+    ACTIONS(84), 1,
       sym__escaped_identifier,
-    ACTIONS(74), 1,
+    ACTIONS(86), 1,
       anon_sym_DQUOTE,
-    ACTIONS(76), 1,
+    ACTIONS(88), 1,
       sym__line_str_text,
-    ACTIONS(79), 1,
+    ACTIONS(90), 1,
       anon_sym_DOLLAR,
-    STATE(51), 1,
+    STATE(89), 1,
       sym__uni_character_literal,
-    STATE(11), 4,
+    STATE(13), 4,
       sym_character_escape_seq,
       sym__line_string_content,
       sym__interpolation,
       aux_sym_line_string_literal_repeat1,
-  [307] = 7,
+  [376] = 8,
-    ACTIONS(58), 1,
+    ACTIONS(80), 1,
+      sym_comment,
+    ACTIONS(82), 1,
       anon_sym_BSLASHu,
-    ACTIONS(60), 1,
+    ACTIONS(84), 1,
       sym__escaped_identifier,
-    ACTIONS(66), 1,
+    ACTIONS(90), 1,
       anon_sym_DOLLAR,
-    ACTIONS(82), 1,
+    ACTIONS(92), 1,
       anon_sym_DQUOTE,
-    ACTIONS(84), 1,
+    ACTIONS(94), 1,
       sym__line_str_text,
-    STATE(51), 1,
+    STATE(89), 1,
       sym__uni_character_literal,
     STATE(11), 4,
       sym_character_escape_seq,
       sym__line_string_content,
       sym__interpolation,
       aux_sym_line_string_literal_repeat1,
-  [332] = 3,
+  [404] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(88), 1,
+    ACTIONS(98), 1,
       anon_sym_SLASH,
-    STATE(13), 1,
+    STATE(14), 1,
       aux_sym_url_repeat1,
-    ACTIONS(86), 7,
+    ACTIONS(96), 7,
       ts_builtin_sym_end,
       anon_sym_import,
       anon_sym_class,
@@ -2000,12 +2932,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [348] = 3,
+  [423] = 4,
-    ACTIONS(93), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(103), 1,
       anon_sym_SLASH,
-    STATE(13), 1,
+    STATE(14), 1,
       aux_sym_url_repeat1,
-    ACTIONS(91), 7,
+    ACTIONS(101), 7,
       ts_builtin_sym_end,
       anon_sym_import,
       anon_sym_class,
@@ -2013,12 +2947,29 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [364] = 3,
+  [442] = 4,
-    ACTIONS(93), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(107), 1,
+      anon_sym_import,
+    STATE(16), 2,
+      sym_import_statement,
+      aux_sym_source_file_repeat1,
+    ACTIONS(105), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [461] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(103), 1,
       anon_sym_SLASH,
-    STATE(14), 1,
+    STATE(15), 1,
       aux_sym_url_repeat1,
-    ACTIONS(95), 7,
+    ACTIONS(110), 7,
       ts_builtin_sym_end,
       anon_sym_import,
       anon_sym_class,
@@ -2026,21 +2977,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [380] = 3,
+  [480] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(99), 1,
+    ACTIONS(96), 8,
+      ts_builtin_sym_end,
       anon_sym_import,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+      anon_sym_SLASH,
-    STATE(16), 2,
+  [494] = 2,
-      sym_import_statement,
-      aux_sym_source_file_repeat1,
-    ACTIONS(97), 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(112), 7,
       ts_builtin_sym_end,
+      anon_sym_import,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [396] = 1,
+  [507] = 2,
-    ACTIONS(86), 8,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(114), 7,
       ts_builtin_sym_end,
       anon_sym_import,
       anon_sym_class,
@@ -2048,1544 +3011,3096 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-      anon_sym_SLASH,
-  [407] = 4,
+  [520] = 5,
+    ACTIONS(80), 1,
+      sym_comment,
-    ACTIONS(104), 1,
+    ACTIONS(119), 1,
       anon_sym_BQUOTE,
-    ACTIONS(106), 1,
+    ACTIONS(121), 1,
       anon_sym_DOLLAR,
-    ACTIONS(102), 2,
+    ACTIONS(116), 2,
       anon_sym_DQUOTE,
       sym__multi_line_str_text,
-    STATE(22), 3,
+    STATE(21), 3,
       sym__multi_line_string_content,
       sym__interpolation,
       aux_sym_multi_line_string_literal_repeat1,
-  [423] = 4,
+  [539] = 5,
+    ACTIONS(80), 1,
+      sym_comment,
-    ACTIONS(111), 1,
+    ACTIONS(126), 1,
       anon_sym_BQUOTE,
-    ACTIONS(113), 1,
+    ACTIONS(128), 1,
+      anon_sym_DOLLAR,
+    ACTIONS(124), 2,
+      anon_sym_DQUOTE,
+      sym__multi_line_str_text,
+    STATE(23), 3,
+      sym__multi_line_string_content,
+      sym__interpolation,
+      aux_sym_multi_line_string_literal_repeat1,
+  [558] = 5,
+    ACTIONS(80), 1,
+      sym_comment,
+    ACTIONS(128), 1,
       anon_sym_DOLLAR,
+    ACTIONS(132), 1,
+      anon_sym_BQUOTE,
-    ACTIONS(108), 2,
+    ACTIONS(130), 2,
       anon_sym_DQUOTE,
       sym__multi_line_str_text,
-    STATE(19), 3,
+    STATE(21), 3,
       sym__multi_line_string_content,
       sym__interpolation,
       aux_sym_multi_line_string_literal_repeat1,
-  [439] = 1,
+  [577] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(116), 7,
+    ACTIONS(134), 6,
       ts_builtin_sym_end,
-      anon_sym_import,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [449] = 1,
+  [589] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(118), 7,
+    ACTIONS(136), 6,
       ts_builtin_sym_end,
-      anon_sym_import,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [459] = 4,
+  [601] = 2,
-    ACTIONS(106), 1,
+    ACTIONS(3), 1,
-      anon_sym_DOLLAR,
-    ACTIONS(122), 1,
-      anon_sym_BQUOTE,
-    ACTIONS(120), 2,
-      anon_sym_DQUOTE,
-      sym__multi_line_str_text,
-    STATE(19), 3,
-      sym__multi_line_string_content,
-      sym__interpolation,
+      sym_comment,
-      aux_sym_multi_line_string_literal_repeat1,
-  [475] = 1,
-    ACTIONS(124), 6,
+    ACTIONS(138), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [484] = 1,
+  [613] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(126), 6,
+    ACTIONS(140), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [493] = 1,
+  [625] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(128), 6,
+    ACTIONS(142), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [502] = 1,
+  [637] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(130), 6,
+    ACTIONS(144), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [511] = 1,
+  [649] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(132), 6,
+    ACTIONS(146), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [520] = 1,
+  [661] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(134), 6,
+    ACTIONS(148), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [529] = 1,
+  [673] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(136), 6,
+    ACTIONS(150), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [538] = 1,
+  [685] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(138), 6,
+    ACTIONS(152), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [547] = 1,
+  [697] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(140), 6,
+    ACTIONS(154), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [556] = 1,
+  [709] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(142), 6,
+    ACTIONS(156), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [565] = 1,
+  [721] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(144), 6,
+    ACTIONS(158), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [574] = 1,
+  [733] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(146), 6,
+    ACTIONS(160), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [583] = 1,
+  [745] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(148), 6,
+    ACTIONS(162), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [592] = 1,
+  [757] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(150), 6,
+    ACTIONS(164), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [601] = 1,
+  [769] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(152), 6,
+    ACTIONS(166), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [610] = 1,
+  [781] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(154), 6,
+    ACTIONS(168), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [619] = 1,
+  [793] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(156), 6,
+    ACTIONS(170), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [628] = 1,
+  [805] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(158), 6,
+    ACTIONS(172), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [637] = 1,
+  [817] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(160), 6,
+    ACTIONS(174), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [646] = 1,
+  [829] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(162), 6,
+    ACTIONS(176), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [655] = 1,
+  [841] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(164), 6,
+    ACTIONS(178), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [664] = 1,
+  [853] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(166), 6,
+    ACTIONS(180), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [673] = 1,
+  [865] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(168), 6,
+    ACTIONS(182), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [682] = 1,
+  [877] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(170), 6,
+    ACTIONS(184), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [691] = 1,
+  [889] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(172), 6,
+    ACTIONS(186), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [700] = 1,
+  [901] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(174), 6,
+    ACTIONS(188), 6,
       ts_builtin_sym_end,
       anon_sym_class,
       anon_sym_trait,
       anon_sym_enum,
       anon_sym_fun,
       anon_sym_AT,
-  [709] = 2,
+  [913] = 2,
-    ACTIONS(178), 1,
+    ACTIONS(3), 1,
-      sym__line_str_text,
+      sym_comment,
-    ACTIONS(176), 4,
-      anon_sym_BSLASHu,
-      sym__escaped_identifier,
-      anon_sym_DQUOTE,
-      anon_sym_DOLLAR,
-  [719] = 4,
-    ACTIONS(180), 1,
+    ACTIONS(190), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
       anon_sym_fun,
-    ACTIONS(182), 1,
-      anon_sym_val,
+      anon_sym_AT,
-    STATE(75), 1,
-      sym_trait_field,
-    STATE(136), 2,
-      sym_type_field,
-      sym_fun_field,
-  [733] = 2,
+  [925] = 2,
-    ACTIONS(186), 1,
-      sym__line_str_text,
-    ACTIONS(184), 4,
-      anon_sym_BSLASHu,
-      sym__escaped_identifier,
-      anon_sym_DQUOTE,
-      anon_sym_DOLLAR,
-  [743] = 2,
-    ACTIONS(56), 1,
+    ACTIONS(3), 1,
-      sym__line_str_text,
+      sym_comment,
-    ACTIONS(188), 4,
-      anon_sym_BSLASHu,
-      sym__escaped_identifier,
-      anon_sym_DQUOTE,
-      anon_sym_DOLLAR,
-  [753] = 5,
-    ACTIONS(190), 1,
-      aux_sym_character_literal_token1,
-    ACTIONS(192), 1,
+    ACTIONS(192), 6,
+      ts_builtin_sym_end,
-      anon_sym_BSLASHu,
+      anon_sym_class,
-    ACTIONS(194), 1,
-      sym__escaped_identifier,
+      anon_sym_trait,
-    STATE(167), 1,
+      anon_sym_enum,
-      sym_character_escape_seq,
-    STATE(169), 1,
-      sym__uni_character_literal,
-  [769] = 4,
-    ACTIONS(180), 1,
       anon_sym_fun,
+      anon_sym_AT,
+  [937] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(182), 1,
+    ACTIONS(194), 6,
+      ts_builtin_sym_end,
-      anon_sym_val,
+      anon_sym_class,
-    STATE(66), 1,
-      sym_trait_field,
+      anon_sym_trait,
-    STATE(136), 2,
-      sym_type_field,
+      anon_sym_enum,
-      sym_fun_field,
-  [783] = 4,
-    ACTIONS(180), 1,
       anon_sym_fun,
-    ACTIONS(182), 1,
-      anon_sym_val,
-    STATE(157), 1,
-      sym_trait_field,
-    STATE(136), 2,
-      sym_type_field,
-      sym_fun_field,
-  [797] = 2,
-    ACTIONS(198), 1,
-      sym__line_str_text,
-    ACTIONS(196), 4,
-      anon_sym_BSLASHu,
-      sym__escaped_identifier,
-      anon_sym_DQUOTE,
-      anon_sym_DOLLAR,
-  [807] = 1,
-    ACTIONS(196), 4,
-      anon_sym_DQUOTE,
-      anon_sym_BQUOTE,
-      sym__multi_line_str_text,
-      anon_sym_DOLLAR,
-  [814] = 3,
-    ACTIONS(202), 1,
-      sym_definition_name,
-    STATE(101), 1,
-      sym_type,
-    ACTIONS(200), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [825] = 3,
-    ACTIONS(204), 1,
-      anon_sym_COMMA,
-    STATE(59), 1,
-      aux_sym_fun_definition_repeat2,
-    ACTIONS(207), 2,
-      anon_sym_RPAREN,
-      anon_sym_LBRACE,
-  [836] = 3,
-    ACTIONS(202), 1,
-      sym_definition_name,
-    STATE(85), 1,
-      sym_type,
-    ACTIONS(209), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [847] = 3,
-    ACTIONS(17), 1,
       anon_sym_AT,
+  [949] = 2,
-    ACTIONS(211), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(196), 6,
+      ts_builtin_sym_end,
       anon_sym_class,
-    STATE(63), 2,
-      sym_trait_name,
+      anon_sym_trait,
-      aux_sym_class_definition_repeat1,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
-  [858] = 3,
+  [961] = 2,
-    ACTIONS(202), 1,
+    ACTIONS(3), 1,
-      sym_definition_name,
-    STATE(80), 1,
-      sym_type,
+      sym_comment,
-    ACTIONS(213), 2,
+    ACTIONS(198), 6,
-      anon_sym_COMMA,
+      ts_builtin_sym_end,
-      anon_sym_RPAREN,
-  [869] = 3,
-    ACTIONS(215), 1,
       anon_sym_class,
-    ACTIONS(217), 1,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
       anon_sym_AT,
-    STATE(63), 2,
-      sym_trait_name,
-      aux_sym_class_definition_repeat1,
-  [880] = 2,
-    ACTIONS(222), 1,
-      anon_sym_QMARK,
-    ACTIONS(220), 3,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_LBRACE,
-  [889] = 1,
-    ACTIONS(188), 4,
-      anon_sym_DQUOTE,
-      anon_sym_BQUOTE,
-      sym__multi_line_str_text,
-      anon_sym_DOLLAR,
-  [896] = 3,
-    ACTIONS(224), 1,
-      anon_sym_COMMA,
-    ACTIONS(226), 1,
-      anon_sym_RPAREN,
-    STATE(74), 1,
-      aux_sym_trait_definition_repeat1,
-  [906] = 3,
-    ACTIONS(228), 1,
-      anon_sym_COMMA,
-    ACTIONS(230), 1,
-      anon_sym_LBRACE,
-    STATE(109), 1,
-      aux_sym_fun_definition_repeat2,
-  [916] = 3,
-    ACTIONS(232), 1,
+  [973] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(200), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [985] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(202), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [997] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(204), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1009] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(206), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1021] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(208), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1033] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(210), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1045] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(212), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1057] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(214), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1069] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(216), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1081] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(218), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1093] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(220), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1105] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(222), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1117] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(224), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1129] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(226), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1141] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(228), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1153] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(230), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1165] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(232), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1177] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(234), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1189] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(236), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1201] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(238), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1213] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(240), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1225] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(242), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1237] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(244), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1249] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(246), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1261] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(248), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1273] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(250), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1285] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(252), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1297] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(254), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1309] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(256), 6,
+      ts_builtin_sym_end,
+      anon_sym_class,
+      anon_sym_trait,
+      anon_sym_enum,
+      anon_sym_fun,
+      anon_sym_AT,
+  [1321] = 2,
+    ACTIONS(80), 1,
+      sym_comment,
+    ACTIONS(258), 5,
+      anon_sym_BSLASHu,
+      sym__escaped_identifier,
+      anon_sym_DQUOTE,
+      sym__line_str_text,
+      anon_sym_DOLLAR,
+  [1332] = 2,
+    ACTIONS(80), 1,
+      sym_comment,
+    ACTIONS(260), 5,
+      anon_sym_BSLASHu,
+      sym__escaped_identifier,
+      anon_sym_DQUOTE,
+      sym__line_str_text,
+      anon_sym_DOLLAR,
+  [1343] = 2,
+    ACTIONS(80), 1,
+      sym_comment,
+    ACTIONS(262), 5,
+      anon_sym_BSLASHu,
+      sym__escaped_identifier,
+      anon_sym_DQUOTE,
+      sym__line_str_text,
+      anon_sym_DOLLAR,
+  [1354] = 2,
+    ACTIONS(80), 1,
+      sym_comment,
+    ACTIONS(264), 5,
+      anon_sym_BSLASHu,
+      sym__escaped_identifier,
+      anon_sym_DQUOTE,
+      sym__line_str_text,
+      anon_sym_DOLLAR,
+  [1365] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(33), 1,
+      anon_sym_AT,
+    ACTIONS(266), 1,
+      anon_sym_class,
+    ACTIONS(268), 1,
+      anon_sym_fun,
+    STATE(93), 2,
+      sym_decorator_name,
+      aux_sym_class_definition_repeat1,
+  [1382] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(270), 1,
+      anon_sym_fun,
+    ACTIONS(272), 1,
+      anon_sym_val,
+    STATE(225), 1,
+      sym_trait_field,
+    STATE(263), 2,
+      sym_type_field,
+      sym_fun_field,
+  [1399] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(274), 1,
+      anon_sym_LPAREN,
+    ACTIONS(276), 1,
+      anon_sym_COLON,
+    ACTIONS(278), 1,
+      anon_sym_LT,
+    STATE(159), 1,
+      sym_generic_list,
+    STATE(285), 1,
+      sym_trait_list,
+  [1418] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(282), 1,
+      anon_sym_AT,
+    ACTIONS(280), 2,
+      anon_sym_class,
+      anon_sym_fun,
+    STATE(93), 2,
+      sym_decorator_name,
+      aux_sym_class_definition_repeat1,
+  [1433] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(270), 1,
+      anon_sym_fun,
+    ACTIONS(272), 1,
+      anon_sym_val,
+    STATE(177), 1,
+      sym_trait_field,
+    STATE(263), 2,
+      sym_type_field,
+      sym_fun_field,
+  [1450] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(276), 1,
+      anon_sym_COLON,
+    ACTIONS(278), 1,
+      anon_sym_LT,
+    ACTIONS(285), 1,
+      anon_sym_LPAREN,
+    STATE(194), 1,
+      sym_generic_list,
+    STATE(271), 1,
+      sym_trait_list,
+  [1469] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(270), 1,
+      anon_sym_fun,
+    ACTIONS(272), 1,
+      anon_sym_val,
+    STATE(210), 1,
+      sym_trait_field,
+    STATE(263), 2,
+      sym_type_field,
+      sym_fun_field,
+  [1486] = 6,
+    ACTIONS(80), 1,
+      sym_comment,
+    ACTIONS(287), 1,
+      aux_sym_character_literal_token1,
+    ACTIONS(289), 1,
+      anon_sym_BSLASHu,
+    ACTIONS(291), 1,
+      sym__escaped_identifier,
+    STATE(284), 1,
+      sym_character_escape_seq,
+    STATE(290), 1,
+      sym__uni_character_literal,
+  [1505] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(38), 1,
+      sym__block,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [1521] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(71), 1,
+      sym__block,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [1537] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(27), 1,
+      sym__block,
+    STATE(135), 1,
+      sym_type,
+  [1553] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(166), 1,
+      sym_type,
+    ACTIONS(299), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [1567] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(301), 1,
+      anon_sym_COMMA,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+    ACTIONS(304), 2,
+      anon_sym_RPAREN,
+      anon_sym_LBRACE,
+  [1581] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(46), 1,
+      sym__block,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [1597] = 2,
+    ACTIONS(80), 1,
+      sym_comment,
+    ACTIONS(258), 4,
+      anon_sym_DQUOTE,
+      anon_sym_BQUOTE,
+      sym__multi_line_str_text,
+      anon_sym_DOLLAR,
+  [1607] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(195), 1,
+      sym_type,
+    ACTIONS(306), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [1621] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(45), 1,
+      sym__block,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [1637] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(76), 1,
+      sym__block,
+    STATE(133), 1,
+      sym_type,
+  [1653] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(79), 1,
+      sym__block,
+    STATE(141), 1,
+      sym_type,
+  [1669] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(44), 1,
+      sym__block,
+    STATE(126), 1,
+      aux_sym_fun_definition_repeat2,
+  [1685] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(83), 1,
+      sym__block,
+    STATE(114), 1,
+      aux_sym_fun_definition_repeat2,
+  [1701] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(58), 1,
+      sym__block,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [1717] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(24), 1,
+      sym__block,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [1733] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(40), 1,
+      sym__block,
+    STATE(127), 1,
+      aux_sym_fun_definition_repeat2,
+  [1749] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(60), 1,
+      sym__block,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [1765] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(81), 1,
+      sym__block,
+    STATE(140), 1,
+      sym_type,
+  [1781] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(37), 1,
+      sym__block,
+    STATE(130), 1,
+      aux_sym_fun_definition_repeat2,
+  [1797] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(77), 1,
+      sym__block,
+    STATE(139), 1,
+      aux_sym_fun_definition_repeat2,
+  [1813] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(75), 1,
+      sym__block,
+    STATE(125), 1,
+      sym_type,
+  [1829] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(278), 1,
+      anon_sym_LT,
+    ACTIONS(308), 1,
+      anon_sym_LPAREN,
+    ACTIONS(310), 1,
+      anon_sym_DOT,
+    STATE(281), 1,
+      sym_generic_list,
+  [1845] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(74), 1,
+      sym__block,
+    STATE(121), 1,
+      aux_sym_fun_definition_repeat2,
+  [1861] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(70), 1,
+      sym__block,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [1877] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(33), 1,
+      sym__block,
+    STATE(131), 1,
+      sym_type,
+  [1893] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(63), 1,
+      sym__block,
+    STATE(109), 1,
+      sym_type,
+  [1909] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(154), 1,
+      sym_type,
+    ACTIONS(312), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [1923] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(69), 1,
+      sym__block,
+    STATE(103), 1,
+      aux_sym_fun_definition_repeat2,
+  [1939] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(31), 1,
+      sym__block,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [1955] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(30), 1,
+      sym__block,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [1971] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(52), 1,
+      sym__block,
+    STATE(116), 1,
+      sym_type,
+  [1987] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(64), 1,
+      sym__block,
+    STATE(110), 1,
+      sym_type,
+  [2003] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(29), 1,
+      sym__block,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [2019] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(57), 1,
+      sym__block,
+    STATE(111), 1,
+      aux_sym_fun_definition_repeat2,
+  [2035] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(278), 1,
+      anon_sym_LT,
+    ACTIONS(310), 1,
+      anon_sym_DOT,
+    ACTIONS(314), 1,
+      anon_sym_LPAREN,
+    STATE(280), 1,
+      sym_generic_list,
+  [2051] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(55), 1,
+      sym__block,
+    STATE(98), 1,
+      aux_sym_fun_definition_repeat2,
+  [2067] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(318), 1,
+      anon_sym_QMARK,
+    ACTIONS(316), 3,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_LBRACE,
+  [2079] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(50), 1,
+      sym__block,
+    STATE(99), 1,
+      aux_sym_fun_definition_repeat2,
+  [2095] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(56), 1,
+      sym__block,
+    STATE(113), 1,
+      sym_type,
+  [2111] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(51), 1,
+      sym__block,
+    STATE(120), 1,
+      sym_type,
+  [2127] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(53), 1,
+      sym__block,
+    STATE(117), 1,
+      sym_type,
+  [2143] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(67), 1,
+      sym__block,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [2159] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(66), 1,
+      sym__block,
+    STATE(106), 1,
+      aux_sym_fun_definition_repeat2,
+  [2175] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(293), 1,
+      anon_sym_COMMA,
+    ACTIONS(295), 1,
+      anon_sym_LBRACE,
+    STATE(59), 1,
+      sym__block,
+    STATE(112), 1,
+      aux_sym_fun_definition_repeat2,
+  [2191] = 2,
+    ACTIONS(80), 1,
+      sym_comment,
+    ACTIONS(262), 4,
+      anon_sym_DQUOTE,
+      anon_sym_BQUOTE,
+      sym__multi_line_str_text,
+      anon_sym_DOLLAR,
+  [2201] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(320), 1,
       anon_sym_COMMA,
-    ACTIONS(234), 1,
+    ACTIONS(322), 1,
       anon_sym_RPAREN,
+    STATE(152), 1,
+      aux_sym_fun_definition_repeat1,
+  [2214] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(320), 1,
+      anon_sym_COMMA,
+    ACTIONS(324), 1,
+      anon_sym_RPAREN,
+    STATE(152), 1,
+      aux_sym_fun_definition_repeat1,
+  [2227] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(326), 1,
+      anon_sym_COMMA,
+    ACTIONS(328), 1,
+      anon_sym_RPAREN,
-    STATE(87), 1,
+    STATE(187), 1,
       aux_sym_class_definition_repeat2,
-  [926] = 3,
+  [2240] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(236), 1,
+    ACTIONS(326), 1,
       anon_sym_COMMA,
-    ACTIONS(239), 1,
+    ACTIONS(330), 1,
       anon_sym_RPAREN,
-    STATE(59), 1,
+    STATE(180), 1,
-      aux_sym_fun_definition_repeat2,
+      aux_sym_class_definition_repeat2,
-  [936] = 3,
+  [2253] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(241), 1,
+    ACTIONS(332), 1,
+      anon_sym_RPAREN,
+    ACTIONS(334), 1,
+      sym_variable_name,
+    STATE(182), 1,
+      sym_param,
+  [2266] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(336), 1,
       aux_sym_url_token1,
-    STATE(141), 1,
+    STATE(132), 1,
       sym_identifier,
-    STATE(179), 1,
+    STATE(151), 1,
       sym__extension,
-  [946] = 3,
+  [2279] = 4,
-    ACTIONS(243), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(338), 1,
       anon_sym_COMMA,
+    ACTIONS(341), 1,
+      anon_sym_RPAREN,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [2292] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(278), 1,
+      anon_sym_LT,
+    ACTIONS(343), 1,
+      anon_sym_LPAREN,
+    STATE(283), 1,
+      sym_generic_list,
+  [2305] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(278), 1,
+      anon_sym_LT,
+    ACTIONS(314), 1,
+      anon_sym_LPAREN,
+    STATE(280), 1,
+      sym_generic_list,
+  [2318] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(245), 1,
+    ACTIONS(345), 1,
-      anon_sym_GT,
+      anon_sym_COMMA,
+    ACTIONS(348), 1,
+      anon_sym_RPAREN,
-    STATE(90), 1,
+    STATE(152), 1,
-      aux_sym_trait_list_repeat1,
+      aux_sym_fun_definition_repeat1,
-  [956] = 3,
+  [2331] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(232), 1,
+    ACTIONS(326), 1,
       anon_sym_COMMA,
-    ACTIONS(247), 1,
+    ACTIONS(350), 1,
       anon_sym_RPAREN,
-    STATE(91), 1,
+    STATE(187), 1,
       aux_sym_class_definition_repeat2,
-  [966] = 3,
+  [2344] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(249), 1,
+    ACTIONS(352), 1,
       anon_sym_COMMA,
-    ACTIONS(252), 1,
+    ACTIONS(355), 1,
       anon_sym_RPAREN,
-    STATE(73), 1,
+    STATE(149), 1,
-      aux_sym_enum_field_repeat1,
+      aux_sym_fun_definition_repeat2,
-  [976] = 3,
+  [2357] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(224), 1,
+    ACTIONS(357), 1,
       anon_sym_COMMA,
-    ACTIONS(254), 1,
+    ACTIONS(360), 1,
       anon_sym_RPAREN,
-    STATE(94), 1,
+    STATE(155), 1,
       aux_sym_trait_definition_repeat1,
-  [986] = 3,
+  [2370] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(224), 1,
+    ACTIONS(362), 1,
       anon_sym_COMMA,
-    ACTIONS(256), 1,
+    ACTIONS(365), 1,
       anon_sym_RPAREN,
+    STATE(102), 1,
+      aux_sym_fun_definition_repeat2,
+  [2383] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(336), 1,
+      aux_sym_url_token1,
+    STATE(119), 1,
+      sym_identifier,
+    STATE(163), 1,
+      sym__extension,
+  [2396] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(367), 1,
+      anon_sym_COMMA,
+    ACTIONS(370), 1,
+      anon_sym_GT,
-    STATE(95), 1,
+    STATE(158), 1,
-      aux_sym_trait_definition_repeat1,
+      aux_sym_generic_list_repeat1,
-  [996] = 3,
+  [2409] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(258), 1,
+    ACTIONS(276), 1,
+      anon_sym_COLON,
+    ACTIONS(372), 1,
       anon_sym_LPAREN,
-    ACTIONS(260), 1,
-      anon_sym_LT,
-    STATE(166), 1,
+    STATE(267), 1,
-      sym_generic_list,
+      sym_trait_list,
-  [1006] = 3,
+  [2422] = 4,
-    ACTIONS(232), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(374), 1,
       anon_sym_COMMA,
-    ACTIONS(262), 1,
+    ACTIONS(376), 1,
       anon_sym_RPAREN,
+    STATE(155), 1,
+      aux_sym_trait_definition_repeat1,
+  [2435] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(334), 1,
+      sym_variable_name,
+    ACTIONS(378), 1,
+      anon_sym_RPAREN,
-    STATE(87), 1,
+    STATE(181), 1,
-      aux_sym_class_definition_repeat2,
+      sym_param,
-  [1016] = 3,
+  [2448] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(380), 1,
+      anon_sym_COMMA,
-    ACTIONS(202), 1,
+    ACTIONS(382), 1,
+      anon_sym_RPAREN,
+    STATE(165), 1,
-      sym_definition_name,
+      aux_sym_decorator_name_repeat1,
+  [2461] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(264), 1,
+    ACTIONS(278), 1,
-      anon_sym_LBRACE,
-    STATE(99), 1,
-      sym_type,
-  [1026] = 3,
-    ACTIONS(260), 1,
       anon_sym_LT,
-    ACTIONS(266), 1,
+    ACTIONS(308), 1,
       anon_sym_LPAREN,
-    STATE(170), 1,
+    STATE(281), 1,
       sym_generic_list,
-  [1036] = 3,
+  [2474] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(384), 3,
+      anon_sym_class,
+      anon_sym_fun,
+      anon_sym_AT,
+  [2483] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(268), 1,
+    ACTIONS(386), 1,
       anon_sym_COMMA,
-    ACTIONS(271), 1,
+    ACTIONS(389), 1,
       anon_sym_RPAREN,
-    STATE(69), 1,
+    STATE(165), 1,
-      aux_sym_fun_definition_repeat2,
+      aux_sym_decorator_name_repeat1,
-  [1046] = 3,
+  [2496] = 4,
-    ACTIONS(273), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(391), 1,
       anon_sym_COMMA,
-    ACTIONS(276), 1,
+    ACTIONS(394), 1,
       anon_sym_RPAREN,
-    STATE(59), 1,
+    STATE(156), 1,
       aux_sym_fun_definition_repeat2,
-  [1056] = 3,
+  [2509] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(278), 1,
+    ACTIONS(326), 1,
       anon_sym_COMMA,
-    ACTIONS(280), 1,
+    ACTIONS(396), 1,
       anon_sym_RPAREN,
-    STATE(104), 1,
+    STATE(187), 1,
-      aux_sym_fun_definition_repeat1,
+      aux_sym_class_definition_repeat2,
-  [1066] = 3,
+  [2522] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(232), 1,
+    ACTIONS(326), 1,
       anon_sym_COMMA,
-    ACTIONS(282), 1,
+    ACTIONS(398), 1,
       anon_sym_RPAREN,
-    STATE(106), 1,
+    STATE(201), 1,
       aux_sym_class_definition_repeat2,
-  [1076] = 3,
+  [2535] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(284), 1,
+    ACTIONS(326), 1,
       anon_sym_COMMA,
-    ACTIONS(286), 1,
+    ACTIONS(400), 1,
       anon_sym_RPAREN,
-    STATE(73), 1,
+    STATE(203), 1,
-      aux_sym_enum_field_repeat1,
+      aux_sym_class_definition_repeat2,
-  [1086] = 3,
+  [2548] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(288), 1,
+    ACTIONS(402), 1,
       anon_sym_COMMA,
-    ACTIONS(291), 1,
+    ACTIONS(405), 1,
       anon_sym_RPAREN,
-    STATE(81), 1,
+    STATE(102), 1,
       aux_sym_fun_definition_repeat2,
-  [1096] = 3,
+  [2561] = 4,
-    ACTIONS(293), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(407), 1,
+      anon_sym_LPAREN,
+    ACTIONS(409), 1,
       anon_sym_COMMA,
+    STATE(171), 1,
+      aux_sym_trait_list_repeat1,
+  [2574] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(296), 1,
+    ACTIONS(326), 1,
-      anon_sym_RPAREN,
-    STATE(59), 1,
-      aux_sym_fun_definition_repeat2,
-  [1106] = 3,
-    ACTIONS(298), 1,
       anon_sym_COMMA,
-    ACTIONS(301), 1,
+    ACTIONS(412), 1,
       anon_sym_RPAREN,
-    STATE(87), 1,
+    STATE(197), 1,
       aux_sym_class_definition_repeat2,
-  [1116] = 3,
+  [2587] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(228), 1,
+    ACTIONS(320), 1,
       anon_sym_COMMA,
-    ACTIONS(303), 1,
+    ACTIONS(414), 1,
-      anon_sym_LBRACE,
+      anon_sym_RPAREN,
-    STATE(59), 1,
+    STATE(152), 1,
-      aux_sym_fun_definition_repeat2,
+      aux_sym_fun_definition_repeat1,
-  [1126] = 3,
+  [2600] = 4,
-    ACTIONS(305), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(416), 1,
+      anon_sym_LPAREN,
+    ACTIONS(418), 1,
       anon_sym_COMMA,
+    STATE(198), 1,
+      aux_sym_trait_list_repeat1,
+  [2613] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(307), 1,
+    ACTIONS(320), 1,
+      anon_sym_COMMA,
+    ACTIONS(420), 1,
-      anon_sym_RBRACE,
+      anon_sym_RPAREN,
-    STATE(93), 1,
+    STATE(211), 1,
-      aux_sym_enum_definition_repeat1,
+      aux_sym_fun_definition_repeat1,
-  [1136] = 3,
+  [2626] = 4,
-    ACTIONS(309), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(422), 1,
       anon_sym_COMMA,
-    ACTIONS(312), 1,
+    ACTIONS(424), 1,
       anon_sym_GT,
-    STATE(90), 1,
+    STATE(206), 1,
-      aux_sym_trait_list_repeat1,
+      aux_sym_generic_list_repeat1,
-  [1146] = 3,
+  [2639] = 4,
-    ACTIONS(232), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(374), 1,
       anon_sym_COMMA,
+    ACTIONS(426), 1,
+      anon_sym_RPAREN,
+    STATE(209), 1,
+      aux_sym_trait_definition_repeat1,
+  [2652] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(314), 1,
+    ACTIONS(326), 1,
+      anon_sym_COMMA,
+    ACTIONS(428), 1,
+      anon_sym_RPAREN,
+    STATE(212), 1,
+      aux_sym_class_definition_repeat2,
+  [2665] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(336), 1,
+      aux_sym_url_token1,
+    STATE(3), 1,
+      sym_package,
+    STATE(19), 1,
+      sym_identifier,
+  [2678] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(326), 1,
+      anon_sym_COMMA,
+    ACTIONS(430), 1,
       anon_sym_RPAREN,
-    STATE(87), 1,
+    STATE(187), 1,
       aux_sym_class_definition_repeat2,
-  [1156] = 3,
+  [2691] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(316), 1,
+    ACTIONS(320), 1,
+      anon_sym_COMMA,
+    ACTIONS(432), 1,
       anon_sym_RPAREN,
+    STATE(144), 1,
+      aux_sym_fun_definition_repeat1,
+  [2704] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(318), 1,
+    ACTIONS(320), 1,
+      anon_sym_COMMA,
+    ACTIONS(434), 1,
+      anon_sym_RPAREN,
+    STATE(215), 1,
+      aux_sym_fun_definition_repeat1,
+  [2717] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(334), 1,
       sym_variable_name,
+    ACTIONS(436), 1,
+      anon_sym_RPAREN,
-    STATE(111), 1,
+    STATE(216), 1,
       sym_param,
-  [1166] = 3,
+  [2730] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(438), 3,
+      anon_sym_class,
+      anon_sym_fun,
+      anon_sym_AT,
+  [2739] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(320), 1,
+    ACTIONS(440), 1,
       anon_sym_COMMA,
-    ACTIONS(323), 1,
+    ACTIONS(442), 1,
       anon_sym_RBRACE,
-    STATE(93), 1,
+    STATE(213), 1,
       aux_sym_enum_definition_repeat1,
-  [1176] = 3,
+  [2752] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(325), 1,
+    ACTIONS(380), 1,
       anon_sym_COMMA,
-    ACTIONS(328), 1,
+    ACTIONS(444), 1,
       anon_sym_RPAREN,
-    STATE(94), 1,
+    STATE(200), 1,
-      aux_sym_trait_definition_repeat1,
+      aux_sym_decorator_name_repeat1,
-  [1186] = 3,
+  [2765] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(224), 1,
+    ACTIONS(446), 1,
       anon_sym_COMMA,
-    ACTIONS(330), 1,
+    ACTIONS(449), 1,
       anon_sym_RPAREN,
+    STATE(187), 1,
+      aux_sym_class_definition_repeat2,
+  [2778] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(451), 3,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+      anon_sym_LBRACE,
+  [2787] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(440), 1,
+      anon_sym_COMMA,
+    ACTIONS(453), 1,
+      anon_sym_RBRACE,
-    STATE(94), 1,
+    STATE(190), 1,
-      aux_sym_trait_definition_repeat1,
+      aux_sym_enum_definition_repeat1,
-  [1196] = 3,
+  [2800] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(455), 1,
+      anon_sym_COMMA,
-    ACTIONS(318), 1,
+    ACTIONS(458), 1,
+      anon_sym_RBRACE,
+    STATE(190), 1,
+      aux_sym_enum_definition_repeat1,
+  [2813] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(380), 1,
+      anon_sym_COMMA,
+    ACTIONS(460), 1,
+      anon_sym_RPAREN,
+    STATE(162), 1,
+      aux_sym_decorator_name_repeat1,
+  [2826] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(334), 1,
       sym_variable_name,
-    ACTIONS(332), 1,
+    ACTIONS(462), 1,
       anon_sym_RPAREN,
-    STATE(119), 1,
+    STATE(175), 1,
+      sym_param,
+  [2839] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(320), 1,
+      anon_sym_COMMA,
+    ACTIONS(464), 1,
+      anon_sym_RPAREN,
+    STATE(173), 1,
+      aux_sym_fun_definition_repeat1,
+  [2852] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(276), 1,
+      anon_sym_COLON,
+    ACTIONS(466), 1,
+      anon_sym_LPAREN,
+    STATE(278), 1,
+      sym_trait_list,
+  [2865] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(468), 1,
+      anon_sym_COMMA,
+    ACTIONS(471), 1,
+      anon_sym_RPAREN,
+    STATE(170), 1,
+      aux_sym_fun_definition_repeat2,
+  [2878] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(334), 1,
+      sym_variable_name,
+    ACTIONS(473), 1,
+      anon_sym_RPAREN,
+    STATE(193), 1,
       sym_param,
+  [2891] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(326), 1,
+      anon_sym_COMMA,
+    ACTIONS(475), 1,
+      anon_sym_RPAREN,
+    STATE(187), 1,
+      aux_sym_class_definition_repeat2,
-  [1206] = 3,
+  [2904] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(418), 1,
+      anon_sym_COMMA,
+    ACTIONS(477), 1,
+      anon_sym_LPAREN,
+    STATE(171), 1,
+      aux_sym_trait_list_repeat1,
+  [2917] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(326), 1,
+      anon_sym_COMMA,
+    ACTIONS(479), 1,
+      anon_sym_RPAREN,
+    STATE(167), 1,
+      aux_sym_class_definition_repeat2,
+  [2930] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(284), 1,
+    ACTIONS(380), 1,
+      anon_sym_COMMA,
+    ACTIONS(481), 1,
+      anon_sym_RPAREN,
+    STATE(165), 1,
+      aux_sym_decorator_name_repeat1,
+  [2943] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(326), 1,
+      anon_sym_COMMA,
+    ACTIONS(483), 1,
+      anon_sym_RPAREN,
+    STATE(187), 1,
+      aux_sym_class_definition_repeat2,
+  [2956] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(485), 3,
+      anon_sym_class,
+      anon_sym_fun,
+      anon_sym_AT,
+  [2965] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(326), 1,
       anon_sym_COMMA,
-    ACTIONS(334), 1,
+    ACTIONS(487), 1,
       anon_sym_RPAREN,
-    STATE(84), 1,
-      aux_sym_enum_field_repeat1,
-  [1216] = 3,
-    ACTIONS(260), 1,
-      anon_sym_LT,
-    ACTIONS(336), 1,
-      anon_sym_LPAREN,
     STATE(187), 1,
-      sym_generic_list,
+      aux_sym_class_definition_repeat2,
-  [1226] = 3,
+  [2978] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(228), 1,
+    ACTIONS(326), 1,
-      anon_sym_COMMA,
-    ACTIONS(338), 1,
-      anon_sym_LBRACE,
-    STATE(120), 1,
-      aux_sym_fun_definition_repeat2,
-  [1236] = 3,
-    ACTIONS(232), 1,
       anon_sym_COMMA,
-    ACTIONS(340), 1,
+    ACTIONS(489), 1,
       anon_sym_RPAREN,
-    STATE(68), 1,
+    STATE(205), 1,
       aux_sym_class_definition_repeat2,
-  [1246] = 3,
+  [2991] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(342), 1,
+    ACTIONS(326), 1,
       anon_sym_COMMA,
-    ACTIONS(345), 1,
+    ACTIONS(491), 1,
       anon_sym_RPAREN,
-    STATE(86), 1,
+    STATE(187), 1,
-      aux_sym_fun_definition_repeat2,
+      aux_sym_class_definition_repeat2,
-  [1256] = 3,
+  [3004] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(202), 1,
+    ACTIONS(422), 1,
-      sym_definition_name,
-    ACTIONS(347), 1,
-      anon_sym_LBRACE,
-    STATE(67), 1,
-      sym_type,
-  [1266] = 3,
-    ACTIONS(243), 1,
       anon_sym_COMMA,
-    ACTIONS(349), 1,
+    ACTIONS(493), 1,
       anon_sym_GT,
-    STATE(71), 1,
+    STATE(158), 1,
-      aux_sym_trait_list_repeat1,
+      aux_sym_generic_list_repeat1,
-  [1276] = 3,
+  [3017] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(326), 1,
       anon_sym_COMMA,
-    ACTIONS(354), 1,
+    ACTIONS(495), 1,
       anon_sym_RPAREN,
-    STATE(104), 1,
+    STATE(153), 1,
-      aux_sym_fun_definition_repeat1,
-  [1286] = 3,
-    ACTIONS(241), 1,
-      aux_sym_url_token1,
-    STATE(5), 1,
-      sym_package,
-    STATE(20), 1,
-      sym_identifier,
-  [1296] = 3,
-    ACTIONS(232), 1,
-      anon_sym_COMMA,
-    ACTIONS(356), 1,
-      anon_sym_RPAREN,
-    STATE(87), 1,
       aux_sym_class_definition_repeat2,
-  [1306] = 3,
+  [3030] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(232), 1,
+    ACTIONS(326), 1,
       anon_sym_COMMA,
-    ACTIONS(358), 1,
+    ACTIONS(497), 1,
       anon_sym_RPAREN,
-    STATE(121), 1,
+    STATE(145), 1,
       aux_sym_class_definition_repeat2,
-  [1316] = 3,
+  [3043] = 4,
-    ACTIONS(228), 1,
+    ACTIONS(3), 1,
-      anon_sym_COMMA,
+      sym_comment,
-    ACTIONS(360), 1,
+    ACTIONS(374), 1,
-      anon_sym_LBRACE,
-    STATE(88), 1,
-      aux_sym_fun_definition_repeat2,
-  [1326] = 3,
-    ACTIONS(228), 1,
       anon_sym_COMMA,
+    ACTIONS(499), 1,
+      anon_sym_RPAREN,
+    STATE(155), 1,
+      aux_sym_trait_definition_repeat1,
+  [3056] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(362), 1,
+    ACTIONS(374), 1,
-      anon_sym_LBRACE,
-    STATE(59), 1,
-      aux_sym_fun_definition_repeat2,
-  [1336] = 1,
-    ACTIONS(207), 3,
       anon_sym_COMMA,
+    ACTIONS(501), 1,
       anon_sym_RPAREN,
-      anon_sym_LBRACE,
+    STATE(160), 1,
+      aux_sym_trait_definition_repeat1,
-  [1342] = 3,
+  [3069] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(278), 1,
+    ACTIONS(320), 1,
       anon_sym_COMMA,
-    ACTIONS(364), 1,
+    ACTIONS(503), 1,
       anon_sym_RPAREN,
-    STATE(118), 1,
+    STATE(152), 1,
       aux_sym_fun_definition_repeat1,
-  [1352] = 3,
+  [3082] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(305), 1,
+    ACTIONS(326), 1,
       anon_sym_COMMA,
-    ACTIONS(366), 1,
-      anon_sym_RBRACE,
-    STATE(89), 1,
-      aux_sym_enum_definition_repeat1,
-  [1362] = 3,
-    ACTIONS(305), 1,
+    ACTIONS(505), 1,
+      anon_sym_RPAREN,
+    STATE(187), 1,
+      aux_sym_class_definition_repeat2,
+  [3095] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(440), 1,
       anon_sym_COMMA,
-    ACTIONS(368), 1,
+    ACTIONS(507), 1,
       anon_sym_RBRACE,
-    STATE(93), 1,
+    STATE(190), 1,
       aux_sym_enum_definition_repeat1,
-  [1372] = 3,
+  [3108] = 4,
-    ACTIONS(305), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(440), 1,
       anon_sym_COMMA,
-    ACTIONS(370), 1,
+    ACTIONS(509), 1,
       anon_sym_RBRACE,
-    STATE(113), 1,
+    STATE(189), 1,
       aux_sym_enum_definition_repeat1,
-  [1382] = 3,
+  [3121] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(232), 1,
+    ACTIONS(320), 1,
-      anon_sym_COMMA,
-    ACTIONS(372), 1,
-      anon_sym_RPAREN,
-    STATE(77), 1,
-      aux_sym_class_definition_repeat2,
-  [1392] = 3,
-    ACTIONS(202), 1,
-      sym_definition_name,
-    ACTIONS(374), 1,
-      anon_sym_LBRACE,
-    STATE(108), 1,
-      sym_type,
-  [1402] = 1,
-    ACTIONS(376), 3,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_LBRACE,
-  [1408] = 3,
-    ACTIONS(278), 1,
       anon_sym_COMMA,
-    ACTIONS(378), 1,
+    ACTIONS(511), 1,
       anon_sym_RPAREN,
-    STATE(104), 1,
+    STATE(152), 1,
       aux_sym_fun_definition_repeat1,
-  [1418] = 3,
+  [3134] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(278), 1,
+    ACTIONS(320), 1,
       anon_sym_COMMA,
-    ACTIONS(380), 1,
+    ACTIONS(513), 1,
       anon_sym_RPAREN,
-    STATE(82), 1,
+    STATE(143), 1,
       aux_sym_fun_definition_repeat1,
-  [1428] = 3,
+  [3147] = 2,
-    ACTIONS(228), 1,
-      anon_sym_COMMA,
-    ACTIONS(382), 1,
+    ACTIONS(3), 1,
-      anon_sym_LBRACE,
+      sym_comment,
-    STATE(59), 1,
-      aux_sym_fun_definition_repeat2,
-  [1438] = 3,
-    ACTIONS(232), 1,
+    ACTIONS(304), 3,
       anon_sym_COMMA,
-    ACTIONS(384), 1,
       anon_sym_RPAREN,
-    STATE(87), 1,
+      anon_sym_LBRACE,
-      aux_sym_class_definition_repeat2,
-  [1448] = 1,
+  [3156] = 3,
-    ACTIONS(386), 2,
+    ACTIONS(3), 1,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
+      sym_comment,
-  [1453] = 2,
-    ACTIONS(241), 1,
+    ACTIONS(297), 1,
-      aux_sym_url_token1,
-    STATE(103), 1,
-      sym_identifier,
-  [1460] = 2,
-    ACTIONS(202), 1,
       sym_definition_name,
-    STATE(110), 1,
+    STATE(226), 1,
       sym_type,
-  [1467] = 2,
+  [3166] = 3,
-    ACTIONS(388), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(272), 1,
+      anon_sym_val,
+    STATE(254), 1,
+      sym_type_field,
+  [3176] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(515), 1,
       aux_sym_url_token1,
-    STATE(57), 1,
+    STATE(142), 1,
       sym_identifier,
-  [1474] = 2,
+  [3186] = 3,
-    ACTIONS(390), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(517), 1,
+      sym_enum_field_name,
+    STATE(250), 1,
+      sym_enum_field,
+  [3196] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(519), 1,
       aux_sym_url_token1,
-    STATE(21), 1,
+    STATE(20), 1,
       sym_url,
-  [1481] = 1,
+  [3206] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(392), 2,
+    ACTIONS(348), 2,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
+      anon_sym_RPAREN,
-  [1486] = 1,
+  [3214] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(334), 1,
+      sym_variable_name,
+    STATE(223), 1,
+      sym_param,
+  [3224] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(252), 2,
+    ACTIONS(360), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [1491] = 1,
+  [3232] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(394), 2,
+    ACTIONS(521), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [1496] = 2,
+  [3240] = 3,
-    ACTIONS(202), 1,
+    ACTIONS(3), 1,
-      sym_definition_name,
-    STATE(122), 1,
-      sym_type,
+      sym_comment,
-  [1503] = 2,
-    ACTIONS(396), 1,
+    ACTIONS(336), 1,
-      sym_enum_field_name,
-    STATE(153), 1,
-      sym_enum_field,
-  [1510] = 2,
-    ACTIONS(241), 1,
       aux_sym_url_token1,
-    STATE(160), 1,
+    STATE(295), 1,
       sym_identifier,
-  [1517] = 2,
+  [3250] = 2,
-    ACTIONS(396), 1,
+    ACTIONS(3), 1,
-      sym_enum_field_name,
-    STATE(112), 1,
-      sym_enum_field,
+      sym_comment,
-  [1524] = 1,
-    ACTIONS(398), 2,
+    ACTIONS(523), 2,
       anon_sym_COMMA,
-      anon_sym_RPAREN,
+      anon_sym_RBRACE,
-  [1529] = 2,
+  [3258] = 2,
-    ACTIONS(318), 1,
+    ACTIONS(3), 1,
-      sym_variable_name,
-    STATE(146), 1,
-      sym_param,
+      sym_comment,
-  [1536] = 1,
-    ACTIONS(400), 2,
+    ACTIONS(525), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [1541] = 1,
+  [3266] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(402), 2,
+    ACTIONS(527), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [1546] = 2,
+  [3274] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(241), 1,
+    ACTIONS(272), 1,
-      aux_sym_url_token1,
-    STATE(194), 1,
-      sym_identifier,
-  [1553] = 2,
-    ACTIONS(182), 1,
       anon_sym_val,
-    STATE(72), 1,
+    STATE(146), 1,
       sym_type_field,
-  [1560] = 2,
+  [3284] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(182), 1,
+    ACTIONS(272), 1,
       anon_sym_val,
-    STATE(107), 1,
+    STATE(172), 1,
       sym_type_field,
-  [1567] = 2,
+  [3294] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(404), 1,
+    ACTIONS(336), 1,
+      aux_sym_url_token1,
+    STATE(176), 1,
+      sym_identifier,
+  [3304] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(529), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [3312] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(531), 2,
       anon_sym_LPAREN,
+      anon_sym_COLON,
+  [3320] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(533), 1,
+      aux_sym_url_token1,
+    STATE(88), 1,
+      sym_identifier,
+  [3330] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(406), 1,
+    ACTIONS(336), 1,
+      aux_sym_url_token1,
+    STATE(241), 1,
+      sym_identifier,
+  [3340] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(535), 2,
-      anon_sym_DOT,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
-  [1574] = 2,
+  [3348] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(537), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [3356] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(182), 1,
+    ACTIONS(272), 1,
       anon_sym_val,
-    STATE(83), 1,
+    STATE(178), 1,
       sym_type_field,
-  [1581] = 2,
+  [3366] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(370), 2,
+      anon_sym_COMMA,
+      anon_sym_GT,
+  [3374] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(517), 1,
+      sym_enum_field_name,
+    STATE(185), 1,
+      sym_enum_field,
+  [3384] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(336), 1,
+      aux_sym_url_token1,
+    STATE(258), 1,
+      sym_identifier,
+  [3394] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(202), 1,
+    ACTIONS(272), 1,
-      sym_definition_name,
+      anon_sym_val,
-    STATE(144), 1,
+    STATE(168), 1,
-      sym_type,
+      sym_type_field,
-  [1588] = 1,
+  [3404] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(408), 2,
+    ACTIONS(389), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [1593] = 1,
+  [3412] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(272), 1,
+      anon_sym_val,
+    STATE(169), 1,
+      sym_type_field,
+  [3422] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(410), 2,
+    ACTIONS(539), 2,
       anon_sym_COMMA,
       anon_sym_RBRACE,
-  [1598] = 1,
+  [3430] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(272), 1,
+      anon_sym_val,
+    STATE(204), 1,
+      sym_type_field,
+  [3440] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(354), 2,
+    ACTIONS(541), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [1603] = 1,
-    ACTIONS(412), 2,
-      anon_sym_class,
-      anon_sym_AT,
-  [1608] = 1,
-    ACTIONS(414), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [1613] = 1,
+  [3448] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(416), 2,
+    ACTIONS(458), 2,
       anon_sym_COMMA,
+      anon_sym_RBRACE,
+  [3456] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(543), 2,
-      anon_sym_RPAREN,
+      anon_sym_LPAREN,
+      anon_sym_COLON,
-  [1618] = 2,
+  [3464] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(249), 1,
+      sym_type,
+  [3474] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(182), 1,
+    ACTIONS(272), 1,
       anon_sym_val,
-    STATE(159), 1,
-      sym_type_field,
-  [1625] = 2,
-    ACTIONS(241), 1,
-      aux_sym_url_token1,
     STATE(199), 1,
-      sym_identifier,
+      sym_type_field,
-  [1632] = 2,
+  [3484] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(418), 1,
+    ACTIONS(449), 2,
-      aux_sym_url_token1,
-    STATE(56), 1,
-      sym_identifier,
-  [1639] = 1,
-    ACTIONS(323), 2,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
+      anon_sym_RPAREN,
-  [1644] = 1,
+  [3492] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(297), 1,
+      sym_definition_name,
+    STATE(217), 1,
+      sym_type,
+  [3502] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(420), 2,
+    ACTIONS(545), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [1649] = 2,
+  [3510] = 3,
-    ACTIONS(396), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(517), 1,
       sym_enum_field_name,
-    STATE(114), 1,
+    STATE(214), 1,
       sym_enum_field,
-  [1656] = 2,
+  [3520] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(547), 2,
+      anon_sym_LPAREN,
+      anon_sym_LT,
+  [3528] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(182), 1,
+    ACTIONS(272), 1,
       anon_sym_val,
-    STATE(115), 1,
+    STATE(207), 1,
       sym_type_field,
-  [1663] = 1,
+  [3538] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(328), 2,
+    ACTIONS(407), 2,
+      anon_sym_LPAREN,
       anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [1668] = 2,
+  [3546] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(182), 1,
+    ACTIONS(272), 1,
       anon_sym_val,
-    STATE(100), 1,
+    STATE(208), 1,
       sym_type_field,
-  [1675] = 1,
+  [3556] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(301), 2,
+    ACTIONS(336), 1,
+      aux_sym_url_token1,
+    STATE(293), 1,
+      sym_identifier,
+  [3566] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(549), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [1680] = 1,
+  [3574] = 2,
-    ACTIONS(312), 2,
+    ACTIONS(3), 1,
-      anon_sym_COMMA,
-      anon_sym_GT,
+      sym_comment,
-  [1685] = 1,
-    ACTIONS(422), 1,
+    ACTIONS(551), 1,
-      anon_sym_RBRACE,
-  [1689] = 1,
-    ACTIONS(424), 1,
       anon_sym_EQ_GT,
-  [1693] = 1,
+  [3581] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(426), 1,
+    ACTIONS(553), 1,
+      anon_sym_EQ_GT,
+  [3588] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(555), 1,
+      anon_sym_EQ_GT,
+  [3595] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(557), 1,
       anon_sym_LPAREN,
-  [1697] = 1,
+  [3602] = 2,
-    ACTIONS(428), 1,
-      anon_sym_RBRACE,
-  [1701] = 1,
-    ACTIONS(430), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(559), 1,
-      anon_sym_RBRACE,
+      anon_sym_EQ_GT,
-  [1705] = 1,
+  [3609] = 2,
-    ACTIONS(432), 1,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(561), 1,
+      anon_sym_COLON,
+  [3616] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(563), 1,
       anon_sym_LPAREN,
-  [1709] = 1,
+  [3623] = 2,
-    ACTIONS(434), 1,
+    ACTIONS(3), 1,
-      anon_sym_SQUOTE,
+      sym_comment,
-  [1713] = 1,
-    ACTIONS(436), 1,
+    ACTIONS(565), 1,
-      aux_sym__uni_character_literal_token1,
-  [1717] = 1,
-    ACTIONS(186), 1,
-      anon_sym_SQUOTE,
-  [1721] = 1,
-    ACTIONS(438), 1,
       anon_sym_LPAREN,
-  [1725] = 1,
+  [3630] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(440), 1,
+    ACTIONS(567), 1,
-      anon_sym_LBRACE,
+      anon_sym_EQ_GT,
-  [1729] = 1,
+  [3637] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(442), 1,
+    ACTIONS(569), 1,
-      aux_sym_url_token1,
-  [1733] = 1,
-    ACTIONS(444), 1,
-      anon_sym_RBRACE,
-  [1737] = 1,
-    ACTIONS(446), 1,
-      sym_definition_name,
-  [1741] = 1,
-    ACTIONS(448), 1,
       sym_variable_name,
-  [1745] = 1,
+  [3644] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(450), 1,
+    ACTIONS(571), 1,
+      anon_sym_EQ_GT,
+  [3651] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(573), 1,
+      anon_sym_EQ_GT,
+  [3658] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(575), 1,
+      anon_sym_LBRACE,
+  [3665] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(577), 1,
       anon_sym_EQ_GT,
-  [1749] = 1,
+  [3672] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(452), 1,
+    ACTIONS(579), 1,
+      anon_sym_LPAREN,
+  [3679] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(581), 1,
       anon_sym_EQ_GT,
-  [1753] = 1,
+  [3686] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(454), 1,
+    ACTIONS(583), 1,
+      anon_sym_LPAREN,
+  [3693] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(585), 1,
+      anon_sym_LPAREN,
+  [3700] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(587), 1,
       anon_sym_COLON,
-  [1757] = 1,
+  [3707] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(404), 1,
+    ACTIONS(589), 1,
       anon_sym_LPAREN,
-  [1761] = 1,
+  [3714] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(456), 1,
+    ACTIONS(591), 1,
+      anon_sym_SQUOTE,
+  [3721] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(593), 1,
       anon_sym_LPAREN,
-  [1765] = 1,
+  [3728] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(458), 1,
+    ACTIONS(595), 1,
-      anon_sym_RBRACE,
+      sym_definition_name,
-  [1769] = 1,
+  [3735] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(460), 1,
+    ACTIONS(597), 1,
-      anon_sym_RBRACE,
+      sym_definition_name,
-  [1773] = 1,
+  [3742] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(462), 1,
+    ACTIONS(599), 1,
       anon_sym_EQ_GT,
-  [1777] = 1,
+  [3749] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(464), 1,
+    ACTIONS(601), 1,
-      anon_sym_RBRACE,
+      aux_sym_url_token1,
-  [1781] = 1,
+  [3756] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(178), 1,
+    ACTIONS(603), 1,
       anon_sym_SQUOTE,
-  [1785] = 1,
+  [3763] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(466), 1,
+    ACTIONS(605), 1,
-      anon_sym_RBRACE,
+      sym_definition_name,
-  [1789] = 1,
+  [3770] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(468), 1,
+    ACTIONS(607), 1,
+      anon_sym_SQUOTE,
+  [3777] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(609), 1,
       anon_sym_LPAREN,
-  [1793] = 1,
+  [3784] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(470), 1,
+    ACTIONS(611), 1,
+      anon_sym_EQ_GT,
+  [3791] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(613), 1,
       anon_sym_LPAREN,
-  [1797] = 1,
+  [3798] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(472), 1,
+    ACTIONS(615), 1,
       anon_sym_EQ_GT,
-  [1801] = 1,
-    ACTIONS(474), 1,
-      sym_definition_name,
-  [1805] = 1,
+  [3805] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(476), 1,
+    ACTIONS(617), 1,
+      anon_sym_LPAREN,
+  [3812] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(619), 1,
       anon_sym_EQ_GT,
-  [1809] = 1,
+  [3819] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(478), 1,
+    ACTIONS(621), 1,
-      anon_sym_COLON,
+      aux_sym__uni_character_literal_token1,
-  [1813] = 1,
+  [3826] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(480), 1,
+    ACTIONS(623), 1,
       anon_sym_LBRACE,
-  [1817] = 1,
+  [3833] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(482), 1,
+    ACTIONS(625), 1,
-      anon_sym_LPAREN,
+      anon_sym_RBRACE,
-  [1821] = 1,
+  [3840] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(484), 1,
+    ACTIONS(627), 1,
-      anon_sym_LPAREN,
-  [1825] = 1,
-    ACTIONS(486), 1,
       sym_definition_name,
-  [1829] = 1,
+  [3847] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(488), 1,
+    ACTIONS(629), 1,
       sym_definition_name,
-  [1833] = 1,
+  [3854] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(490), 1,
+    ACTIONS(631), 1,
       sym_definition_name,
-  [1837] = 1,
+  [3861] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(492), 1,
+    ACTIONS(633), 1,
-      anon_sym_LPAREN,
+      anon_sym_EQ_GT,
-  [1841] = 1,
+  [3868] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(494), 1,
+    ACTIONS(635), 1,
       ts_builtin_sym_end,
-  [1845] = 1,
+  [3875] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(496), 1,
+    ACTIONS(637), 1,
       aux_sym__uni_character_literal_token1,
-  [1849] = 1,
+  [3882] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
-    ACTIONS(498), 1,
+    ACTIONS(639), 1,
-      anon_sym_RBRACE,
+      anon_sym_EQ_GT,
 };
 static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(2)] = 0,
-  [SMALL_STATE(3)] = 40,
-  [SMALL_STATE(4)] = 72,
-  [SMALL_STATE(5)] = 104,
-  [SMALL_STATE(6)] = 144,
-  [SMALL_STATE(7)] = 177,
-  [SMALL_STATE(8)] = 210,
-  [SMALL_STATE(9)] = 243,
-  [SMALL_STATE(10)] = 257,
-  [SMALL_STATE(11)] = 282,
-  [SMALL_STATE(12)] = 307,
-  [SMALL_STATE(13)] = 332,
-  [SMALL_STATE(14)] = 348,
-  [SMALL_STATE(15)] = 364,
-  [SMALL_STATE(16)] = 380,
-  [SMALL_STATE(17)] = 396,
-  [SMALL_STATE(18)] = 407,
-  [SMALL_STATE(19)] = 423,
-  [SMALL_STATE(20)] = 439,
-  [SMALL_STATE(21)] = 449,
-  [SMALL_STATE(22)] = 459,
-  [SMALL_STATE(23)] = 475,
-  [SMALL_STATE(24)] = 484,
-  [SMALL_STATE(25)] = 493,
-  [SMALL_STATE(26)] = 502,
-  [SMALL_STATE(27)] = 511,
-  [SMALL_STATE(28)] = 520,
-  [SMALL_STATE(29)] = 529,
-  [SMALL_STATE(30)] = 538,
-  [SMALL_STATE(31)] = 547,
-  [SMALL_STATE(32)] = 556,
-  [SMALL_STATE(33)] = 565,
-  [SMALL_STATE(34)] = 574,
-  [SMALL_STATE(35)] = 583,
-  [SMALL_STATE(36)] = 592,
-  [SMALL_STATE(37)] = 601,
-  [SMALL_STATE(38)] = 610,
-  [SMALL_STATE(39)] = 619,
-  [SMALL_STATE(40)] = 628,
-  [SMALL_STATE(41)] = 637,
-  [SMALL_STATE(42)] = 646,
-  [SMALL_STATE(43)] = 655,
-  [SMALL_STATE(44)] = 664,
-  [SMALL_STATE(45)] = 673,
-  [SMALL_STATE(46)] = 682,
-  [SMALL_STATE(47)] = 691,
-  [SMALL_STATE(48)] = 700,
-  [SMALL_STATE(49)] = 709,
-  [SMALL_STATE(50)] = 719,
-  [SMALL_STATE(51)] = 733,
-  [SMALL_STATE(52)] = 743,
-  [SMALL_STATE(53)] = 753,
-  [SMALL_STATE(54)] = 769,
-  [SMALL_STATE(55)] = 783,
-  [SMALL_STATE(56)] = 797,
-  [SMALL_STATE(57)] = 807,
-  [SMALL_STATE(58)] = 814,
-  [SMALL_STATE(59)] = 825,
-  [SMALL_STATE(60)] = 836,
-  [SMALL_STATE(61)] = 847,
-  [SMALL_STATE(62)] = 858,
-  [SMALL_STATE(63)] = 869,
-  [SMALL_STATE(64)] = 880,
-  [SMALL_STATE(65)] = 889,
-  [SMALL_STATE(66)] = 896,
-  [SMALL_STATE(67)] = 906,
-  [SMALL_STATE(68)] = 916,
-  [SMALL_STATE(69)] = 926,
-  [SMALL_STATE(70)] = 936,
-  [SMALL_STATE(71)] = 946,
-  [SMALL_STATE(72)] = 956,
-  [SMALL_STATE(73)] = 966,
-  [SMALL_STATE(74)] = 976,
-  [SMALL_STATE(75)] = 986,
-  [SMALL_STATE(76)] = 996,
-  [SMALL_STATE(77)] = 1006,
-  [SMALL_STATE(78)] = 1016,
-  [SMALL_STATE(79)] = 1026,
-  [SMALL_STATE(80)] = 1036,
-  [SMALL_STATE(81)] = 1046,
-  [SMALL_STATE(82)] = 1056,
-  [SMALL_STATE(83)] = 1066,
-  [SMALL_STATE(84)] = 1076,
-  [SMALL_STATE(85)] = 1086,
-  [SMALL_STATE(86)] = 1096,
-  [SMALL_STATE(87)] = 1106,
-  [SMALL_STATE(88)] = 1116,
-  [SMALL_STATE(89)] = 1126,
-  [SMALL_STATE(90)] = 1136,
-  [SMALL_STATE(91)] = 1146,
-  [SMALL_STATE(92)] = 1156,
-  [SMALL_STATE(93)] = 1166,
-  [SMALL_STATE(94)] = 1176,
-  [SMALL_STATE(95)] = 1186,
-  [SMALL_STATE(96)] = 1196,
-  [SMALL_STATE(97)] = 1206,
-  [SMALL_STATE(98)] = 1216,
-  [SMALL_STATE(99)] = 1226,
-  [SMALL_STATE(100)] = 1236,
-  [SMALL_STATE(101)] = 1246,
-  [SMALL_STATE(102)] = 1256,
-  [SMALL_STATE(103)] = 1266,
-  [SMALL_STATE(104)] = 1276,
-  [SMALL_STATE(105)] = 1286,
-  [SMALL_STATE(106)] = 1296,
-  [SMALL_STATE(107)] = 1306,
-  [SMALL_STATE(108)] = 1316,
-  [SMALL_STATE(109)] = 1326,
-  [SMALL_STATE(110)] = 1336,
-  [SMALL_STATE(111)] = 1342,
-  [SMALL_STATE(112)] = 1352,
-  [SMALL_STATE(113)] = 1362,
-  [SMALL_STATE(114)] = 1372,
-  [SMALL_STATE(115)] = 1382,
-  [SMALL_STATE(116)] = 1392,
-  [SMALL_STATE(117)] = 1402,
-  [SMALL_STATE(118)] = 1408,
-  [SMALL_STATE(119)] = 1418,
-  [SMALL_STATE(120)] = 1428,
-  [SMALL_STATE(121)] = 1438,
-  [SMALL_STATE(122)] = 1448,
-  [SMALL_STATE(123)] = 1453,
-  [SMALL_STATE(124)] = 1460,
-  [SMALL_STATE(125)] = 1467,
-  [SMALL_STATE(126)] = 1474,
-  [SMALL_STATE(127)] = 1481,
-  [SMALL_STATE(128)] = 1486,
-  [SMALL_STATE(129)] = 1491,
-  [SMALL_STATE(130)] = 1496,
-  [SMALL_STATE(131)] = 1503,
-  [SMALL_STATE(132)] = 1510,
-  [SMALL_STATE(133)] = 1517,
-  [SMALL_STATE(134)] = 1524,
-  [SMALL_STATE(135)] = 1529,
-  [SMALL_STATE(136)] = 1536,
-  [SMALL_STATE(137)] = 1541,
-  [SMALL_STATE(138)] = 1546,
-  [SMALL_STATE(139)] = 1553,
-  [SMALL_STATE(140)] = 1560,
-  [SMALL_STATE(141)] = 1567,
-  [SMALL_STATE(142)] = 1574,
-  [SMALL_STATE(143)] = 1581,
-  [SMALL_STATE(144)] = 1588,
-  [SMALL_STATE(145)] = 1593,
-  [SMALL_STATE(146)] = 1598,
-  [SMALL_STATE(147)] = 1603,
-  [SMALL_STATE(148)] = 1608,
-  [SMALL_STATE(149)] = 1613,
-  [SMALL_STATE(150)] = 1618,
-  [SMALL_STATE(151)] = 1625,
-  [SMALL_STATE(152)] = 1632,
-  [SMALL_STATE(153)] = 1639,
-  [SMALL_STATE(154)] = 1644,
-  [SMALL_STATE(155)] = 1649,
-  [SMALL_STATE(156)] = 1656,
-  [SMALL_STATE(157)] = 1663,
-  [SMALL_STATE(158)] = 1668,
-  [SMALL_STATE(159)] = 1675,
-  [SMALL_STATE(160)] = 1680,
-  [SMALL_STATE(161)] = 1685,
-  [SMALL_STATE(162)] = 1689,
-  [SMALL_STATE(163)] = 1693,
-  [SMALL_STATE(164)] = 1697,
-  [SMALL_STATE(165)] = 1701,
-  [SMALL_STATE(166)] = 1705,
-  [SMALL_STATE(167)] = 1709,
-  [SMALL_STATE(168)] = 1713,
-  [SMALL_STATE(169)] = 1717,
-  [SMALL_STATE(170)] = 1721,
-  [SMALL_STATE(171)] = 1725,
-  [SMALL_STATE(172)] = 1729,
-  [SMALL_STATE(173)] = 1733,
-  [SMALL_STATE(174)] = 1737,
-  [SMALL_STATE(175)] = 1741,
-  [SMALL_STATE(176)] = 1745,
-  [SMALL_STATE(177)] = 1749,
-  [SMALL_STATE(178)] = 1753,
-  [SMALL_STATE(179)] = 1757,
-  [SMALL_STATE(180)] = 1761,
-  [SMALL_STATE(181)] = 1765,
-  [SMALL_STATE(182)] = 1769,
-  [SMALL_STATE(183)] = 1773,
-  [SMALL_STATE(184)] = 1777,
-  [SMALL_STATE(185)] = 1781,
-  [SMALL_STATE(186)] = 1785,
-  [SMALL_STATE(187)] = 1789,
-  [SMALL_STATE(188)] = 1793,
-  [SMALL_STATE(189)] = 1797,
-  [SMALL_STATE(190)] = 1801,
-  [SMALL_STATE(191)] = 1805,
-  [SMALL_STATE(192)] = 1809,
-  [SMALL_STATE(193)] = 1813,
-  [SMALL_STATE(194)] = 1817,
-  [SMALL_STATE(195)] = 1821,
-  [SMALL_STATE(196)] = 1825,
-  [SMALL_STATE(197)] = 1829,
-  [SMALL_STATE(198)] = 1833,
-  [SMALL_STATE(199)] = 1837,
-  [SMALL_STATE(200)] = 1841,
-  [SMALL_STATE(201)] = 1845,
-  [SMALL_STATE(202)] = 1849,
+  [SMALL_STATE(3)] = 38,
+  [SMALL_STATE(4)] = 81,
+  [SMALL_STATE(5)] = 116,
+  [SMALL_STATE(6)] = 151,
+  [SMALL_STATE(7)] = 194,
+  [SMALL_STATE(8)] = 230,
+  [SMALL_STATE(9)] = 266,
+  [SMALL_STATE(10)] = 302,
+  [SMALL_STATE(11)] = 320,
+  [SMALL_STATE(12)] = 348,
+  [SMALL_STATE(13)] = 376,
+  [SMALL_STATE(14)] = 404,
+  [SMALL_STATE(15)] = 423,
+  [SMALL_STATE(16)] = 442,
+  [SMALL_STATE(17)] = 461,
+  [SMALL_STATE(18)] = 480,
+  [SMALL_STATE(19)] = 494,
+  [SMALL_STATE(20)] = 507,
+  [SMALL_STATE(21)] = 520,
+  [SMALL_STATE(22)] = 539,
+  [SMALL_STATE(23)] = 558,
+  [SMALL_STATE(24)] = 577,
+  [SMALL_STATE(25)] = 589,
+  [SMALL_STATE(26)] = 601,
+  [SMALL_STATE(27)] = 613,
+  [SMALL_STATE(28)] = 625,
+  [SMALL_STATE(29)] = 637,
+  [SMALL_STATE(30)] = 649,
+  [SMALL_STATE(31)] = 661,
+  [SMALL_STATE(32)] = 673,
+  [SMALL_STATE(33)] = 685,
+  [SMALL_STATE(34)] = 697,
+  [SMALL_STATE(35)] = 709,
+  [SMALL_STATE(36)] = 721,
+  [SMALL_STATE(37)] = 733,
+  [SMALL_STATE(38)] = 745,
+  [SMALL_STATE(39)] = 757,
+  [SMALL_STATE(40)] = 769,
+  [SMALL_STATE(41)] = 781,
+  [SMALL_STATE(42)] = 793,
+  [SMALL_STATE(43)] = 805,
+  [SMALL_STATE(44)] = 817,
+  [SMALL_STATE(45)] = 829,
+  [SMALL_STATE(46)] = 841,
+  [SMALL_STATE(47)] = 853,
+  [SMALL_STATE(48)] = 865,
+  [SMALL_STATE(49)] = 877,
+  [SMALL_STATE(50)] = 889,
+  [SMALL_STATE(51)] = 901,
+  [SMALL_STATE(52)] = 913,
+  [SMALL_STATE(53)] = 925,
+  [SMALL_STATE(54)] = 937,
+  [SMALL_STATE(55)] = 949,
+  [SMALL_STATE(56)] = 961,
+  [SMALL_STATE(57)] = 973,
+  [SMALL_STATE(58)] = 985,
+  [SMALL_STATE(59)] = 997,
+  [SMALL_STATE(60)] = 1009,
+  [SMALL_STATE(61)] = 1021,
+  [SMALL_STATE(62)] = 1033,
+  [SMALL_STATE(63)] = 1045,
+  [SMALL_STATE(64)] = 1057,
+  [SMALL_STATE(65)] = 1069,
+  [SMALL_STATE(66)] = 1081,
+  [SMALL_STATE(67)] = 1093,
+  [SMALL_STATE(68)] = 1105,
+  [SMALL_STATE(69)] = 1117,
+  [SMALL_STATE(70)] = 1129,
+  [SMALL_STATE(71)] = 1141,
+  [SMALL_STATE(72)] = 1153,
+  [SMALL_STATE(73)] = 1165,
+  [SMALL_STATE(74)] = 1177,
+  [SMALL_STATE(75)] = 1189,
+  [SMALL_STATE(76)] = 1201,
+  [SMALL_STATE(77)] = 1213,
+  [SMALL_STATE(78)] = 1225,
+  [SMALL_STATE(79)] = 1237,
+  [SMALL_STATE(80)] = 1249,
+  [SMALL_STATE(81)] = 1261,
+  [SMALL_STATE(82)] = 1273,
+  [SMALL_STATE(83)] = 1285,
+  [SMALL_STATE(84)] = 1297,
+  [SMALL_STATE(85)] = 1309,
+  [SMALL_STATE(86)] = 1321,
+  [SMALL_STATE(87)] = 1332,
+  [SMALL_STATE(88)] = 1343,
+  [SMALL_STATE(89)] = 1354,
+  [SMALL_STATE(90)] = 1365,
+  [SMALL_STATE(91)] = 1382,
+  [SMALL_STATE(92)] = 1399,
+  [SMALL_STATE(93)] = 1418,
+  [SMALL_STATE(94)] = 1433,
+  [SMALL_STATE(95)] = 1450,
+  [SMALL_STATE(96)] = 1469,
+  [SMALL_STATE(97)] = 1486,
+  [SMALL_STATE(98)] = 1505,
+  [SMALL_STATE(99)] = 1521,
+  [SMALL_STATE(100)] = 1537,
+  [SMALL_STATE(101)] = 1553,
+  [SMALL_STATE(102)] = 1567,
+  [SMALL_STATE(103)] = 1581,
+  [SMALL_STATE(104)] = 1597,
+  [SMALL_STATE(105)] = 1607,
+  [SMALL_STATE(106)] = 1621,
+  [SMALL_STATE(107)] = 1637,
+  [SMALL_STATE(108)] = 1653,
+  [SMALL_STATE(109)] = 1669,
+  [SMALL_STATE(110)] = 1685,
+  [SMALL_STATE(111)] = 1701,
+  [SMALL_STATE(112)] = 1717,
+  [SMALL_STATE(113)] = 1733,
+  [SMALL_STATE(114)] = 1749,
+  [SMALL_STATE(115)] = 1765,
+  [SMALL_STATE(116)] = 1781,
+  [SMALL_STATE(117)] = 1797,
+  [SMALL_STATE(118)] = 1813,
+  [SMALL_STATE(119)] = 1829,
+  [SMALL_STATE(120)] = 1845,
+  [SMALL_STATE(121)] = 1861,
+  [SMALL_STATE(122)] = 1877,
+  [SMALL_STATE(123)] = 1893,
+  [SMALL_STATE(124)] = 1909,
+  [SMALL_STATE(125)] = 1923,
+  [SMALL_STATE(126)] = 1939,
+  [SMALL_STATE(127)] = 1955,
+  [SMALL_STATE(128)] = 1971,
+  [SMALL_STATE(129)] = 1987,
+  [SMALL_STATE(130)] = 2003,
+  [SMALL_STATE(131)] = 2019,
+  [SMALL_STATE(132)] = 2035,
+  [SMALL_STATE(133)] = 2051,
+  [SMALL_STATE(134)] = 2067,
+  [SMALL_STATE(135)] = 2079,
+  [SMALL_STATE(136)] = 2095,
+  [SMALL_STATE(137)] = 2111,
+  [SMALL_STATE(138)] = 2127,
+  [SMALL_STATE(139)] = 2143,
+  [SMALL_STATE(140)] = 2159,
+  [SMALL_STATE(141)] = 2175,
+  [SMALL_STATE(142)] = 2191,
+  [SMALL_STATE(143)] = 2201,
+  [SMALL_STATE(144)] = 2214,
+  [SMALL_STATE(145)] = 2227,
+  [SMALL_STATE(146)] = 2240,
+  [SMALL_STATE(147)] = 2253,
+  [SMALL_STATE(148)] = 2266,
+  [SMALL_STATE(149)] = 2279,
+  [SMALL_STATE(150)] = 2292,
+  [SMALL_STATE(151)] = 2305,
+  [SMALL_STATE(152)] = 2318,
+  [SMALL_STATE(153)] = 2331,
+  [SMALL_STATE(154)] = 2344,
+  [SMALL_STATE(155)] = 2357,
+  [SMALL_STATE(156)] = 2370,
+  [SMALL_STATE(157)] = 2383,
+  [SMALL_STATE(158)] = 2396,
+  [SMALL_STATE(159)] = 2409,
+  [SMALL_STATE(160)] = 2422,
+  [SMALL_STATE(161)] = 2435,
+  [SMALL_STATE(162)] = 2448,
+  [SMALL_STATE(163)] = 2461,
+  [SMALL_STATE(164)] = 2474,
+  [SMALL_STATE(165)] = 2483,
+  [SMALL_STATE(166)] = 2496,
+  [SMALL_STATE(167)] = 2509,
+  [SMALL_STATE(168)] = 2522,
+  [SMALL_STATE(169)] = 2535,
+  [SMALL_STATE(170)] = 2548,
+  [SMALL_STATE(171)] = 2561,
+  [SMALL_STATE(172)] = 2574,
+  [SMALL_STATE(173)] = 2587,
+  [SMALL_STATE(174)] = 2600,
+  [SMALL_STATE(175)] = 2613,
+  [SMALL_STATE(176)] = 2626,
+  [SMALL_STATE(177)] = 2639,
+  [SMALL_STATE(178)] = 2652,
+  [SMALL_STATE(179)] = 2665,
+  [SMALL_STATE(180)] = 2678,
+  [SMALL_STATE(181)] = 2691,
+  [SMALL_STATE(182)] = 2704,
+  [SMALL_STATE(183)] = 2717,
+  [SMALL_STATE(184)] = 2730,
+  [SMALL_STATE(185)] = 2739,
+  [SMALL_STATE(186)] = 2752,
+  [SMALL_STATE(187)] = 2765,
+  [SMALL_STATE(188)] = 2778,
+  [SMALL_STATE(189)] = 2787,
+  [SMALL_STATE(190)] = 2800,
+  [SMALL_STATE(191)] = 2813,
+  [SMALL_STATE(192)] = 2826,
+  [SMALL_STATE(193)] = 2839,
+  [SMALL_STATE(194)] = 2852,
+  [SMALL_STATE(195)] = 2865,
+  [SMALL_STATE(196)] = 2878,
+  [SMALL_STATE(197)] = 2891,
+  [SMALL_STATE(198)] = 2904,
+  [SMALL_STATE(199)] = 2917,
+  [SMALL_STATE(200)] = 2930,
+  [SMALL_STATE(201)] = 2943,
+  [SMALL_STATE(202)] = 2956,
+  [SMALL_STATE(203)] = 2965,
+  [SMALL_STATE(204)] = 2978,
+  [SMALL_STATE(205)] = 2991,
+  [SMALL_STATE(206)] = 3004,
+  [SMALL_STATE(207)] = 3017,
+  [SMALL_STATE(208)] = 3030,
+  [SMALL_STATE(209)] = 3043,
+  [SMALL_STATE(210)] = 3056,
+  [SMALL_STATE(211)] = 3069,
+  [SMALL_STATE(212)] = 3082,
+  [SMALL_STATE(213)] = 3095,
+  [SMALL_STATE(214)] = 3108,
+  [SMALL_STATE(215)] = 3121,
+  [SMALL_STATE(216)] = 3134,
+  [SMALL_STATE(217)] = 3147,
+  [SMALL_STATE(218)] = 3156,
+  [SMALL_STATE(219)] = 3166,
+  [SMALL_STATE(220)] = 3176,
+  [SMALL_STATE(221)] = 3186,
+  [SMALL_STATE(222)] = 3196,
+  [SMALL_STATE(223)] = 3206,
+  [SMALL_STATE(224)] = 3214,
+  [SMALL_STATE(225)] = 3224,
+  [SMALL_STATE(226)] = 3232,
+  [SMALL_STATE(227)] = 3240,
+  [SMALL_STATE(228)] = 3250,
+  [SMALL_STATE(229)] = 3258,
+  [SMALL_STATE(230)] = 3266,
+  [SMALL_STATE(231)] = 3274,
+  [SMALL_STATE(232)] = 3284,
+  [SMALL_STATE(233)] = 3294,
+  [SMALL_STATE(234)] = 3304,
+  [SMALL_STATE(235)] = 3312,
+  [SMALL_STATE(236)] = 3320,
+  [SMALL_STATE(237)] = 3330,
+  [SMALL_STATE(238)] = 3340,
+  [SMALL_STATE(239)] = 3348,
+  [SMALL_STATE(240)] = 3356,
+  [SMALL_STATE(241)] = 3366,
+  [SMALL_STATE(242)] = 3374,
+  [SMALL_STATE(243)] = 3384,
+  [SMALL_STATE(244)] = 3394,
+  [SMALL_STATE(245)] = 3404,
+  [SMALL_STATE(246)] = 3412,
+  [SMALL_STATE(247)] = 3422,
+  [SMALL_STATE(248)] = 3430,
+  [SMALL_STATE(249)] = 3440,
+  [SMALL_STATE(250)] = 3448,
+  [SMALL_STATE(251)] = 3456,
+  [SMALL_STATE(252)] = 3464,
+  [SMALL_STATE(253)] = 3474,
+  [SMALL_STATE(254)] = 3484,
+  [SMALL_STATE(255)] = 3492,
+  [SMALL_STATE(256)] = 3502,
+  [SMALL_STATE(257)] = 3510,
+  [SMALL_STATE(258)] = 3520,
+  [SMALL_STATE(259)] = 3528,
+  [SMALL_STATE(260)] = 3538,
+  [SMALL_STATE(261)] = 3546,
+  [SMALL_STATE(262)] = 3556,
+  [SMALL_STATE(263)] = 3566,
+  [SMALL_STATE(264)] = 3574,
+  [SMALL_STATE(265)] = 3581,
+  [SMALL_STATE(266)] = 3588,
+  [SMALL_STATE(267)] = 3595,
+  [SMALL_STATE(268)] = 3602,
+  [SMALL_STATE(269)] = 3609,
+  [SMALL_STATE(270)] = 3616,
+  [SMALL_STATE(271)] = 3623,
+  [SMALL_STATE(272)] = 3630,
+  [SMALL_STATE(273)] = 3637,
+  [SMALL_STATE(274)] = 3644,
+  [SMALL_STATE(275)] = 3651,
+  [SMALL_STATE(276)] = 3658,
+  [SMALL_STATE(277)] = 3665,
+  [SMALL_STATE(278)] = 3672,
+  [SMALL_STATE(279)] = 3679,
+  [SMALL_STATE(280)] = 3686,
+  [SMALL_STATE(281)] = 3693,
+  [SMALL_STATE(282)] = 3700,
+  [SMALL_STATE(283)] = 3707,
+  [SMALL_STATE(284)] = 3714,
+  [SMALL_STATE(285)] = 3721,
+  [SMALL_STATE(286)] = 3728,
+  [SMALL_STATE(287)] = 3735,
+  [SMALL_STATE(288)] = 3742,
+  [SMALL_STATE(289)] = 3749,
+  [SMALL_STATE(290)] = 3756,
+  [SMALL_STATE(291)] = 3763,
+  [SMALL_STATE(292)] = 3770,
+  [SMALL_STATE(293)] = 3777,
+  [SMALL_STATE(294)] = 3784,
+  [SMALL_STATE(295)] = 3791,
+  [SMALL_STATE(296)] = 3798,
+  [SMALL_STATE(297)] = 3805,
+  [SMALL_STATE(298)] = 3812,
+  [SMALL_STATE(299)] = 3819,
+  [SMALL_STATE(300)] = 3826,
+  [SMALL_STATE(301)] = 3833,
+  [SMALL_STATE(302)] = 3840,
+  [SMALL_STATE(303)] = 3847,
+  [SMALL_STATE(304)] = 3854,
+  [SMALL_STATE(305)] = 3861,
+  [SMALL_STATE(306)] = 3868,
+  [SMALL_STATE(307)] = 3875,
+  [SMALL_STATE(308)] = 3882,
 };
 static const TSParseActionEntry ts_parse_actions[] = {
   [0] = {.entry = {.count = 0, .reusable = false}},
   [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(),
-  [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
-  [5] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 3),
-  [7] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
-  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198),
-  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(197),
-  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(196),
-  [15] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
-  [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(190),
-  [19] = {.entry = {.count = 1, .reusable = true}}, SHIFT(148),
-  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(97),
-  [23] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
-  [25] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
-  [27] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
-  [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
-  [31] = {.entry = {.count = 1, .reusable = false}}, SHIFT(128),
-  [33] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
-  [35] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 2),
-  [37] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2),
-  [39] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2), SHIFT_REPEAT(198),
-  [42] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2), SHIFT_REPEAT(197),
-  [45] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2), SHIFT_REPEAT(196),
-  [48] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2), SHIFT_REPEAT(70),
-  [51] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2), SHIFT_REPEAT(190),
-  [54] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 4),
-  [56] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_identifier, 1),
-  [58] = {.entry = {.count = 1, .reusable = false}}, SHIFT(201),
-  [60] = {.entry = {.count = 1, .reusable = false}}, SHIFT(51),
-  [62] = {.entry = {.count = 1, .reusable = false}}, SHIFT(154),
-  [64] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
-  [66] = {.entry = {.count = 1, .reusable = false}}, SHIFT(152),
-  [68] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_line_string_literal_repeat1, 2), SHIFT_REPEAT(201),
-  [71] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_line_string_literal_repeat1, 2), SHIFT_REPEAT(51),
-  [74] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_line_string_literal_repeat1, 2),
-  [76] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_line_string_literal_repeat1, 2), SHIFT_REPEAT(11),
-  [79] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_line_string_literal_repeat1, 2), SHIFT_REPEAT(152),
-  [82] = {.entry = {.count = 1, .reusable = false}}, SHIFT(134),
-  [84] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
-  [86] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_url_repeat1, 2),
-  [88] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_url_repeat1, 2), SHIFT_REPEAT(172),
-  [91] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_url, 2),
-  [93] = {.entry = {.count = 1, .reusable = true}}, SHIFT(172),
-  [95] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_url, 1),
-  [97] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2),
-  [99] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(126),
-  [102] = {.entry = {.count = 1, .reusable = false}}, SHIFT(22),
-  [104] = {.entry = {.count = 1, .reusable = false}}, SHIFT(149),
-  [106] = {.entry = {.count = 1, .reusable = false}}, SHIFT(125),
-  [108] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_multi_line_string_literal_repeat1, 2), SHIFT_REPEAT(19),
-  [111] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_multi_line_string_literal_repeat1, 2),
-  [113] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_multi_line_string_literal_repeat1, 2), SHIFT_REPEAT(125),
-  [116] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_package, 1),
-  [118] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_statement, 2),
-  [120] = {.entry = {.count = 1, .reusable = false}}, SHIFT(19),
-  [122] = {.entry = {.count = 1, .reusable = false}}, SHIFT(129),
-  [124] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 19),
-  [126] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 8, .production_id = 14),
-  [128] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 10, .production_id = 21),
-  [130] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_definition, 10, .production_id = 20),
-  [132] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 2),
-  [134] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_definition, 6, .production_id = 3),
-  [136] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_definition, 6, .production_id = 2),
-  [138] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_definition, 5, .production_id = 1),
-  [140] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, .production_id = 1),
-  [142] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 3),
-  [144] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 18),
-  [146] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 17),
-  [148] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 5),
-  [150] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_definition, 9, .production_id = 16),
-  [152] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_definition, 9, .production_id = 15),
-  [154] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definitions, 1),
-  [156] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 11, .production_id = 24),
-  [158] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, .production_id = 7),
-  [160] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_definition, 7, .production_id = 7),
-  [162] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 7, .production_id = 8),
-  [164] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, .production_id = 9),
-  [166] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 10, .production_id = 22),
-  [168] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 8, .production_id = 13),
-  [170] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, .production_id = 10),
-  [172] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 8, .production_id = 12),
-  [174] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_definition, 8, .production_id = 11),
-  [176] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__uni_character_literal, 2),
-  [178] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__uni_character_literal, 2),
-  [180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(138),
-  [182] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
-  [184] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_character_escape_seq, 1),
-  [186] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_character_escape_seq, 1),
-  [188] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_identifier, 1),
-  [190] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
-  [192] = {.entry = {.count = 1, .reusable = false}}, SHIFT(168),
-  [194] = {.entry = {.count = 1, .reusable = false}}, SHIFT(169),
-  [196] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__interpolation, 2, .production_id = 23),
-  [198] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__interpolation, 2, .production_id = 23),
-  [200] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 5, .production_id = 8),
-  [202] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
-  [204] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_fun_definition_repeat2, 2), SHIFT_REPEAT(124),
-  [207] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_fun_definition_repeat2, 2),
-  [209] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 6, .production_id = 13),
-  [211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
-  [213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 7, .production_id = 19),
-  [215] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_class_definition_repeat1, 2),
-  [217] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_definition_repeat1, 2), SHIFT_REPEAT(190),
-  [220] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 1),
-  [222] = {.entry = {.count = 1, .reusable = true}}, SHIFT(117),
-  [224] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
-  [226] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30),
-  [228] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
-  [230] = {.entry = {.count = 1, .reusable = true}}, SHIFT(184),
-  [232] = {.entry = {.count = 1, .reusable = true}}, SHIFT(150),
-  [234] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
-  [236] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_fun_field, 9, .production_id = 24), SHIFT(124),
-  [239] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 9, .production_id = 24),
-  [241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9),
-  [243] = {.entry = {.count = 1, .reusable = true}}, SHIFT(132),
-  [245] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
-  [247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
-  [249] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_enum_field_repeat1, 2), SHIFT_REPEAT(4),
-  [252] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_enum_field_repeat1, 2),
-  [254] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
-  [256] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
-  [258] = {.entry = {.count = 1, .reusable = true}}, SHIFT(158),
-  [260] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
-  [262] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
-  [264] = {.entry = {.count = 1, .reusable = true}}, SHIFT(173),
-  [266] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
-  [268] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_fun_field, 8, .production_id = 22), SHIFT(124),
-  [271] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 8, .production_id = 22),
-  [273] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_fun_field, 8, .production_id = 21), SHIFT(124),
-  [276] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 8, .production_id = 21),
-  [278] = {.entry = {.count = 1, .reusable = true}}, SHIFT(135),
-  [280] = {.entry = {.count = 1, .reusable = true}}, SHIFT(177),
-  [282] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
-  [284] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
-  [286] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
-  [288] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_fun_field, 7, .production_id = 18), SHIFT(124),
-  [291] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 7, .production_id = 18),
-  [293] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_fun_field, 7, .production_id = 17), SHIFT(124),
-  [296] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 7, .production_id = 17),
-  [298] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_definition_repeat2, 2), SHIFT_REPEAT(150),
-  [301] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_class_definition_repeat2, 2),
-  [303] = {.entry = {.count = 1, .reusable = true}}, SHIFT(181),
-  [305] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131),
-  [307] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
-  [309] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_trait_list_repeat1, 2), SHIFT_REPEAT(132),
-  [312] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_trait_list_repeat1, 2),
-  [314] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
-  [316] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
-  [318] = {.entry = {.count = 1, .reusable = true}}, SHIFT(192),
-  [320] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_enum_definition_repeat1, 2), SHIFT_REPEAT(131),
-  [323] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_enum_definition_repeat1, 2),
-  [325] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_trait_definition_repeat1, 2), SHIFT_REPEAT(55),
-  [328] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_trait_definition_repeat1, 2),
-  [330] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
-  [332] = {.entry = {.count = 1, .reusable = true}}, SHIFT(189),
-  [334] = {.entry = {.count = 1, .reusable = true}}, SHIFT(145),
-  [336] = {.entry = {.count = 1, .reusable = true}}, SHIFT(142),
-  [338] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
-  [340] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
-  [342] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_fun_field, 6, .production_id = 12), SHIFT(124),
-  [345] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 6, .production_id = 12),
-  [347] = {.entry = {.count = 1, .reusable = true}}, SHIFT(202),
-  [349] = {.entry = {.count = 1, .reusable = true}}, SHIFT(195),
-  [351] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_fun_definition_repeat1, 2), SHIFT_REPEAT(135),
-  [354] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_fun_definition_repeat1, 2),
-  [356] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
-  [358] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
-  [360] = {.entry = {.count = 1, .reusable = true}}, SHIFT(182),
-  [362] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
-  [364] = {.entry = {.count = 1, .reusable = true}}, SHIFT(191),
-  [366] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
-  [368] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
-  [370] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
-  [372] = {.entry = {.count = 1, .reusable = true}}, SHIFT(193),
-  [374] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
-  [376] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 2),
-  [378] = {.entry = {.count = 1, .reusable = true}}, SHIFT(176),
-  [380] = {.entry = {.count = 1, .reusable = true}}, SHIFT(183),
-  [382] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
-  [384] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
-  [386] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_param, 3, .production_id = 4),
-  [388] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
-  [390] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
-  [392] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_field, 5),
-  [394] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_multi_line_string_literal, 3),
-  [396] = {.entry = {.count = 1, .reusable = true}}, SHIFT(188),
-  [398] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_line_string_literal, 3),
-  [400] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_field, 1),
-  [402] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_character_literal, 3),
-  [404] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
-  [406] = {.entry = {.count = 1, .reusable = true}}, SHIFT(151),
-  [408] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_field, 4, .production_id = 6),
-  [410] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_field, 4),
-  [412] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_name, 2),
-  [414] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_boolean_literal, 1),
-  [416] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_multi_line_string_literal, 2),
-  [418] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
-  [420] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_line_string_literal, 2),
-  [422] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
-  [424] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
-  [426] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generic_list, 4),
-  [428] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
-  [430] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
-  [432] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
-  [434] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
-  [436] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
-  [438] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
-  [440] = {.entry = {.count = 1, .reusable = true}}, SHIFT(133),
-  [442] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
-  [444] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
-  [446] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
-  [448] = {.entry = {.count = 1, .reusable = true}}, SHIFT(178),
-  [450] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
-  [452] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
-  [454] = {.entry = {.count = 1, .reusable = true}}, SHIFT(143),
-  [456] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
-  [458] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
-  [460] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
-  [462] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102),
-  [464] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
-  [466] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
-  [468] = {.entry = {.count = 1, .reusable = true}}, SHIFT(140),
-  [470] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
-  [472] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
-  [474] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147),
-  [476] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
-  [478] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130),
-  [480] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
-  [482] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
-  [484] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generic_list, 3),
-  [486] = {.entry = {.count = 1, .reusable = true}}, SHIFT(180),
-  [488] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
-  [490] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
-  [492] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__extension, 3),
-  [494] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [496] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
-  [498] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT_EXTRA(),
+  [5] = {.entry = {.count = 1, .reusable = true}}, SHIFT(179),
+  [7] = {.entry = {.count = 1, .reusable = true}}, SHIFT(184),
+  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(256),
+  [11] = {.entry = {.count = 1, .reusable = false}}, SHIFT(186),
+  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
+  [15] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
+  [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
+  [19] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
+  [21] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 2),
+  [23] = {.entry = {.count = 1, .reusable = true}}, SHIFT(222),
+  [25] = {.entry = {.count = 1, .reusable = true}}, SHIFT(304),
+  [27] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
+  [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302),
+  [31] = {.entry = {.count = 1, .reusable = true}}, SHIFT(148),
+  [33] = {.entry = {.count = 1, .reusable = true}}, SHIFT(227),
+  [35] = {.entry = {.count = 1, .reusable = false}}, SHIFT(245),
+  [37] = {.entry = {.count = 1, .reusable = true}}, SHIFT(245),
+  [39] = {.entry = {.count = 1, .reusable = false}}, SHIFT(191),
+  [41] = {.entry = {.count = 1, .reusable = true}}, SHIFT(191),
+  [43] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 3),
+  [45] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 4),
+  [47] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2),
+  [49] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2), SHIFT_REPEAT(304),
+  [52] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2), SHIFT_REPEAT(303),
+  [55] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2), SHIFT_REPEAT(302),
+  [58] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2), SHIFT_REPEAT(148),
+  [61] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2), SHIFT_REPEAT(227),
+  [64] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_identifier, 1),
+  [66] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_line_string_literal_repeat1, 2), SHIFT_REPEAT(307),
+  [69] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_line_string_literal_repeat1, 2), SHIFT_REPEAT(89),
+  [72] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_line_string_literal_repeat1, 2),
+  [74] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_line_string_literal_repeat1, 2), SHIFT_REPEAT(11),
+  [77] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_line_string_literal_repeat1, 2), SHIFT_REPEAT(236),
+  [80] = {.entry = {.count = 1, .reusable = false}}, SHIFT_EXTRA(),
+  [82] = {.entry = {.count = 1, .reusable = false}}, SHIFT(307),
+  [84] = {.entry = {.count = 1, .reusable = false}}, SHIFT(89),
+  [86] = {.entry = {.count = 1, .reusable = false}}, SHIFT(234),
+  [88] = {.entry = {.count = 1, .reusable = false}}, SHIFT(13),
+  [90] = {.entry = {.count = 1, .reusable = false}}, SHIFT(236),
+  [92] = {.entry = {.count = 1, .reusable = false}}, SHIFT(230),
+  [94] = {.entry = {.count = 1, .reusable = false}}, SHIFT(11),
+  [96] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_url_repeat1, 2),
+  [98] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_url_repeat1, 2), SHIFT_REPEAT(289),
+  [101] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_url, 2),
+  [103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(289),
+  [105] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2),
+  [107] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(222),
+  [110] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_url, 1),
+  [112] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_package, 1),
+  [114] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_statement, 2),
+  [116] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_multi_line_string_literal_repeat1, 2), SHIFT_REPEAT(21),
+  [119] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_multi_line_string_literal_repeat1, 2),
+  [121] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_multi_line_string_literal_repeat1, 2), SHIFT_REPEAT(220),
+  [124] = {.entry = {.count = 1, .reusable = false}}, SHIFT(23),
+  [126] = {.entry = {.count = 1, .reusable = false}}, SHIFT(238),
+  [128] = {.entry = {.count = 1, .reusable = false}}, SHIFT(220),
+  [130] = {.entry = {.count = 1, .reusable = false}}, SHIFT(21),
+  [132] = {.entry = {.count = 1, .reusable = false}}, SHIFT(239),
+  [134] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 10, .production_id = 56),
+  [136] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, .production_id = 17),
+  [138] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_definitions, 1),
+  [140] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 6, .production_id = 5),
+  [142] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_definition, 6, .production_id = 4),
+  [144] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 11, .production_id = 65),
+  [146] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 11, .production_id = 64),
+  [148] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 11, .production_id = 63),
+  [150] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_definition, 6, .production_id = 2),
+  [152] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 10, .production_id = 60),
+  [154] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 4),
+  [156] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 3),
+  [158] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, .production_id = 10),
+  [160] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 10, .production_id = 59),
+  [162] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 10, .production_id = 58),
+  [164] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, .production_id = 11),
+  [166] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 10, .production_id = 57),
+  [168] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 8),
+  [170] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, .production_id = 12),
+  [172] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_definition, 7, .production_id = 11),
+  [174] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 10, .production_id = 55),
+  [176] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 10, .production_id = 54),
+  [178] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 10, .production_id = 53),
+  [180] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_definition, 10, .production_id = 52),
+  [182] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 6, .production_id = 2),
+  [184] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__block, 2),
+  [186] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 7, .production_id = 13),
+  [188] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 7, .production_id = 14),
+  [190] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 48),
+  [192] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 7, .production_id = 15),
+  [194] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, .production_id = 16),
+  [196] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 47),
+  [198] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 46),
+  [200] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 11, .production_id = 66),
+  [202] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 12, .production_id = 68),
+  [204] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 45),
+  [206] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 44),
+  [208] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 9, .production_id = 43),
+  [210] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 7, .production_id = 18),
+  [212] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 42),
+  [214] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 7, .production_id = 19),
+  [216] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 8, .production_id = 20),
+  [218] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 41),
+  [220] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 40),
+  [222] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_definition, 8, .production_id = 22),
+  [224] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 39),
+  [226] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 9, .production_id = 38),
+  [228] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 8, .production_id = 23),
+  [230] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_definition, 9, .production_id = 37),
+  [232] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_definition, 9, .production_id = 36),
+  [234] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 8, .production_id = 24),
+  [236] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 8, .production_id = 25),
+  [238] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 8, .production_id = 33),
+  [240] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 8, .production_id = 26),
+  [242] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_definition, 5, .production_id = 1),
+  [244] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 8, .production_id = 32),
+  [246] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 5, .production_id = 1),
+  [248] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 8, .production_id = 27),
+  [250] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 8, .production_id = 28),
+  [252] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_definition, 8, .production_id = 31),
+  [254] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 8, .production_id = 30),
+  [256] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_definition, 8, .production_id = 29),
+  [258] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_identifier, 1),
+  [260] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__uni_character_literal, 2),
+  [262] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__interpolation, 2, .production_id = 7),
+  [264] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_character_escape_seq, 1),
+  [266] = {.entry = {.count = 1, .reusable = true}}, SHIFT(291),
+  [268] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
+  [270] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
+  [272] = {.entry = {.count = 1, .reusable = true}}, SHIFT(273),
+  [274] = {.entry = {.count = 1, .reusable = true}}, SHIFT(232),
+  [276] = {.entry = {.count = 1, .reusable = true}}, SHIFT(287),
+  [278] = {.entry = {.count = 1, .reusable = true}}, SHIFT(233),
+  [280] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_class_definition_repeat1, 2),
+  [282] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_definition_repeat1, 2), SHIFT_REPEAT(227),
+  [285] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
+  [287] = {.entry = {.count = 1, .reusable = false}}, SHIFT(284),
+  [289] = {.entry = {.count = 1, .reusable = false}}, SHIFT(299),
+  [291] = {.entry = {.count = 1, .reusable = false}}, SHIFT(290),
+  [293] = {.entry = {.count = 1, .reusable = true}}, SHIFT(255),
+  [295] = {.entry = {.count = 1, .reusable = true}}, SHIFT(301),
+  [297] = {.entry = {.count = 1, .reusable = true}}, SHIFT(134),
+  [299] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 6, .production_id = 35),
+  [301] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_fun_definition_repeat2, 2), SHIFT_REPEAT(255),
+  [304] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_fun_definition_repeat2, 2),
+  [306] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 5, .production_id = 21),
+  [308] = {.entry = {.count = 1, .reusable = true}}, SHIFT(196),
+  [310] = {.entry = {.count = 1, .reusable = true}}, SHIFT(243),
+  [312] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 7, .production_id = 51),
+  [314] = {.entry = {.count = 1, .reusable = true}}, SHIFT(161),
+  [316] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 1),
+  [318] = {.entry = {.count = 1, .reusable = true}}, SHIFT(188),
+  [320] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
+  [322] = {.entry = {.count = 1, .reusable = true}}, SHIFT(264),
+  [324] = {.entry = {.count = 1, .reusable = true}}, SHIFT(298),
+  [326] = {.entry = {.count = 1, .reusable = true}}, SHIFT(219),
+  [328] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
+  [330] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
+  [332] = {.entry = {.count = 1, .reusable = true}}, SHIFT(266),
+  [334] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
+  [336] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
+  [338] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_fun_field, 9, .production_id = 67), SHIFT(255),
+  [341] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 9, .production_id = 67),
+  [343] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
+  [345] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_fun_definition_repeat1, 2), SHIFT_REPEAT(224),
+  [348] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_fun_definition_repeat1, 2),
+  [350] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
+  [352] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_fun_field, 8, .production_id = 62), SHIFT(255),
+  [355] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 8, .production_id = 62),
+  [357] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_trait_definition_repeat1, 2), SHIFT_REPEAT(91),
+  [360] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_trait_definition_repeat1, 2),
+  [362] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_fun_field, 8, .production_id = 61), SHIFT(255),
+  [365] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 8, .production_id = 61),
+  [367] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_generic_list_repeat1, 2), SHIFT_REPEAT(237),
+  [370] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_generic_list_repeat1, 2),
+  [372] = {.entry = {.count = 1, .reusable = true}}, SHIFT(261),
+  [374] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
+  [376] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
+  [378] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
+  [380] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
+  [382] = {.entry = {.count = 1, .reusable = true}}, SHIFT(228),
+  [384] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorator_name, 6),
+  [386] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decorator_name_repeat1, 2), SHIFT_REPEAT(4),
+  [389] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_decorator_name_repeat1, 2),
+  [391] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_fun_field, 7, .production_id = 50), SHIFT(255),
+  [394] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 7, .production_id = 50),
+  [396] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
+  [398] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
+  [400] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
+  [402] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_fun_field, 7, .production_id = 49), SHIFT(255),
+  [405] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 7, .production_id = 49),
+  [407] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_trait_list_repeat1, 2),
+  [409] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_trait_list_repeat1, 2), SHIFT_REPEAT(286),
+  [412] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
+  [414] = {.entry = {.count = 1, .reusable = true}}, SHIFT(288),
+  [416] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_list, 2),
+  [418] = {.entry = {.count = 1, .reusable = true}}, SHIFT(286),
+  [420] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
+  [422] = {.entry = {.count = 1, .reusable = true}}, SHIFT(237),
+  [424] = {.entry = {.count = 1, .reusable = true}}, SHIFT(235),
+  [426] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
+  [428] = {.entry = {.count = 1, .reusable = true}}, SHIFT(300),
+  [430] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
+  [432] = {.entry = {.count = 1, .reusable = true}}, SHIFT(305),
+  [434] = {.entry = {.count = 1, .reusable = true}}, SHIFT(265),
+  [436] = {.entry = {.count = 1, .reusable = true}}, SHIFT(308),
+  [438] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorator_name, 4),
+  [440] = {.entry = {.count = 1, .reusable = true}}, SHIFT(221),
+  [442] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
+  [444] = {.entry = {.count = 1, .reusable = true}}, SHIFT(202),
+  [446] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_definition_repeat2, 2), SHIFT_REPEAT(219),
+  [449] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_class_definition_repeat2, 2),
+  [451] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 2),
+  [453] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
+  [455] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_enum_definition_repeat1, 2), SHIFT_REPEAT(221),
+  [458] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_enum_definition_repeat1, 2),
+  [460] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247),
+  [462] = {.entry = {.count = 1, .reusable = true}}, SHIFT(272),
+  [464] = {.entry = {.count = 1, .reusable = true}}, SHIFT(274),
+  [466] = {.entry = {.count = 1, .reusable = true}}, SHIFT(246),
+  [468] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_fun_field, 6, .production_id = 34), SHIFT(255),
+  [471] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_fun_field, 6, .production_id = 34),
+  [473] = {.entry = {.count = 1, .reusable = true}}, SHIFT(275),
+  [475] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
+  [477] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_list, 3),
+  [479] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
+  [481] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
+  [483] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
+  [485] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorator_name, 5),
+  [487] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
+  [489] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
+  [491] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61),
+  [493] = {.entry = {.count = 1, .reusable = true}}, SHIFT(251),
+  [495] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [497] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
+  [499] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
+  [501] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
+  [503] = {.entry = {.count = 1, .reusable = true}}, SHIFT(279),
+  [505] = {.entry = {.count = 1, .reusable = true}}, SHIFT(276),
+  [507] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
+  [509] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
+  [511] = {.entry = {.count = 1, .reusable = true}}, SHIFT(277),
+  [513] = {.entry = {.count = 1, .reusable = true}}, SHIFT(296),
+  [515] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
+  [517] = {.entry = {.count = 1, .reusable = true}}, SHIFT(270),
+  [519] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
+  [521] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_param, 3, .production_id = 6),
+  [523] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_field, 5),
+  [525] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_character_literal, 3),
+  [527] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_line_string_literal, 3),
+  [529] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_line_string_literal, 2),
+  [531] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generic_list, 3),
+  [533] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
+  [535] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_multi_line_string_literal, 2),
+  [537] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_multi_line_string_literal, 3),
+  [539] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_field, 4),
+  [541] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_field, 4, .production_id = 9),
+  [543] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generic_list, 4),
+  [545] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_boolean_literal, 1),
+  [547] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__extension, 3),
+  [549] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trait_field, 1),
+  [551] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
+  [553] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
+  [555] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
+  [557] = {.entry = {.count = 1, .reusable = true}}, SHIFT(231),
+  [559] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
+  [561] = {.entry = {.count = 1, .reusable = true}}, SHIFT(218),
+  [563] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
+  [565] = {.entry = {.count = 1, .reusable = true}}, SHIFT(244),
+  [567] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
+  [569] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
+  [571] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
+  [573] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129),
+  [575] = {.entry = {.count = 1, .reusable = true}}, SHIFT(257),
+  [577] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
+  [579] = {.entry = {.count = 1, .reusable = true}}, SHIFT(248),
+  [581] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
+  [583] = {.entry = {.count = 1, .reusable = true}}, SHIFT(183),
+  [585] = {.entry = {.count = 1, .reusable = true}}, SHIFT(192),
+  [587] = {.entry = {.count = 1, .reusable = true}}, SHIFT(252),
+  [589] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
+  [591] = {.entry = {.count = 1, .reusable = true}}, SHIFT(229),
+  [593] = {.entry = {.count = 1, .reusable = true}}, SHIFT(259),
+  [595] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
+  [597] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
+  [599] = {.entry = {.count = 1, .reusable = true}}, SHIFT(136),
+  [601] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
+  [603] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_character_escape_seq, 1),
+  [605] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
+  [607] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__uni_character_literal, 2),
+  [609] = {.entry = {.count = 1, .reusable = true}}, SHIFT(147),
+  [611] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
+  [613] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
+  [615] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
+  [617] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240),
+  [619] = {.entry = {.count = 1, .reusable = true}}, SHIFT(118),
+  [621] = {.entry = {.count = 1, .reusable = true}}, SHIFT(292),
+  [623] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242),
+  [625] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
+  [627] = {.entry = {.count = 1, .reusable = true}}, SHIFT(297),
+  [629] = {.entry = {.count = 1, .reusable = true}}, SHIFT(150),
+  [631] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
+  [633] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137),
+  [635] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [637] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
+  [639] = {.entry = {.count = 1, .reusable = true}}, SHIFT(138),
 };
 #ifdef __cplusplus
@@ -3621,6 +6136,7 @@ extern const TSLanguage *tree_sitter_pine(void) {
     .alias_sequences = &ts_alias_sequences[0][0],
     .lex_modes = ts_lex_modes,
     .lex_fn = ts_lex,
+    .primary_state_ids = ts_primary_state_ids,
   };
   return &language;
 }

test/corpus/class_definitions.txt CHANGED Viewed

@@ -68,8 +68,7 @@ Class definitions - Traits
 package definitions
-@B @C
-class AnimalSubSpecies (
+class AnimalSubSpecies : B, C (
   val a: String,
   val b: Float
 )
@@ -81,11 +80,10 @@ class AnimalSubSpecies (
     (identifier))
   (definitions
     (class_definition
-      (trait_name
-        (definition_name))
-      (trait_name
-        (definition_name))
       (definition_name)
+      (trait_list
+        (definition_name)
+        (definition_name))
       (type_field
         (variable_name)
         (type
@@ -101,8 +99,7 @@ Class definitions - Genrics + Traits
 package definitions
-@B @C
-class A<S, T>(
+class A<S, T>: B, C (
   val a: S,
   val b: T
 )
@@ -114,14 +111,13 @@ class A<S, T>(
     (identifier))
   (definitions
     (class_definition
-      (trait_name
-        (definition_name))
-      (trait_name
-        (definition_name))
       (definition_name)
       (generic_list
         (identifier)
         (identifier))
+      (trait_list
+        (definition_name)
+        (definition_name))
       (type_field
         (variable_name)
         (type

test/corpus/enum_definitions.txt CHANGED Viewed

@@ -4,9 +4,9 @@ Enum definitions - Int
 package definitions
-enum Colors(val rgb: Int) {
+enum Colors(val rgb: Int) { # define colors here
   RED(0xFF0000),
-  GREEN(0x00FF00),
+  GREEN(0x00FF00), # this needs to sorted
   BLUE(0x0000FF)
 }
@@ -22,12 +22,14 @@ enum Colors(val rgb: Int) {
         (variable_name)
         (type
           (definition_name)))
+      (comment)
       (enum_field
         (enum_field_name)
         (hex_literal))
       (enum_field
         (enum_field_name)
         (hex_literal))
+      (comment)
       (enum_field
         (enum_field_name)
         (hex_literal)))))

test/corpus/functions.txt CHANGED Viewed

@@ -22,7 +22,7 @@ Functions - Extension
 package definitions
-fun User.main() => {
+fun User.fullName() => {
 }
 --------------------------------------------------------------------------------
@@ -64,6 +64,73 @@ fun add(a: Int, b: Int) => Int {
       (type
         (definition_name)))))
+================================================================================
+Functions - Generics
+================================================================================
+package definitions
+fun add<S, T>(a: S, b: T) => S {
+}
+--------------------------------------------------------------------------------
+(source_file
+  (package
+    (identifier))
+  (definitions
+    (fun_definition
+      (identifier)
+      (generic_list
+        (identifier)
+        (identifier))
+      (param
+        (variable_name)
+        (type
+          (definition_name)))
+      (param
+        (variable_name)
+        (type
+          (definition_name)))
+      (type
+        (definition_name)))))
+================================================================================
+Functions - Decorators
+================================================================================
+package definitions
+@cache(1000)
+@get()
+fun add(a: Int, b: Int) => Int {
+}
+--------------------------------------------------------------------------------
+(source_file
+  (package
+    (identifier))
+  (definitions
+    (fun_definition
+      (decorator_name
+        (identifier)
+        (integer_literal))
+      (decorator_name
+        (identifier))
+      (identifier)
+      (param
+        (variable_name)
+        (type
+          (definition_name)))
+      (param
+        (variable_name)
+        (type
+          (definition_name)))
+      (type
+        (definition_name)))))
 ================================================================================
 Functions - High Order 1
 ================================================================================

test/corpus/import_statements.txt CHANGED Viewed

@@ -4,7 +4,7 @@ Import statements
 package imports
-import github/pyros2097/std
+import github/pine/std  # importing std library here
 --------------------------------------------------------------------------------
@@ -12,4 +12,5 @@ import github/pyros2097/std
   (package
     (identifier))
   (import_statement
-    (url)))
+    (url))
+    (comment))

~repos /plum

git clone https://pyrossh.dev/repos/plum.git

A statically typed, imperative programming language inspired by rust, python