plum

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

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

30158b02 — Peter John

new grammar

Files changed (16) hide show

examples/Logger.kt +0 -182
examples/MenuScene.kt +0 -25
examples/all.kt +0 -115
grammar.js +278 -302
package.json +1 -1
src/grammar.json +373 -1249
src/node-types.json +83 -559
src/parser.c +1154 -5505
test/corpus/class_definitions.txt +0 -128
test/corpus/enum_definitions.txt +0 -117
test/corpus/functions.txt +2 -2
test/corpus/import.txt +40 -0
test/corpus/import_statements.txt +0 -16
test/corpus/record.txt +65 -0
test/corpus/traits.txt +0 -65
test/corpus/type.txt +77 -0

examples/Logger.kt DELETED Viewed

@@ -1,182 +0,0 @@
-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/MenuScene.kt DELETED Viewed

@@ -1,25 +0,0 @@
-@Scene
-class MenuScene(
-  name: string
-)
-fun MenuScene.init() {
-    log("Hello world")
-    log("new data")
-    showToast("Toasting", 2)
-}
-fun MenuScene.onClick(scene: Scene, actor: Actor) {
-    val nextScene = when (actor.name) {
-        "Play" -> GameScene,
-        "Play3d" -> Game3dScene,
-        "Options" -> OptionsScene,
-        "Exit" -> {
-            showMessageDialog(title = "Exit", message = "Are you sure you want \n to quit?")
-            exit(0)
-        }
-    }
-    nextScene?.run {
-      scene.setScene(it)
-    }
-}

examples/all.kt DELETED Viewed

@@ -1,115 +0,0 @@
-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,388 +2,356 @@ 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',
+  name: 'palm',
-  conflicts: $ => [
-    [$.fun_field],
-    [$.decorator_name],
-  ],
-  extras: $ => [
+  // extras: $ => [
-    $.comment,
+  //   $.comment,
-    /\s+/ // Whitespace
+  //   /\s+/ // Whitespace
-  ],
+  // ],
   rules: {
     source_file: $ => seq(
-      seq("package", $.package),
+      $.module,
-      repeat($.import_statement),
+      repeat($.import),
-      repeat($.definitions),
+      repeat(choice(
+        $.record,
+        $.type,
+        // $.proc,
+      )),
     ),
-    import_statement: $ => seq('import', $.url),
+    module: $ => seq('module', field("module", $.module_name)),
-    // Definitions
+    /* Import statements */
+    import: ($) =>
+      seq(
+        "import",
+        field("module", $.module_name),
+        optional(seq(".", field("imports", $.unqualified_imports))),
+        optional(seq("as", field("alias", $.identifier)))
+      ),
+    module_name: ($) => seq($._name, repeat(seq("/", $._name))),
+    unqualified_imports: ($) =>
+      seq("{", optional(series_of($.unqualified_import, ",")), "}"),
+    unqualified_import: ($) =>
+      choice(
+        seq(
+          field("name", $.identifier),
+          optional(seq("as", field("alias", $.identifier)))
+        ),
+        seq(
+          field("name", $.type_identifier),
+          optional(seq("as", field("alias", $.type_identifier)))
+        )
+      ),
-    definitions: $ => choice(
+    /* Declarations */
-      $.class_definition,
-      $.trait_definition,
-      $.enum_definition,
-      $.fun_definition,
-    ),
-    class_definition: $ => seq(
+    record: $ => seq(
-      field('decorators', optional(repeat($.decorator_name))),
-      'class',
+      'record',
-      field('name', $.definition_name),
+      field('name', $.type_identifier),
       field('generics', optional($.generic_list)),
-      field('traits', optional($.trait_list)),
+      field('fields', repeat($.type_field)),
-      field('fields', seq('(', commaSep1($.type_field), ')')),
     ),
-    trait_definition: $ => seq(
+    type: $ => seq(
-      'trait',
+      'type',
-      field('name', $.definition_name),
+      field('name', $.type_identifier),
       field('generics', optional($.generic_list)),
-      field('fields', seq('(', commaSep1($.trait_field), ')')),
-    ),
-    enum_definition: $ => seq(
-      'enum',
+      "=",
-      field('name', $.definition_name),
+      field('types', pipeSep1($.type_name)),
-      field('types', seq('(', commaSep1($.type_field), ')')),
-      field('fields', seq('{', commaSep1($.enum_field), '}')),
     ),
-    fun_definition: $ => seq(
+    // proc: $ => seq(
-      field('decorators', optional(repeat($.decorator_name))),
-      'fun',
-      field('name', choice($.identifier, $._extension)),
+    //   field('name', $.identifier),
-      field('generics', optional($.generic_list)),
-      field('params', seq('(', optional(commaSep1($.param)), ')')),
+    //   field('params', seq('(', optional(commaSep1($.type_field)), ')')),
+    //   optional(
+    //     seq(
-      '=>',
+    //       '->',
-      field('returns', optional(commaSep1($.type))),
+    //       field('return', optional($.return_type)),
+    //     ),
+    //   ),
+    //   '=',
-      field('body', $._block)
+    //   // field('body', $._block)
-    ),
-    decorator_name: $ => seq("@", $.identifier, '(', optional(commaSep1($._primary_expression)), ')'),
-    trait_list: $ => seq(
-      ':',
+    // ),
-      commaSep1($.definition_name),
-    ),
+    /* Shared AST nodes */
-    generic_list: $ => seq(
+    return_type: $ => seq(
+      field('name', $.type_identifier),
+      field("generics", optional(seq(
-      '<',
+        "(",
-      commaSep1($.identifier),
+        commaSep1($.identifier),
-      '>'
+        ")",
+      )))
     ),
-    type: $ => seq($.definition_name, optional('?')),
-    param: $ => seq(
+    type_name: $ => seq(
-      field('name', $.variable_name),
+      field('name', $.type_identifier),
+      optional(seq(
-      ':',
+        "(",
+        choice(
+          $.identifier,
-      field('type', $.type)
+          commaSep1($.type_field),
+        ),
+        ")",
+      ))
     ),
     type_field: $ => seq(
-      'val',
-      field('name', $.variable_name),
-      ':',
-      field('type', $.type)
-    ),
-    fun_field: $ => seq(
-      'fun',
       field('name', $.identifier),
-      field('params', seq('(', optional(commaSep1($.param)), ')')),
-      '=>',
+      ':',
-      field('returns', optional(commaSep1($.type))),
+      field('type', $.identifier)
     ),
-    trait_field: $ => choice(
+    identifier: ($) => $._name,
+    type_identifier: ($) => $._upname,
+    generic_list: $ => seq(
-      $.type_field,
+      '(',
-      $.fun_field,
+      commaSep1($.identifier),
+      ')'
     ),
+    _discard_name: ($) => /_[_0-9a-z]*/,
-    enum_field: $ => seq($.enum_field_name, '(', commaSep1($._primary_expression), ')'),
+    _name: ($) => /[_a-z][_0-9a-z]*/,
+    _upname: ($) => /[A-Z][0-9a-zA-Z]*/,
+    // param: $ => seq(
+    //   field('name', $.variable_name),
+    //   ':',
+    //   field('type', $.type)
-    // Expressions
+    // ),
-    _block: $ => prec(PREC.BLOCK, seq(
-      "{",
-      // optional($.statements),
-      "}"
-    )),
-    // statements: $ => seq(
-    //   $._statement,
-    // ),
-    // _statement: $ => choice(
+    // fun_field: $ => seq(
-    //   choice(
-    //     $.assignment,
+    //   'fun',
+    //   field('name', $.identifier),
+    //   field('params', seq('(', optional(commaSep1($.param)), ')')),
-    //     $._loop_statement,
+    //   '=>',
-    //     $._expression
+    //   field('returns', optional(commaSep1($.type))),
-    //   )
     // ),
-    // _loop_statement: $ => choice(
+    // trait_field: $ => choice(
+    //   $.type_field,
-    //   $.for_statement,
+    //   $.fun_field,
-    //   $.while_statement,
     // ),
-    // for_statement: $ => prec.right(seq(
-    //   "for",
-    //   "(",
-    //   repeat($.annotation),
-    //   choice($.variable_declaration, $.multi_variable_declaration),
+    // enum_field: $ => seq($.enum_field_name, '(', commaSep1($._primary_expression), ')'),
-    //   "in",
-    //   $._expression,
-    //   ")",
-    //   optional($.control_structure_body)
-    // )),
-    // while_statement: $ => seq(
-    //   "while",
-    //   "(",
-    //   $._expression,
+    // // Expressions
-    //   ")",
-    //   choice(";", $.control_structure_body)
-    // ),
-    // assignment: $ => choice(
+    // _block: $ => prec(PREC.BLOCK, seq(
-    //   prec.left(PREC.ASSIGNMENT, seq($.directly_assignable_expression, $._assignment_and_operator, $._expression)),
-    //   prec.left(PREC.ASSIGNMENT, seq($.directly_assignable_expression, "=", $._expression)),
-    //   // TODO
+    //   "{",
+    //   // optional($.statements),
+    //   "}"
-    // ),
+    // )),
+    // // 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,
+    // // // Expressions
-    //   $._primary_expression
+    // // // ==========
-    // ),
+    // // _expression: $ => choice(
-    // // Unary expressions
+    // //   $._unary_expression,
+    // //   $._binary_expression,
+    // //   $._primary_expression
+    // // ),
-    // _unary_expression: $ => choice(
-    //   $.postfix_expression,
-    //   $.call_expression,
-    //   $.indexing_expression,
+    // // // Unary expressions
-    //   $.navigation_expression,
-    //   $.prefix_expression,
-    //   $.as_expression,
-    //   $.spread_expression
-    // ),
-    // postfix_expression: $ => prec.left(PREC.POSTFIX, seq($._expression, $._postfix_unary_operator)),
+    // // _unary_expression: $ => choice(
+    // //   $.postfix_expression,
+    // //   $.call_expression,
+    // //   $.indexing_expression,
+    // //   $.navigation_expression,
+    // //   $.prefix_expression,
+    // //   $.as_expression,
+    // //   $.spread_expression
+    // // ),
-    // call_expression: $ => prec.left(PREC.POSTFIX, seq($._expression, $.call_suffix)),
+    // // postfix_expression: $ => prec.left(PREC.POSTFIX, seq($._expression, $._postfix_unary_operator)),
-    // indexing_expression: $ => prec.left(PREC.POSTFIX, seq($._expression, $.indexing_suffix)),
+    // // call_expression: $ => prec.left(PREC.POSTFIX, seq($._expression, $.call_suffix)),
-    // navigation_expression: $ => prec.left(PREC.POSTFIX, seq($._expression, $.navigation_suffix)),
+    // // indexing_expression: $ => prec.left(PREC.POSTFIX, seq($._expression, $.indexing_suffix)),
-    // prefix_expression: $ => prec.right(seq(choice($.annotation, $.label, $._prefix_unary_operator), $._expression)),
+    // // navigation_expression: $ => prec.left(PREC.POSTFIX, seq($._expression, $.navigation_suffix)),
-    // as_expression: $ => prec.left(PREC.AS, seq($._expression, $._as_operator, $._type)),
+    // // prefix_expression: $ => prec.right(seq(choice($.annotation, $.label, $._prefix_unary_operator), $._expression)),
-    // spread_expression: $ => prec.left(PREC.SPREAD, seq("*", $._expression)),
+    // // as_expression: $ => prec.left(PREC.AS, seq($._expression, $._as_operator, $._type)),
-    // _binary_expression: $ => choice(
+    // // spread_expression: $ => prec.left(PREC.SPREAD, seq("*", $._expression)),
-    //   $.multiplicative_expression,
-    //   $.additive_expression,
-    //   $.range_expression,
-    //   $.infix_expression,
-    //   $.elvis_expression,
-    //   $.check_expression,
-    //   $.comparison_expression,
-    //   $.equality_expression,
-    //   $.comparison_expression,
-    //   $.equality_expression,
-    //   $.conjunction_expression,
-    //   $.disjunction_expression
-    // ),
+    // // _binary_expression: $ => choice(
-    // multiplicative_expression: $ => prec.left(PREC.MULTIPLICATIVE, seq($._expression, $._multiplicative_operator, $._expression)),
+    // //   $.multiplicative_expression,
+    // //   $.additive_expression,
+    // //   $.range_expression,
+    // //   $.infix_expression,
+    // //   $.elvis_expression,
+    // //   $.check_expression,
+    // //   $.comparison_expression,
+    // //   $.equality_expression,
+    // //   $.comparison_expression,
+    // //   $.equality_expression,
+    // //   $.conjunction_expression,
+    // //   $.disjunction_expression
+    // // ),
-    // additive_expression: $ => prec.left(PREC.ADDITIVE, seq($._expression, $._additive_operator, $._expression)),
+    // // multiplicative_expression: $ => prec.left(PREC.MULTIPLICATIVE, seq($._expression, $._multiplicative_operator, $._expression)),
-    // range_expression: $ => prec.left(PREC.RANGE, seq($._expression, "..", $._expression)),
+    // // additive_expression: $ => prec.left(PREC.ADDITIVE, seq($._expression, $._additive_operator, $._expression)),
-    // infix_expression: $ => prec.left(PREC.INFIX, seq($._expression, $.simple_identifier, $._expression)),
+    // // range_expression: $ => prec.left(PREC.RANGE, seq($._expression, "..", $._expression)),
-    // elvis_expression: $ => prec.left(PREC.ELVIS, seq($._expression, "?:", $._expression)),
+    // // infix_expression: $ => prec.left(PREC.INFIX, seq($._expression, $.simple_identifier, $._expression)),
-    // check_expression: $ => prec.left(PREC.CHECK, seq($._expression, choice(
+    // // elvis_expression: $ => prec.left(PREC.ELVIS, seq($._expression, "?:", $._expression)),
-    //   seq($._in_operator, $._expression),
-    //   seq($._is_operator, $._type)))),
-    // comparison_expression: $ => prec.left(PREC.COMPARISON, seq($._expression, $._comparison_operator, $._expression)),
+    // // check_expression: $ => prec.left(PREC.CHECK, seq($._expression, choice(
+    // //   seq($._in_operator, $._expression),
+    // //   seq($._is_operator, $._type)))),
-    // equality_expression: $ => prec.left(PREC.EQUALITY, seq($._expression, $._equality_operator, $._expression)),
+    // // comparison_expression: $ => prec.left(PREC.COMPARISON, seq($._expression, $._comparison_operator, $._expression)),
-    // conjunction_expression: $ => prec.left(PREC.CONJUNCTION, seq($._expression, "&&", $._expression)),
+    // // equality_expression: $ => prec.left(PREC.EQUALITY, seq($._expression, $._equality_operator, $._expression)),
-    // disjunction_expression: $ => prec.left(PREC.DISJUNCTION, seq($._expression, "||", $._expression)),
+    // // conjunction_expression: $ => prec.left(PREC.CONJUNCTION, seq($._expression, "&&", $._expression)),
-    //  // Suffixes
+    // // disjunction_expression: $ => prec.left(PREC.DISJUNCTION, seq($._expression, "||", $._expression)),
-    // indexing_suffix: $ => seq("[", sep1($._expression, ","), "]"),
+    // //  // Suffixes
-    // navigation_suffix: $ => seq(
+    // // indexing_suffix: $ => seq("[", sep1($._expression, ","), "]"),
-    //    $._member_access_operator,
-    //    choice(
-    //      $.simple_identifier,
-    //      $.parenthesized_expression,
-    //      "class"
-    //    )
-    // ),
-    // call_suffix: $ => prec.left(seq(
+    // // navigation_suffix: $ => seq(
-    //    // this introduces ambiguities with 'less than' for comparisons
-    //    optional($.type_arguments),
+    // //    $._member_access_operator,
-    //    choice(
+    // //    choice(
-    //      seq(optional($.value_arguments), $.annotated_lambda),
-    //      $.value_arguments
+    // //      $.simple_identifier,
+    // //      $.parenthesized_expression,
+    // //      "class"
-    //    )
+    // //    )
-    // )),
+    // // ),
-    // variable_declaration: $ => prec.left(PREC.VAR_DECL, seq(
+    // // call_suffix: $ => prec.left(seq(
+    // //    // this introduces ambiguities with 'less than' for comparisons
+    // //    optional($.type_arguments),
+    // //    choice(
+    // //      seq(optional($.value_arguments), $.annotated_lambda),
-    //   // repeat($.annotation), TODO
+    // //      $.value_arguments
-    //   $.simple_identifier,
+    // //    )
-    //   optional(seq(":", $._type))
-    // )),
+    // // )),
-    // function_type: $ => seq(
+    // // variable_declaration: $ => prec.left(PREC.VAR_DECL, seq(
-    //   optional(seq($._simple_user_type, ".")), // TODO: Support "real" types
+    // //   // repeat($.annotation), TODO
-    //   $.function_type_parameters,
+    // //   $.simple_identifier,
+    // //   optional(seq(":", $._type))
-    //   "->",
+    // // )),
-    //   $._type
-    // ),
-    // function_type_parameters: $ => prec.left(1, seq(
+    // // function_type: $ => seq(
+    // //   optional(seq($._simple_user_type, ".")), // TODO: Support "real" types
+    // //   $.function_type_parameters,
+    // //   "->",
+    // //   $._type
-    //   "(",
+    // // ),
-    //   optional(sep1(choice($.parameter, $._type), ",")),
-    //   ")"
-    // )),
+    // // function_type_parameters: $ => prec.left(1, seq(
+    // //   "(",
-    // parenthesized_type: $ => seq("(", $._type, ")"),
+    // //   optional(sep1(choice($.parameter, $._type), ",")),
+    // //   ")"
+    // // )),
-    _primary_expression: $ => choice(
+    // // parenthesized_type: $ => seq("(", $._type, ")"),
-      $._literal_constant,
-      $._string_literal,
-    ),
-    _extension: $ => seq($.identifier, '.', $.identifier),
+    // _primary_expression: $ => choice(
+    //   $._literal_constant,
+    //   $._string_literal,
+    // ),
     url: $ => sep1(/[a-zA-Z_][a-zA-Z_0-9]*/, '/'),
-    package: $ => $.identifier,
+    // module: $ => $.identifier,
     identifier: $ => /[a-zA-Z_][a-zA-Z_0-9]*/,
-    definition_name: $ => /[A-Z](([a-z]+[A-Z]?)*)/, // Pascal Case - no digits allowed
+    // definition_name: $ => /[A-Z](([a-z]+[A-Z]?)*)/, // Pascal Case - no digits allowed
-    variable_name: $ => /[a-z][a-z]*(([A-Z][a-z]+)*[A-Z]?|([a-z]+[A-Z])*|[A-Z])/, // Lower Camel Case - no digits allowed
+    // variable_name: $ => /[a-z][a-z]*(([A-Z][a-z]+)*[A-Z]?|([a-z]+[A-Z])*|[A-Z])/, // Lower Camel Case - no digits allowed
-    enum_field_name: $ => /[A-Z_][A-Z_0-9]*/,
+    // enum_field_name: $ => /[A-Z_][A-Z_0-9]*/,
-    // Literals
+    // // Literals
-    boolean_literal: $ => choice("true", "false"),
+    // boolean_literal: $ => choice("true", "false"),
-    integer_literal: $ => token(seq(optional(/[1-9]/), DEC_DIGITS)),
+    // integer_literal: $ => token(seq(optional(/[1-9]/), DEC_DIGITS)),
-    hex_literal: $ => token(seq("0", /[xX]/, HEX_DIGITS)),
+    // hex_literal: $ => token(seq("0", /[xX]/, HEX_DIGITS)),
-    bin_literal: $ => token(seq("0", /[bB]/, BIN_DIGITS)),
+    // bin_literal: $ => token(seq("0", /[bB]/, BIN_DIGITS)),
-    float_literal: $ => token(choice(
+    // float_literal: $ => token(choice(
-      seq(
+    //   seq(
-        seq(optional(DEC_DIGITS), ".", DEC_DIGITS),
+    //     seq(optional(DEC_DIGITS), ".", DEC_DIGITS),
-        optional(/[fF]/)
+    //     optional(/[fF]/)
-      ),
+    //   ),
-      seq(DEC_DIGITS, /[fF]/)
+    //   seq(DEC_DIGITS, /[fF]/)
-    )),
+    // )),
-    character_literal: $ => seq(
+    // character_literal: $ => seq(
-      "'",
+    //   "'",
-      choice($.character_escape_seq, /[^\n\r'\\]/),
+    //   choice($.character_escape_seq, /[^\n\r'\\]/),
-      "'"
+    //   "'"
-    ),
+    // ),
-    character_escape_seq: $ => choice(
+    // character_escape_seq: $ => choice(
-      $._uni_character_literal,
+    //   $._uni_character_literal,
-      $._escaped_identifier
+    //   $._escaped_identifier
-    ),
+    // ),
-    _uni_character_literal: $ => seq(
+    // _uni_character_literal: $ => seq(
-      "\\u",
+    //   "\\u",
-      /[0-9a-fA-F]{4}/
+    //   /[0-9a-fA-F]{4}/
-    ),
+    // ),
-    _escaped_identifier: $ => /\\[tbrn'"\\$]/,
+    // _escaped_identifier: $ => /\\[tbrn'"\\$]/,
-    _string_literal: $ => choice(
+    // _string_literal: $ => choice(
-      $.line_string_literal,
+    //   $.line_string_literal,
-      $.multi_line_string_literal
+    //   $.multi_line_string_literal
-    ),
+    // ),
-    line_string_literal: $ => seq('"', repeat(choice($._line_string_content, $._interpolation)), '"'),
+    // line_string_literal: $ => seq('"', repeat(choice($._line_string_content, $._interpolation)), '"'),
-    multi_line_string_literal: $ => seq(
+    // multi_line_string_literal: $ => seq(
+    //   '`',
+    //   repeat(choice(
+    //     $._multi_line_string_content,
+    //     $._interpolation
+    //   )),
+    //   '`'
-      '`',
+    // ),
-      repeat(choice(
-        $._multi_line_string_content,
-        $._interpolation
-      )),
-      '`'
-    ),
-    _line_string_content: $ => choice(
+    // _line_string_content: $ => choice(
-      $._line_str_text,
+    //   $._line_str_text,
-      $.character_escape_seq
+    //   $.character_escape_seq
-    ),
+    // ),
-    _multi_line_string_content: $ => choice($._multi_line_str_text, '"'),
+    // _multi_line_string_content: $ => choice($._multi_line_str_text, '"'),
-    _line_str_text: $ => /[^\\"$]+/,
+    // _line_str_text: $ => /[^\\"$]+/,
-    _multi_line_str_text: $ => /[^"$]+/,
+    // _multi_line_str_text: $ => /[^"$]+/,
-    _interpolation: $ => choice(
+    // _interpolation: $ => choice(
-      // seq("${", alias($._expression, $.interpolated_expression), "}"),
+    //   // seq("${", alias($._expression, $.interpolated_expression), "}"),
-      seq("$", alias($.identifier, $.interpolated_identifier))
+    //   seq("$", alias($.identifier, $.interpolated_identifier))
-    ),
+    // ),
-    _literal_constant: $ => choice(
+    // _literal_constant: $ => choice(
-      $.boolean_literal,
+    //   $.boolean_literal,
-      $.integer_literal,
+    //   $.integer_literal,
-      $.hex_literal,
+    //   $.hex_literal,
-      $.bin_literal,
+    //   $.bin_literal,
-      $.character_literal,
+    //   $.character_literal,
-      $.float_literal,
+    //   $.float_literal,
-      "null",
+    //   "null",
-    ),
+    // ),
-    comment: $ => token(prec(PREC.COMMENT, choice(
+    // comment: $ => token(prec(PREC.COMMENT, choice(
-      seq("#", /.*/),
+    //   seq("#", /.*/),
-    ))),
+    // ))),
   }
 });
@@ -391,6 +359,14 @@ function commaSep1(rule) {
   return sep1(rule, ',')
 }
+function pipeSep1(rule) {
+  return sep1(rule, '|')
+}
 function sep1(rule, separator) {
   return seq(rule, repeat(seq(separator, rule)))
 }
+function series_of(rule, separator) {
+  return seq(rule, repeat(seq(separator, rule)), optional(separator));
+}

package.json CHANGED Viewed

@@ -1,5 +1,5 @@
 {
-  "name": "tree-sitter-pine",
+  "name": "tree-sitter-palm",
   "version": "0.1.0",
   "main": "bindings/node",
   "description": "Tree-Sitter grammar for pine",

src/grammar.json CHANGED Viewed

@@ -1,104 +1,299 @@
 {
-  "name": "pine",
+  "name": "palm",
   "rules": {
     "source_file": {
       "type": "SEQ",
       "members": [
         {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "package"
-            },
-            {
-              "type": "SYMBOL",
+          "type": "SYMBOL",
-              "name": "package"
+          "name": "module"
-            }
-          ]
         },
         {
           "type": "REPEAT",
           "content": {
             "type": "SYMBOL",
-            "name": "import_statement"
+            "name": "import"
           }
         },
         {
           "type": "REPEAT",
           "content": {
+            "type": "CHOICE",
+            "members": [
+              {
-            "type": "SYMBOL",
+                "type": "SYMBOL",
-            "name": "definitions"
+                "name": "record"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "type"
+              }
+            ]
           }
         }
       ]
     },
-    "import_statement": {
+    "module": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "import"
+          "value": "module"
         },
         {
+          "type": "FIELD",
+          "name": "module",
+          "content": {
-          "type": "SYMBOL",
+            "type": "SYMBOL",
-          "name": "url"
+            "name": "module_name"
+          }
         }
       ]
     },
-    "definitions": {
+    "import": {
-      "type": "CHOICE",
+      "type": "SEQ",
       "members": [
         {
-          "type": "SYMBOL",
+          "type": "STRING",
-          "name": "class_definition"
+          "value": "import"
         },
         {
+          "type": "FIELD",
+          "name": "module",
+          "content": {
-          "type": "SYMBOL",
+            "type": "SYMBOL",
-          "name": "trait_definition"
+            "name": "module_name"
+          }
         },
         {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "."
+                },
+                {
+                  "type": "FIELD",
+                  "name": "imports",
+                  "content": {
-          "type": "SYMBOL",
+                    "type": "SYMBOL",
-          "name": "enum_definition"
+                    "name": "unqualified_imports"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         },
         {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "as"
+                },
+                {
+                  "type": "FIELD",
+                  "name": "alias",
+                  "content": {
-          "type": "SYMBOL",
+                    "type": "SYMBOL",
-          "name": "fun_definition"
+                    "name": "identifier"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
-    "class_definition": {
+    "module_name": {
       "type": "SEQ",
       "members": [
         {
+          "type": "SYMBOL",
+          "name": "_name"
+        },
+        {
-          "type": "FIELD",
+          "type": "REPEAT",
-          "name": "decorators",
           "content": {
-            "type": "CHOICE",
+            "type": "SEQ",
             "members": [
               {
-                "type": "REPEAT",
-                "content": {
-                  "type": "SYMBOL",
+                "type": "STRING",
-                  "name": "decorator_name"
+                "value": "/"
-                }
               },
               {
-                "type": "BLANK"
+                "type": "SYMBOL",
+                "name": "_name"
               }
             ]
           }
+        }
+      ]
+    },
+    "unqualified_imports": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "unqualified_import"
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": ","
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "unqualified_import"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": ","
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "unqualified_import": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "name",
+              "content": {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "as"
+                    },
+                    {
+                      "type": "FIELD",
+                      "name": "alias",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "identifier"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            }
+          ]
         },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "name",
+              "content": {
+                "type": "SYMBOL",
+                "name": "type_identifier"
+              }
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "as"
+                    },
+                    {
+                      "type": "FIELD",
+                      "name": "alias",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "type_identifier"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "record": {
+      "type": "SEQ",
+      "members": [
         {
           "type": "STRING",
-          "value": "class"
+          "value": "record"
         },
         {
           "type": "FIELD",
           "name": "name",
           "content": {
             "type": "SYMBOL",
-            "name": "definition_name"
+            "name": "type_identifier"
           }
         },
         {
@@ -117,79 +312,32 @@
             ]
           }
         },
-        {
-          "type": "FIELD",
-          "name": "traits",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "trait_list"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          }
-        },
         {
           "type": "FIELD",
           "name": "fields",
           "content": {
-            "type": "SEQ",
+            "type": "REPEAT",
-            "members": [
+            "content": {
-              {
-                "type": "STRING",
-                "value": "("
-              },
-              {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "SYMBOL",
+              "type": "SYMBOL",
-                    "name": "type_field"
+              "name": "type_field"
-                  },
-                  {
-                    "type": "REPEAT",
-                    "content": {
-                      "type": "SEQ",
-                      "members": [
-                        {
-                          "type": "STRING",
-                          "value": ","
-                        },
-                        {
-                          "type": "SYMBOL",
-                          "name": "type_field"
-                        }
+            }
-                      ]
-                    }
-                  }
-                ]
-              },
-              {
-                "type": "STRING",
-                "value": ")"
-              }
-            ]
           }
         }
       ]
     },
-    "trait_definition": {
+    "type": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "trait"
+          "value": "type"
         },
         {
           "type": "FIELD",
           "name": "name",
           "content": {
             "type": "SYMBOL",
-            "name": "definition_name"
+            "name": "type_identifier"
           }
         },
         {
@@ -208,229 +356,71 @@
             ]
           }
         },
+        {
+          "type": "STRING",
+          "value": "="
+        },
         {
           "type": "FIELD",
-          "name": "fields",
+          "name": "types",
           "content": {
             "type": "SEQ",
             "members": [
               {
-                "type": "STRING",
+                "type": "SYMBOL",
-                "value": "("
+                "name": "type_name"
               },
               {
+                "type": "REPEAT",
+                "content": {
-                "type": "SEQ",
+                  "type": "SEQ",
-                "members": [
+                  "members": [
-                  {
+                    {
+                      "type": "STRING",
+                      "value": "|"
+                    },
+                    {
-                    "type": "SYMBOL",
+                      "type": "SYMBOL",
-                    "name": "trait_field"
+                      "name": "type_name"
-                  },
-                  {
-                    "type": "REPEAT",
-                    "content": {
-                      "type": "SEQ",
-                      "members": [
-                        {
-                          "type": "STRING",
-                          "value": ","
-                        },
-                        {
-                          "type": "SYMBOL",
-                          "name": "trait_field"
-                        }
-                      ]
                     }
+                  ]
-                  }
+                }
-                ]
-              },
-              {
-                "type": "STRING",
-                "value": ")"
               }
             ]
           }
         }
       ]
     },
-    "enum_definition": {
+    "return_type": {
       "type": "SEQ",
       "members": [
-        {
-          "type": "STRING",
-          "value": "enum"
-        },
         {
           "type": "FIELD",
           "name": "name",
           "content": {
             "type": "SYMBOL",
-            "name": "definition_name"
-          }
-        },
-        {
-          "type": "FIELD",
-          "name": "types",
-          "content": {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "STRING",
-                "value": "("
-              },
-              {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "type_field"
+            "name": "type_identifier"
-                  },
-                  {
-                    "type": "REPEAT",
-                    "content": {
-                      "type": "SEQ",
-                      "members": [
-                        {
-                          "type": "STRING",
-                          "value": ","
-                        },
-                        {
-                          "type": "SYMBOL",
-                          "name": "type_field"
-                        }
-                      ]
-                    }
-                  }
-                ]
-              },
-              {
-                "type": "STRING",
-                "value": ")"
-              }
-            ]
           }
         },
         {
           "type": "FIELD",
-          "name": "fields",
+          "name": "generics",
           "content": {
-            "type": "SEQ",
+            "type": "CHOICE",
             "members": [
-              {
-                "type": "STRING",
-                "value": "{"
-              },
               {
                 "type": "SEQ",
                 "members": [
                   {
-                    "type": "SYMBOL",
+                    "type": "STRING",
-                    "name": "enum_field"
+                    "value": "("
                   },
-                  {
-                    "type": "REPEAT",
-                    "content": {
-                      "type": "SEQ",
-                      "members": [
-                        {
-                          "type": "STRING",
-                          "value": ","
-                        },
-                        {
-                          "type": "SYMBOL",
-                          "name": "enum_field"
-                        }
-                      ]
-                    }
-                  }
-                ]
-              },
-              {
-                "type": "STRING",
-                "value": "}"
-              }
-            ]
-          }
-        }
-      ]
-    },
-    "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"
-        },
-        {
-          "type": "FIELD",
-          "name": "name",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "identifier"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "_extension"
-              }
-            ]
-          }
-        },
-        {
-          "type": "FIELD",
-          "name": "generics",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "generic_list"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          }
-        },
-        {
-          "type": "FIELD",
-          "name": "params",
-          "content": {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "STRING",
-                "value": "("
-              },
-              {
-                "type": "CHOICE",
-                "members": [
                   {
                     "type": "SEQ",
                     "members": [
                       {
                         "type": "SYMBOL",
-                        "name": "param"
+                        "name": "identifier"
                       },
                       {
                         "type": "REPEAT",
@@ -443,7 +433,7 @@
                             },
                             {
                               "type": "SYMBOL",
-                              "name": "param"
+                              "name": "identifier"
                             }
                           ]
                         }
@@ -451,162 +441,126 @@
                     ]
                   },
                   {
-                    "type": "BLANK"
+                    "type": "STRING",
+                    "value": ")"
                   }
                 ]
               },
               {
-                "type": "STRING",
+                "type": "BLANK"
-                "value": ")"
               }
             ]
           }
+        }
+      ]
-        },
+    },
-        {
+    "type_name": {
-          "type": "STRING",
+      "type": "SEQ",
-          "value": "=>"
+      "members": [
-        },
         {
           "type": "FIELD",
-          "name": "returns",
+          "name": "name",
           "content": {
+            "type": "SYMBOL",
+            "name": "type_identifier"
+          }
+        },
+        {
-            "type": "CHOICE",
+          "type": "CHOICE",
-            "members": [
+          "members": [
-              {
+            {
-                "type": "SEQ",
+              "type": "SEQ",
-                "members": [
+              "members": [
-                  {
+                {
+                  "type": "STRING",
+                  "value": "("
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
-                    "type": "SYMBOL",
+                      "type": "SYMBOL",
-                    "name": "type"
+                      "name": "identifier"
-                  },
+                    },
-                  {
+                    {
-                    "type": "REPEAT",
-                    "content": {
                       "type": "SEQ",
                       "members": [
                         {
-                          "type": "STRING",
+                          "type": "SYMBOL",
-                          "value": ","
+                          "name": "type_field"
                         },
                         {
+                          "type": "REPEAT",
+                          "content": {
+                            "type": "SEQ",
+                            "members": [
+                              {
+                                "type": "STRING",
+                                "value": ","
+                              },
+                              {
-                          "type": "SYMBOL",
+                                "type": "SYMBOL",
-                          "name": "type"
+                                "name": "type_field"
+                              }
+                            ]
+                          }
                         }
                       ]
                     }
+                  ]
+                },
+                {
+                  "type": "STRING",
+                  "value": ")"
-                  }
+                }
-                ]
+              ]
-              },
+            },
-              {
+            {
-                "type": "BLANK"
+              "type": "BLANK"
-              }
+            }
-            ]
+          ]
-          }
-        },
-        {
-          "type": "FIELD",
-          "name": "body",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_block"
-          }
         }
       ]
     },
-    "decorator_name": {
+    "type_field": {
       "type": "SEQ",
       "members": [
         {
-          "type": "STRING",
+          "type": "FIELD",
-          "value": "@"
+          "name": "name",
-        },
-        {
+          "content": {
-          "type": "SYMBOL",
+            "type": "SYMBOL",
-          "name": "identifier"
+            "name": "identifier"
+          }
         },
         {
           "type": "STRING",
-          "value": "("
+          "value": ":"
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SEQ",
+          "type": "FIELD",
+          "name": "type",
-              "members": [
+          "content": {
-                {
-                  "type": "SYMBOL",
+            "type": "SYMBOL",
-                  "name": "_primary_expression"
+            "name": "identifier"
-                },
-                {
-                  "type": "REPEAT",
-                  "content": {
-                    "type": "SEQ",
-                    "members": [
-                      {
-                        "type": "STRING",
-                        "value": ","
-                      },
-                      {
-                        "type": "SYMBOL",
-                        "name": "_primary_expression"
-                      }
+          }
-                    ]
-                  }
-                }
-              ]
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        },
-        {
-          "type": "STRING",
-          "value": ")"
         }
       ]
     },
-    "trait_list": {
+    "identifier": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
+      "type": "PATTERN",
-          "value": ":"
+      "value": "[a-zA-Z_][a-zA-Z_0-9]*"
-        },
+    },
-        {
-          "type": "SEQ",
-          "members": [
+    "type_identifier": {
-            {
-              "type": "SYMBOL",
+      "type": "SYMBOL",
-              "name": "definition_name"
+      "name": "_upname"
-            },
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": ","
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "definition_name"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ]
     },
     "generic_list": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "<"
+          "value": "("
         },
         {
           "type": "SEQ",
@@ -635,885 +589,55 @@
         },
         {
           "type": "STRING",
-          "value": ">"
+          "value": ")"
         }
       ]
     },
-    "type": {
+    "_discard_name": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "definition_name"
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "STRING",
+      "type": "PATTERN",
-              "value": "?"
+      "value": "_[_0-9a-z]*"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        }
-      ]
     },
-    "param": {
+    "_name": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "FIELD",
-          "name": "name",
-          "content": {
-            "type": "SYMBOL",
-            "name": "variable_name"
-          }
-        },
-        {
-          "type": "STRING",
+      "type": "PATTERN",
-          "value": ":"
+      "value": "[_a-z][_0-9a-z]*"
-        },
-        {
-          "type": "FIELD",
-          "name": "type",
-          "content": {
-            "type": "SYMBOL",
-            "name": "type"
-          }
-        }
-      ]
     },
-    "type_field": {
+    "_upname": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
+      "type": "PATTERN",
-          "value": "val"
+      "value": "[A-Z][0-9a-zA-Z]*"
-        },
-        {
-          "type": "FIELD",
-          "name": "name",
-          "content": {
-            "type": "SYMBOL",
-            "name": "variable_name"
-          }
-        },
-        {
-          "type": "STRING",
-          "value": ":"
-        },
-        {
-          "type": "FIELD",
-          "name": "type",
-          "content": {
-            "type": "SYMBOL",
-            "name": "type"
-          }
-        }
-      ]
     },
-    "fun_field": {
+    "url": {
       "type": "SEQ",
       "members": [
         {
-          "type": "STRING",
+          "type": "PATTERN",
-          "value": "fun"
+          "value": "[a-zA-Z_][a-zA-Z_0-9]*"
-        },
-        {
-          "type": "FIELD",
-          "name": "name",
-          "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
-          }
         },
         {
-          "type": "FIELD",
+          "type": "REPEAT",
-          "name": "params",
           "content": {
             "type": "SEQ",
             "members": [
               {
                 "type": "STRING",
-                "value": "("
-              },
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SEQ",
-                    "members": [
-                      {
-                        "type": "SYMBOL",
-                        "name": "param"
-                      },
-                      {
-                        "type": "REPEAT",
-                        "content": {
-                          "type": "SEQ",
-                          "members": [
-                            {
-                              "type": "STRING",
-                              "value": ","
-                            },
-                            {
-                              "type": "SYMBOL",
-                              "name": "param"
-                            }
-                          ]
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
-              },
-              {
-                "type": "STRING",
-                "value": ")"
-              }
-            ]
-          }
-        },
-        {
-          "type": "STRING",
-          "value": "=>"
+                "value": "/"
-        },
-        {
-          "type": "FIELD",
-          "name": "returns",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "type"
-                  },
-                  {
-                    "type": "REPEAT",
-                    "content": {
-                      "type": "SEQ",
-                      "members": [
-                        {
-                          "type": "STRING",
-                          "value": ","
-                        },
-                        {
-                          "type": "SYMBOL",
-                          "name": "type"
-                        }
-                      ]
-                    }
-                  }
-                ]
               },
               {
-                "type": "BLANK"
+                "type": "PATTERN",
+                "value": "[a-zA-Z_][a-zA-Z_0-9]*"
               }
             ]
           }
         }
       ]
-    },
-    "trait_field": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "type_field"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "fun_field"
-        }
-      ]
-    },
-    "enum_field": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "enum_field_name"
-        },
-        {
-          "type": "STRING",
-          "value": "("
-        },
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_primary_expression"
-            },
-            {
-              "type": "REPEAT",
-              "content": {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": ","
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "_primary_expression"
-                  }
-                ]
-              }
-            }
-          ]
-        },
-        {
-          "type": "STRING",
-          "value": ")"
-        }
-      ]
-    },
-    "_block": {
-      "type": "PREC",
-      "value": 1,
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "{"
-          },
-          {
-            "type": "STRING",
-            "value": "}"
-          }
-        ]
-      }
-    },
-    "_primary_expression": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_literal_constant"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_string_literal"
-        }
-      ]
-    },
-    "_extension": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "identifier"
-        },
-        {
-          "type": "STRING",
-          "value": "."
-        },
-        {
-          "type": "SYMBOL",
-          "name": "identifier"
-        }
-      ]
-    },
-    "url": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "PATTERN",
-          "value": "[a-zA-Z_][a-zA-Z_0-9]*"
-        },
-        {
-          "type": "REPEAT",
-          "content": {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "STRING",
-                "value": "/"
-              },
-              {
-                "type": "PATTERN",
-                "value": "[a-zA-Z_][a-zA-Z_0-9]*"
-              }
-            ]
-          }
-        }
-      ]
-    },
-    "package": {
-      "type": "SYMBOL",
-      "name": "identifier"
-    },
-    "identifier": {
-      "type": "PATTERN",
-      "value": "[a-zA-Z_][a-zA-Z_0-9]*"
-    },
-    "definition_name": {
-      "type": "PATTERN",
-      "value": "[A-Z](([a-z]+[A-Z]?)*)"
-    },
-    "variable_name": {
-      "type": "PATTERN",
-      "value": "[a-z][a-z]*(([A-Z][a-z]+)*[A-Z]?|([a-z]+[A-Z])*|[A-Z])"
-    },
-    "enum_field_name": {
-      "type": "PATTERN",
-      "value": "[A-Z_][A-Z_0-9]*"
-    },
-    "boolean_literal": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "true"
-        },
-        {
-          "type": "STRING",
-          "value": "false"
-        }
-      ]
-    },
-    "integer_literal": {
-      "type": "TOKEN",
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "PATTERN",
-                "value": "[1-9]"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          },
-          {
-            "type": "TOKEN",
-            "content": {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "PATTERN",
-                  "value": "[0-9]+"
-                },
-                {
-                  "type": "REPEAT",
-                  "content": {
-                    "type": "SEQ",
-                    "members": [
-                      {
-                        "type": "PATTERN",
-                        "value": "_+"
-                      },
-                      {
-                        "type": "PATTERN",
-                        "value": "[0-9]+"
-                      }
-                    ]
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    },
-    "hex_literal": {
-      "type": "TOKEN",
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "0"
-          },
-          {
-            "type": "PATTERN",
-            "value": "[xX]"
-          },
-          {
-            "type": "TOKEN",
-            "content": {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "PATTERN",
-                  "value": "[0-9a-fA-F]+"
-                },
-                {
-                  "type": "REPEAT",
-                  "content": {
-                    "type": "SEQ",
-                    "members": [
-                      {
-                        "type": "PATTERN",
-                        "value": "_+"
-                      },
-                      {
-                        "type": "PATTERN",
-                        "value": "[0-9a-fA-F]+"
-                      }
-                    ]
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    },
-    "bin_literal": {
-      "type": "TOKEN",
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "0"
-          },
-          {
-            "type": "PATTERN",
-            "value": "[bB]"
-          },
-          {
-            "type": "TOKEN",
-            "content": {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "PATTERN",
-                  "value": "[01]"
-                },
-                {
-                  "type": "REPEAT",
-                  "content": {
-                    "type": "SEQ",
-                    "members": [
-                      {
-                        "type": "PATTERN",
-                        "value": "_+"
-                      },
-                      {
-                        "type": "PATTERN",
-                        "value": "[01]"
-                      }
-                    ]
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    },
-    "float_literal": {
-      "type": "TOKEN",
-      "content": {
-        "type": "CHOICE",
-        "members": [
-          {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "TOKEN",
-                        "content": {
-                          "type": "SEQ",
-                          "members": [
-                            {
-                              "type": "PATTERN",
-                              "value": "[0-9]+"
-                            },
-                            {
-                              "type": "REPEAT",
-                              "content": {
-                                "type": "SEQ",
-                                "members": [
-                                  {
-                                    "type": "PATTERN",
-                                    "value": "_+"
-                                  },
-                                  {
-                                    "type": "PATTERN",
-                                    "value": "[0-9]+"
-                                  }
-                                ]
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      {
-                        "type": "BLANK"
-                      }
-                    ]
-                  },
-                  {
-                    "type": "STRING",
-                    "value": "."
-                  },
-                  {
-                    "type": "TOKEN",
-                    "content": {
-                      "type": "SEQ",
-                      "members": [
-                        {
-                          "type": "PATTERN",
-                          "value": "[0-9]+"
-                        },
-                        {
-                          "type": "REPEAT",
-                          "content": {
-                            "type": "SEQ",
-                            "members": [
-                              {
-                                "type": "PATTERN",
-                                "value": "_+"
-                              },
-                              {
-                                "type": "PATTERN",
-                                "value": "[0-9]+"
-                              }
-                            ]
-                          }
-                        }
-                      ]
-                    }
-                  }
-                ]
-              },
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "PATTERN",
-                    "value": "[fF]"
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
-              }
-            ]
-          },
-          {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "TOKEN",
-                "content": {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "PATTERN",
-                      "value": "[0-9]+"
-                    },
-                    {
-                      "type": "REPEAT",
-                      "content": {
-                        "type": "SEQ",
-                        "members": [
-                          {
-                            "type": "PATTERN",
-                            "value": "_+"
-                          },
-                          {
-                            "type": "PATTERN",
-                            "value": "[0-9]+"
-                          }
-                        ]
-                      }
-                    }
-                  ]
-                }
-              },
-              {
-                "type": "PATTERN",
-                "value": "[fF]"
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "character_literal": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "'"
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "character_escape_seq"
-            },
-            {
-              "type": "PATTERN",
-              "value": "[^\\n\\r'\\\\]"
-            }
-          ]
-        },
-        {
-          "type": "STRING",
-          "value": "'"
-        }
-      ]
-    },
-    "character_escape_seq": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_uni_character_literal"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_escaped_identifier"
-        }
-      ]
-    },
-    "_uni_character_literal": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "\\u"
-        },
-        {
-          "type": "PATTERN",
-          "value": "[0-9a-fA-F]{4}"
-        }
-      ]
-    },
-    "_escaped_identifier": {
-      "type": "PATTERN",
-      "value": "\\\\[tbrn'\"\\\\$]"
-    },
-    "_string_literal": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "line_string_literal"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "multi_line_string_literal"
-        }
-      ]
-    },
-    "line_string_literal": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "\""
-        },
-        {
-          "type": "REPEAT",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_line_string_content"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "_interpolation"
-              }
-            ]
-          }
-        },
-        {
-          "type": "STRING",
-          "value": "\""
-        }
-      ]
-    },
-    "multi_line_string_literal": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "`"
-        },
-        {
-          "type": "REPEAT",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_multi_line_string_content"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "_interpolation"
-              }
-            ]
-          }
-        },
-        {
-          "type": "STRING",
-          "value": "`"
-        }
-      ]
-    },
-    "_line_string_content": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_line_str_text"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "character_escape_seq"
-        }
-      ]
-    },
-    "_multi_line_string_content": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "_multi_line_str_text"
-        },
-        {
-          "type": "STRING",
-          "value": "\""
-        }
-      ]
-    },
-    "_line_str_text": {
-      "type": "PATTERN",
-      "value": "[^\\\\\"$]+"
-    },
-    "_multi_line_str_text": {
-      "type": "PATTERN",
-      "value": "[^\"$]+"
-    },
-    "_interpolation": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "$"
-            },
-            {
-              "type": "ALIAS",
-              "content": {
-                "type": "SYMBOL",
-                "name": "identifier"
-              },
-              "named": true,
-              "value": "interpolated_identifier"
-            }
-          ]
-        }
-      ]
-    },
-    "_literal_constant": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "boolean_literal"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "integer_literal"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "hex_literal"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "bin_literal"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "character_literal"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "float_literal"
-        },
-        {
-          "type": "STRING",
-          "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": [
+  "conflicts": [],
-    [
-      "fun_field"
-    ],
-    [
-      "decorator_name"
-    ]
-  ],
   "precedences": [],
   "externals": [],
   "inline": [],

src/node-types.json CHANGED Viewed

@@ -1,91 +1,70 @@
 [
   {
-    "type": "boolean_literal",
+    "type": "generic_list",
-    "named": true,
-    "fields": {}
-  },
-  {
-    "type": "character_escape_seq",
-    "named": true,
-    "fields": {}
-  },
-  {
-    "type": "character_literal",
     "named": true,
     "fields": {},
     "children": {
-      "multiple": false,
+      "multiple": true,
-      "required": false,
+      "required": true,
       "types": [
         {
-          "type": "character_escape_seq",
+          "type": "identifier",
           "named": true
         }
       ]
     }
   },
   {
-    "type": "class_definition",
+    "type": "identifier",
+    "named": true,
+    "fields": {}
+  },
+  {
+    "type": "import",
     "named": true,
     "fields": {
-      "decorators": {
+      "alias": {
-        "multiple": true,
+        "multiple": false,
         "required": false,
         "types": [
           {
-            "type": "decorator_name",
-            "named": true
-          }
-        ]
-      },
-      "fields": {
-        "multiple": true,
-        "required": true,
-        "types": [
-          {
-            "type": "(",
-            "named": false
-          },
-          {
-            "type": ")",
-            "named": false
-          },
-          {
-            "type": ",",
-            "named": false
-          },
-          {
-            "type": "type_field",
+            "type": "identifier",
             "named": true
           }
         ]
       },
-      "generics": {
+      "imports": {
         "multiple": false,
         "required": false,
         "types": [
           {
-            "type": "generic_list",
+            "type": "unqualified_imports",
             "named": true
           }
         ]
       },
-      "name": {
+      "module": {
         "multiple": false,
         "required": true,
         "types": [
           {
-            "type": "definition_name",
+            "type": "module_name",
             "named": true
           }
         ]
+      }
+    }
-      },
+  },
+  {
+    "type": "module",
+    "named": true,
-      "traits": {
+    "fields": {
+      "module": {
         "multiple": false,
-        "required": false,
+        "required": true,
         "types": [
           {
-            "type": "trait_list",
+            "type": "module_name",
             "named": true
           }
         ]
@@ -93,133 +72,40 @@
     }
   },
   {
-    "type": "decorator_name",
+    "type": "module_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,
-    "fields": {},
+    "fields": {}
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "class_definition",
-          "named": true
-        },
-        {
-          "type": "enum_definition",
-          "named": true
-        },
-        {
-          "type": "fun_definition",
-          "named": true
-        },
-        {
-          "type": "trait_definition",
-          "named": true
-        }
-      ]
-    }
   },
   {
-    "type": "enum_definition",
+    "type": "record",
     "named": true,
     "fields": {
       "fields": {
         "multiple": true,
-        "required": true,
+        "required": false,
         "types": [
           {
-            "type": ",",
-            "named": false
-          },
-          {
-            "type": "enum_field",
+            "type": "type_field",
             "named": true
-          },
-          {
-            "type": "{",
-            "named": false
-          },
-          {
-            "type": "}",
-            "named": false
           }
         ]
       },
-      "name": {
+      "generics": {
         "multiple": false,
-        "required": true,
+        "required": false,
         "types": [
           {
-            "type": "definition_name",
+            "type": "generic_list",
             "named": true
           }
         ]
       },
-      "types": {
+      "name": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
           {
-            "type": "(",
-            "named": false
-          },
-          {
-            "type": ")",
-            "named": false
-          },
-          {
-            "type": ",",
-            "named": false
-          },
-          {
-            "type": "type_field",
+            "type": "type_identifier",
             "named": true
           }
         ]
@@ -227,7 +113,7 @@
     }
   },
   {
-    "type": "enum_field",
+    "type": "source_file",
     "named": true,
     "fields": {},
     "children": {
@@ -235,72 +121,28 @@
       "required": true,
       "types": [
         {
-          "type": "bin_literal",
+          "type": "import",
-          "named": true
-        },
-        {
-          "type": "boolean_literal",
-          "named": true
-        },
-        {
-          "type": "character_literal",
           "named": true
         },
         {
-          "type": "enum_field_name",
+          "type": "module",
           "named": true
         },
         {
-          "type": "float_literal",
+          "type": "record",
           "named": true
         },
         {
-          "type": "hex_literal",
+          "type": "type",
-          "named": true
-        },
-        {
-          "type": "integer_literal",
-          "named": true
-        },
-        {
-          "type": "line_string_literal",
-          "named": true
-        },
-        {
-          "type": "multi_line_string_literal",
           "named": true
         }
       ]
     }
   },
   {
-    "type": "fun_definition",
+    "type": "type",
     "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,
@@ -312,59 +154,33 @@
         ]
       },
       "name": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
           {
-            "type": ".",
-            "named": false
-          },
-          {
-            "type": "identifier",
+            "type": "type_identifier",
             "named": true
           }
         ]
       },
-      "params": {
+      "types": {
         "multiple": true,
         "required": true,
         "types": [
           {
-            "type": "(",
-            "named": false
-          },
-          {
-            "type": ")",
-            "named": false
-          },
-          {
-            "type": ",",
-            "named": false
-          },
-          {
-            "type": "param",
+            "type": "type_name",
             "named": true
-          }
-        ]
-      },
-      "returns": {
-        "multiple": true,
-        "required": false,
-        "types": [
-          {
-            "type": ",",
-            "named": false
           },
           {
-            "type": "type",
+            "type": "|",
-            "named": true
+            "named": false
           }
         ]
       }
     }
   },
   {
-    "type": "fun_field",
+    "type": "type_field",
     "named": true,
     "fields": {
       "name": {
@@ -377,38 +193,12 @@
           }
         ]
       },
-      "params": {
+      "type": {
-        "multiple": true,
+        "multiple": false,
         "required": true,
         "types": [
           {
-            "type": "(",
-            "named": false
-          },
-          {
-            "type": ")",
-            "named": false
-          },
-          {
-            "type": ",",
-            "named": false
-          },
-          {
-            "type": "param",
-            "named": true
-          }
-        ]
-      },
-      "returns": {
-        "multiple": true,
-        "required": false,
-        "types": [
-          {
-            "type": ",",
-            "named": false
-          },
-          {
-            "type": "type",
+            "type": "identifier",
             "named": true
           }
         ]
@@ -416,96 +206,12 @@
     }
   },
   {
-    "type": "generic_list",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "identifier",
+    "type": "type_identifier",
-          "named": true
-        }
-      ]
-    }
-  },
-  {
-    "type": "identifier",
-    "named": true,
-    "fields": {}
-  },
-  {
-    "type": "import_statement",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "url",
-          "named": true
-        }
-      ]
-    }
-  },
-  {
-    "type": "interpolated_identifier",
     "named": true,
     "fields": {}
   },
   {
-    "type": "line_string_literal",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": false,
-      "types": [
-        {
-          "type": "character_escape_seq",
-          "named": true
-        },
-        {
-          "type": "interpolated_identifier",
-          "named": true
-        }
-      ]
-    }
-  },
-  {
-    "type": "multi_line_string_literal",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": false,
-      "types": [
-        {
-          "type": "interpolated_identifier",
-          "named": true
-        }
-      ]
-    }
-  },
-  {
-    "type": "package",
+    "type": "type_name",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "identifier",
-          "named": true
-        }
-      ]
-    }
-  },
-  {
-    "type": "param",
     "named": true,
     "fields": {
       "name": {
@@ -513,78 +219,41 @@
         "required": true,
         "types": [
           {
-            "type": "variable_name",
-            "named": true
-          }
-        ]
-      },
-      "type": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "type",
+            "type": "type_identifier",
             "named": true
           }
         ]
       }
-    }
-  },
+    },
-  {
-    "type": "source_file",
-    "named": true,
-    "fields": {},
     "children": {
       "multiple": true,
-      "required": true,
+      "required": false,
       "types": [
         {
-          "type": "definitions",
+          "type": "identifier",
-          "named": true
-        },
-        {
-          "type": "import_statement",
           "named": true
         },
         {
-          "type": "package",
+          "type": "type_field",
           "named": true
         }
       ]
     }
   },
   {
-    "type": "trait_definition",
+    "type": "unqualified_import",
     "named": true,
     "fields": {
-      "fields": {
+      "alias": {
-        "multiple": true,
-        "required": true,
-        "types": [
-          {
-            "type": "(",
-            "named": false
-          },
-          {
-            "type": ")",
-            "named": false
-          },
-          {
-            "type": ",",
-            "named": false
-          },
-          {
-            "type": "trait_field",
-            "named": true
-          }
-        ]
-      },
-      "generics": {
         "multiple": false,
         "required": false,
         "types": [
           {
-            "type": "generic_list",
+            "type": "identifier",
+            "named": true
+          },
+          {
+            "type": "type_identifier",
             "named": true
           }
         ]
@@ -594,7 +263,11 @@
         "required": true,
         "types": [
           {
-            "type": "definition_name",
+            "type": "identifier",
+            "named": true
+          },
+          {
+            "type": "type_identifier",
             "named": true
           }
         ]
@@ -602,97 +275,20 @@
     }
   },
   {
-    "type": "trait_field",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "fun_field",
-          "named": true
-        },
-        {
-          "type": "type_field",
-          "named": true
-        }
-      ]
-    }
-  },
-  {
-    "type": "trait_list",
+    "type": "unqualified_imports",
     "named": true,
     "fields": {},
     "children": {
       "multiple": true,
-      "required": true,
+      "required": false,
-      "types": [
-        {
-          "type": "definition_name",
-          "named": true
-        }
-      ]
-    }
-  },
-  {
-    "type": "type",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": true,
       "types": [
         {
-          "type": "definition_name",
+          "type": "unqualified_import",
           "named": true
         }
       ]
     }
   },
-  {
-    "type": "type_field",
-    "named": true,
-    "fields": {
-      "name": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "variable_name",
-            "named": true
-          }
-        ]
-      },
-      "type": {
-        "multiple": false,
-        "required": true,
-        "types": [
-          {
-            "type": "type",
-            "named": true
-          }
-        ]
-      }
-    }
-  },
-  {
-    "type": "url",
-    "named": true,
-    "fields": {}
-  },
-  {
-    "type": "\"",
-    "named": false
-  },
-  {
-    "type": "$",
-    "named": false
-  },
-  {
-    "type": "'",
-    "named": false
-  },
   {
     "type": "(",
     "named": false
@@ -718,107 +314,35 @@
     "named": false
   },
   {
-    "type": "<",
-    "named": false
-  },
-  {
-    "type": "=>",
-    "named": false
-  },
-  {
-    "type": ">",
-    "named": false
-  },
-  {
-    "type": "?",
+    "type": "=",
-    "named": false
-  },
-  {
-    "type": "@",
-    "named": false
-  },
-  {
-    "type": "\\u",
-    "named": false
-  },
-  {
-    "type": "`",
-    "named": false
-  },
-  {
-    "type": "bin_literal",
-    "named": true
-  },
-  {
-    "type": "class",
     "named": false
   },
   {
-    "type": "comment",
-    "named": true
-  },
-  {
-    "type": "definition_name",
-    "named": true
-  },
-  {
-    "type": "enum",
+    "type": "as",
     "named": false
   },
-  {
-    "type": "enum_field_name",
-    "named": true
-  },
-  {
-    "type": "false",
-    "named": false
-  },
-  {
-    "type": "float_literal",
-    "named": true
-  },
-  {
-    "type": "fun",
-    "named": false
-  },
-  {
-    "type": "hex_literal",
-    "named": true
-  },
   {
     "type": "import",
     "named": false
   },
   {
-    "type": "integer_literal",
-    "named": true
-  },
-  {
-    "type": "null",
+    "type": "module",
-    "named": false
-  },
-  {
-    "type": "package",
     "named": false
   },
   {
-    "type": "trait",
+    "type": "record",
     "named": false
   },
   {
-    "type": "true",
+    "type": "type",
     "named": false
   },
   {
-    "type": "val",
+    "type": "{",
     "named": false
   },
   {
-    "type": "variable_name",
-    "named": true
-  },
-  {
-    "type": "{",
+    "type": "|",
     "named": false
   },
   {

src/parser.c CHANGED Viewed

@@ -6,295 +6,145 @@
 #endif
 #define LANGUAGE_VERSION 14
-#define STATE_COUNT 309
+#define STATE_COUNT 86
 #define LARGE_STATE_COUNT 2
-#define SYMBOL_COUNT 90
+#define SYMBOL_COUNT 41
-#define ALIAS_COUNT 1
+#define ALIAS_COUNT 0
-#define TOKEN_COUNT 43
+#define TOKEN_COUNT 20
 #define EXTERNAL_TOKEN_COUNT 0
-#define FIELD_COUNT 10
+#define FIELD_COUNT 8
-#define MAX_ALIAS_SEQUENCE_LENGTH 12
+#define MAX_ALIAS_SEQUENCE_LENGTH 6
-#define PRODUCTION_ID_COUNT 69
+#define PRODUCTION_ID_COUNT 16
 enum {
-  anon_sym_package = 1,
+  anon_sym_module = 1,
   anon_sym_import = 2,
-  anon_sym_class = 3,
-  anon_sym_LPAREN = 4,
-  anon_sym_COMMA = 5,
-  anon_sym_RPAREN = 6,
-  anon_sym_trait = 7,
-  anon_sym_enum = 8,
-  anon_sym_LBRACE = 9,
-  anon_sym_RBRACE = 10,
-  anon_sym_fun = 11,
-  anon_sym_EQ_GT = 12,
-  anon_sym_AT = 13,
-  anon_sym_COLON = 14,
-  anon_sym_LT = 15,
-  anon_sym_GT = 16,
-  anon_sym_QMARK = 17,
-  anon_sym_val = 18,
-  anon_sym_DOT = 19,
-  aux_sym_url_token1 = 20,
-  anon_sym_SLASH = 21,
-  sym_definition_name = 22,
-  sym_variable_name = 23,
-  sym_enum_field_name = 24,
-  anon_sym_true = 25,
-  anon_sym_false = 26,
-  sym_integer_literal = 27,
-  sym_hex_literal = 28,
-  sym_bin_literal = 29,
-  sym_float_literal = 30,
-  anon_sym_SQUOTE = 31,
-  aux_sym_character_literal_token1 = 32,
-  anon_sym_BSLASHu = 33,
-  aux_sym__uni_character_literal_token1 = 34,
-  sym__escaped_identifier = 35,
-  anon_sym_DQUOTE = 36,
-  anon_sym_BQUOTE = 37,
-  sym__line_str_text = 38,
-  sym__multi_line_str_text = 39,
-  anon_sym_DOLLAR = 40,
-  anon_sym_null = 41,
-  sym_comment = 42,
-  sym_source_file = 43,
-  sym_import_statement = 44,
-  sym_definitions = 45,
-  sym_class_definition = 46,
-  sym_trait_definition = 47,
-  sym_enum_definition = 48,
-  sym_fun_definition = 49,
-  sym_decorator_name = 50,
-  sym_trait_list = 51,
-  sym_generic_list = 52,
-  sym_type = 53,
-  sym_param = 54,
-  sym_type_field = 55,
-  sym_fun_field = 56,
-  sym_trait_field = 57,
-  sym_enum_field = 58,
-  sym__block = 59,
-  sym__primary_expression = 60,
-  sym__extension = 61,
-  sym_url = 62,
-  sym_package = 63,
-  sym_identifier = 64,
-  sym_boolean_literal = 65,
-  sym_character_literal = 66,
-  sym_character_escape_seq = 67,
-  sym__uni_character_literal = 68,
-  sym__string_literal = 69,
-  sym_line_string_literal = 70,
-  sym_multi_line_string_literal = 71,
-  sym__line_string_content = 72,
-  sym__multi_line_string_content = 73,
-  sym__interpolation = 74,
-  sym__literal_constant = 75,
-  aux_sym_source_file_repeat1 = 76,
-  aux_sym_source_file_repeat2 = 77,
-  aux_sym_class_definition_repeat1 = 78,
-  aux_sym_class_definition_repeat2 = 79,
-  aux_sym_trait_definition_repeat1 = 80,
-  aux_sym_enum_definition_repeat1 = 81,
-  aux_sym_fun_definition_repeat1 = 82,
-  aux_sym_fun_definition_repeat2 = 83,
-  aux_sym_decorator_name_repeat1 = 84,
-  aux_sym_trait_list_repeat1 = 85,
-  aux_sym_generic_list_repeat1 = 86,
-  aux_sym_url_repeat1 = 87,
-  aux_sym_line_string_literal_repeat1 = 88,
-  aux_sym_multi_line_string_literal_repeat1 = 89,
-  alias_sym_interpolated_identifier = 90,
+  anon_sym_DOT = 3,
+  anon_sym_as = 4,
+  anon_sym_SLASH = 5,
+  anon_sym_LBRACE = 6,
+  anon_sym_COMMA = 7,
+  anon_sym_RBRACE = 8,
+  anon_sym_record = 9,
+  anon_sym_type = 10,
+  anon_sym_EQ = 11,
+  anon_sym_PIPE = 12,
+  anon_sym_LPAREN = 13,
+  anon_sym_RPAREN = 14,
+  anon_sym_COLON = 15,
+  aux_sym_identifier_token1 = 16,
+  sym__discard_name = 17,
+  sym__name = 18,
+  sym__upname = 19,
+  sym_source_file = 20,
+  sym_module = 21,
+  sym_import = 22,
+  sym_module_name = 23,
+  sym_unqualified_imports = 24,
+  sym_unqualified_import = 25,
+  sym_record = 26,
+  sym_type = 27,
+  sym_type_name = 28,
+  sym_type_field = 29,
+  sym_identifier = 30,
+  sym_type_identifier = 31,
+  sym_generic_list = 32,
+  aux_sym_source_file_repeat1 = 33,
+  aux_sym_source_file_repeat2 = 34,
+  aux_sym_module_name_repeat1 = 35,
+  aux_sym_unqualified_imports_repeat1 = 36,
+  aux_sym_record_repeat1 = 37,
+  aux_sym_type_repeat1 = 38,
+  aux_sym_return_type_repeat1 = 39,
+  aux_sym_type_name_repeat1 = 40,
 };
 static const char * const ts_symbol_names[] = {
   [ts_builtin_sym_end] = "end",
-  [anon_sym_package] = "package",
+  [anon_sym_module] = "module",
   [anon_sym_import] = "import",
-  [anon_sym_class] = "class",
-  [anon_sym_LPAREN] = "(",
-  [anon_sym_COMMA] = ",",
+  [anon_sym_DOT] = ".",
-  [anon_sym_RPAREN] = ")",
-  [anon_sym_trait] = "trait",
+  [anon_sym_as] = "as",
-  [anon_sym_enum] = "enum",
+  [anon_sym_SLASH] = "/",
   [anon_sym_LBRACE] = "{",
+  [anon_sym_COMMA] = ",",
   [anon_sym_RBRACE] = "}",
+  [anon_sym_record] = "record",
-  [anon_sym_fun] = "fun",
+  [anon_sym_type] = "type",
-  [anon_sym_EQ_GT] = "=>",
-  [anon_sym_AT] = "@",
+  [anon_sym_EQ] = "=",
+  [anon_sym_PIPE] = "|",
+  [anon_sym_LPAREN] = "(",
+  [anon_sym_RPAREN] = ")",
   [anon_sym_COLON] = ":",
-  [anon_sym_LT] = "<",
-  [anon_sym_GT] = ">",
-  [anon_sym_QMARK] = "\?",
-  [anon_sym_val] = "val",
-  [anon_sym_DOT] = ".",
-  [aux_sym_url_token1] = "url_token1",
+  [aux_sym_identifier_token1] = "identifier_token1",
-  [anon_sym_SLASH] = "/",
-  [sym_definition_name] = "definition_name",
-  [sym_variable_name] = "variable_name",
+  [sym__discard_name] = "_discard_name",
-  [sym_enum_field_name] = "enum_field_name",
-  [anon_sym_true] = "true",
-  [anon_sym_false] = "false",
-  [sym_integer_literal] = "integer_literal",
-  [sym_hex_literal] = "hex_literal",
-  [sym_bin_literal] = "bin_literal",
-  [sym_float_literal] = "float_literal",
-  [anon_sym_SQUOTE] = "'",
-  [aux_sym_character_literal_token1] = "character_literal_token1",
-  [anon_sym_BSLASHu] = "\\u",
-  [aux_sym__uni_character_literal_token1] = "_uni_character_literal_token1",
-  [sym__escaped_identifier] = "_escaped_identifier",
-  [anon_sym_DQUOTE] = "\"",
-  [anon_sym_BQUOTE] = "`",
-  [sym__line_str_text] = "_line_str_text",
-  [sym__multi_line_str_text] = "_multi_line_str_text",
-  [anon_sym_DOLLAR] = "$",
-  [anon_sym_null] = "null",
-  [sym_comment] = "comment",
+  [sym__name] = "_name",
+  [sym__upname] = "_upname",
   [sym_source_file] = "source_file",
+  [sym_module] = "module",
-  [sym_import_statement] = "import_statement",
+  [sym_import] = "import",
-  [sym_definitions] = "definitions",
-  [sym_class_definition] = "class_definition",
-  [sym_trait_definition] = "trait_definition",
-  [sym_enum_definition] = "enum_definition",
-  [sym_fun_definition] = "fun_definition",
-  [sym_decorator_name] = "decorator_name",
+  [sym_module_name] = "module_name",
+  [sym_unqualified_imports] = "unqualified_imports",
+  [sym_unqualified_import] = "unqualified_import",
-  [sym_trait_list] = "trait_list",
+  [sym_record] = "record",
-  [sym_generic_list] = "generic_list",
   [sym_type] = "type",
-  [sym_param] = "param",
+  [sym_type_name] = "type_name",
   [sym_type_field] = "type_field",
-  [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",
-  [sym_package] = "package",
   [sym_identifier] = "identifier",
-  [sym_boolean_literal] = "boolean_literal",
-  [sym_character_literal] = "character_literal",
-  [sym_character_escape_seq] = "character_escape_seq",
-  [sym__uni_character_literal] = "_uni_character_literal",
-  [sym__string_literal] = "_string_literal",
-  [sym_line_string_literal] = "line_string_literal",
+  [sym_type_identifier] = "type_identifier",
-  [sym_multi_line_string_literal] = "multi_line_string_literal",
-  [sym__line_string_content] = "_line_string_content",
-  [sym__multi_line_string_content] = "_multi_line_string_content",
-  [sym__interpolation] = "_interpolation",
+  [sym_generic_list] = "generic_list",
-  [sym__literal_constant] = "_literal_constant",
   [aux_sym_source_file_repeat1] = "source_file_repeat1",
   [aux_sym_source_file_repeat2] = "source_file_repeat2",
-  [aux_sym_class_definition_repeat1] = "class_definition_repeat1",
-  [aux_sym_class_definition_repeat2] = "class_definition_repeat2",
-  [aux_sym_trait_definition_repeat1] = "trait_definition_repeat1",
-  [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_module_name_repeat1] = "module_name_repeat1",
+  [aux_sym_unqualified_imports_repeat1] = "unqualified_imports_repeat1",
-  [aux_sym_trait_list_repeat1] = "trait_list_repeat1",
+  [aux_sym_record_repeat1] = "record_repeat1",
-  [aux_sym_generic_list_repeat1] = "generic_list_repeat1",
-  [aux_sym_url_repeat1] = "url_repeat1",
+  [aux_sym_type_repeat1] = "type_repeat1",
-  [aux_sym_line_string_literal_repeat1] = "line_string_literal_repeat1",
+  [aux_sym_return_type_repeat1] = "return_type_repeat1",
-  [aux_sym_multi_line_string_literal_repeat1] = "multi_line_string_literal_repeat1",
+  [aux_sym_type_name_repeat1] = "type_name_repeat1",
-  [alias_sym_interpolated_identifier] = "interpolated_identifier",
 };
 static const TSSymbol ts_symbol_map[] = {
   [ts_builtin_sym_end] = ts_builtin_sym_end,
-  [anon_sym_package] = anon_sym_package,
+  [anon_sym_module] = anon_sym_module,
   [anon_sym_import] = anon_sym_import,
+  [anon_sym_DOT] = anon_sym_DOT,
-  [anon_sym_class] = anon_sym_class,
+  [anon_sym_as] = anon_sym_as,
-  [anon_sym_LPAREN] = anon_sym_LPAREN,
+  [anon_sym_SLASH] = anon_sym_SLASH,
-  [anon_sym_COMMA] = anon_sym_COMMA,
-  [anon_sym_RPAREN] = anon_sym_RPAREN,
-  [anon_sym_trait] = anon_sym_trait,
-  [anon_sym_enum] = anon_sym_enum,
   [anon_sym_LBRACE] = anon_sym_LBRACE,
+  [anon_sym_COMMA] = anon_sym_COMMA,
   [anon_sym_RBRACE] = anon_sym_RBRACE,
+  [anon_sym_record] = anon_sym_record,
-  [anon_sym_fun] = anon_sym_fun,
+  [anon_sym_type] = anon_sym_type,
-  [anon_sym_EQ_GT] = anon_sym_EQ_GT,
-  [anon_sym_AT] = anon_sym_AT,
+  [anon_sym_EQ] = anon_sym_EQ,
+  [anon_sym_PIPE] = anon_sym_PIPE,
+  [anon_sym_LPAREN] = anon_sym_LPAREN,
+  [anon_sym_RPAREN] = anon_sym_RPAREN,
   [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_val] = anon_sym_val,
-  [anon_sym_DOT] = anon_sym_DOT,
-  [aux_sym_url_token1] = aux_sym_url_token1,
+  [aux_sym_identifier_token1] = aux_sym_identifier_token1,
-  [anon_sym_SLASH] = anon_sym_SLASH,
-  [sym_definition_name] = sym_definition_name,
-  [sym_variable_name] = sym_variable_name,
+  [sym__discard_name] = sym__discard_name,
-  [sym_enum_field_name] = sym_enum_field_name,
-  [anon_sym_true] = anon_sym_true,
-  [anon_sym_false] = anon_sym_false,
-  [sym_integer_literal] = sym_integer_literal,
-  [sym_hex_literal] = sym_hex_literal,
-  [sym_bin_literal] = sym_bin_literal,
-  [sym_float_literal] = sym_float_literal,
-  [anon_sym_SQUOTE] = anon_sym_SQUOTE,
-  [aux_sym_character_literal_token1] = aux_sym_character_literal_token1,
-  [anon_sym_BSLASHu] = anon_sym_BSLASHu,
-  [aux_sym__uni_character_literal_token1] = aux_sym__uni_character_literal_token1,
-  [sym__escaped_identifier] = sym__escaped_identifier,
-  [anon_sym_DQUOTE] = anon_sym_DQUOTE,
-  [anon_sym_BQUOTE] = anon_sym_BQUOTE,
-  [sym__line_str_text] = sym__line_str_text,
-  [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__name] = sym__name,
+  [sym__upname] = sym__upname,
   [sym_source_file] = sym_source_file,
+  [sym_module] = sym_module,
-  [sym_import_statement] = sym_import_statement,
+  [sym_import] = sym_import,
-  [sym_definitions] = sym_definitions,
-  [sym_class_definition] = sym_class_definition,
-  [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_module_name] = sym_module_name,
+  [sym_unqualified_imports] = sym_unqualified_imports,
+  [sym_unqualified_import] = sym_unqualified_import,
-  [sym_trait_list] = sym_trait_list,
+  [sym_record] = sym_record,
-  [sym_generic_list] = sym_generic_list,
   [sym_type] = sym_type,
-  [sym_param] = sym_param,
+  [sym_type_name] = sym_type_name,
   [sym_type_field] = sym_type_field,
-  [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,
-  [sym_package] = sym_package,
   [sym_identifier] = sym_identifier,
-  [sym_boolean_literal] = sym_boolean_literal,
-  [sym_character_literal] = sym_character_literal,
-  [sym_character_escape_seq] = sym_character_escape_seq,
-  [sym__uni_character_literal] = sym__uni_character_literal,
-  [sym__string_literal] = sym__string_literal,
-  [sym_line_string_literal] = sym_line_string_literal,
+  [sym_type_identifier] = sym_type_identifier,
-  [sym_multi_line_string_literal] = sym_multi_line_string_literal,
-  [sym__line_string_content] = sym__line_string_content,
-  [sym__multi_line_string_content] = sym__multi_line_string_content,
-  [sym__interpolation] = sym__interpolation,
+  [sym_generic_list] = sym_generic_list,
-  [sym__literal_constant] = sym__literal_constant,
   [aux_sym_source_file_repeat1] = aux_sym_source_file_repeat1,
   [aux_sym_source_file_repeat2] = aux_sym_source_file_repeat2,
-  [aux_sym_class_definition_repeat1] = aux_sym_class_definition_repeat1,
-  [aux_sym_class_definition_repeat2] = aux_sym_class_definition_repeat2,
-  [aux_sym_trait_definition_repeat1] = aux_sym_trait_definition_repeat1,
-  [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_module_name_repeat1] = aux_sym_module_name_repeat1,
+  [aux_sym_unqualified_imports_repeat1] = aux_sym_unqualified_imports_repeat1,
-  [aux_sym_trait_list_repeat1] = aux_sym_trait_list_repeat1,
+  [aux_sym_record_repeat1] = aux_sym_record_repeat1,
-  [aux_sym_generic_list_repeat1] = aux_sym_generic_list_repeat1,
-  [aux_sym_url_repeat1] = aux_sym_url_repeat1,
+  [aux_sym_type_repeat1] = aux_sym_type_repeat1,
-  [aux_sym_line_string_literal_repeat1] = aux_sym_line_string_literal_repeat1,
+  [aux_sym_return_type_repeat1] = aux_sym_return_type_repeat1,
-  [aux_sym_multi_line_string_literal_repeat1] = aux_sym_multi_line_string_literal_repeat1,
+  [aux_sym_type_name_repeat1] = aux_sym_type_name_repeat1,
-  [alias_sym_interpolated_identifier] = alias_sym_interpolated_identifier,
 };
 static const TSSymbolMetadata ts_symbol_metadata[] = {
@@ -302,7 +152,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = true,
   },
-  [anon_sym_package] = {
+  [anon_sym_module] = {
     .visible = true,
     .named = false,
   },
@@ -310,27 +160,15 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_class] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_LPAREN] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_COMMA] = {
+  [anon_sym_DOT] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_RPAREN] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_trait] = {
+  [anon_sym_as] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_enum] = {
+  [anon_sym_SLASH] = {
     .visible = true,
     .named = false,
   },
@@ -338,175 +176,83 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_RBRACE] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_fun] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_EQ_GT] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_AT] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_COLON] = {
+  [anon_sym_COMMA] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_LT] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_GT] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_QMARK] = {
+  [anon_sym_RBRACE] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_val] = {
+  [anon_sym_record] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_DOT] = {
+  [anon_sym_type] = {
     .visible = true,
     .named = false,
   },
-  [aux_sym_url_token1] = {
-    .visible = false,
-    .named = false,
-  },
-  [anon_sym_SLASH] = {
+  [anon_sym_EQ] = {
     .visible = true,
     .named = false,
   },
-  [sym_definition_name] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_variable_name] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_enum_field_name] = {
-    .visible = true,
-    .named = true,
-  },
-  [anon_sym_true] = {
+  [anon_sym_PIPE] = {
     .visible = true,
     .named = false,
   },
-  [anon_sym_false] = {
+  [anon_sym_LPAREN] = {
     .visible = true,
     .named = false,
   },
-  [sym_integer_literal] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_hex_literal] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_bin_literal] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_float_literal] = {
-    .visible = true,
-    .named = true,
-  },
-  [anon_sym_SQUOTE] = {
+  [anon_sym_RPAREN] = {
     .visible = true,
     .named = false,
   },
-  [aux_sym_character_literal_token1] = {
-    .visible = false,
-    .named = false,
-  },
-  [anon_sym_BSLASHu] = {
+  [anon_sym_COLON] = {
     .visible = true,
     .named = false,
   },
-  [aux_sym__uni_character_literal_token1] = {
+  [aux_sym_identifier_token1] = {
     .visible = false,
     .named = false,
   },
-  [sym__escaped_identifier] = {
+  [sym__discard_name] = {
     .visible = false,
     .named = true,
   },
-  [anon_sym_DQUOTE] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_BQUOTE] = {
-    .visible = true,
-    .named = false,
-  },
-  [sym__line_str_text] = {
+  [sym__name] = {
     .visible = false,
     .named = true,
   },
-  [sym__multi_line_str_text] = {
+  [sym__upname] = {
     .visible = false,
     .named = true,
   },
-  [anon_sym_DOLLAR] = {
-    .visible = true,
-    .named = false,
-  },
-  [anon_sym_null] = {
-    .visible = true,
-    .named = false,
-  },
-  [sym_comment] = {
-    .visible = true,
-    .named = true,
-  },
   [sym_source_file] = {
     .visible = true,
     .named = true,
   },
-  [sym_import_statement] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_definitions] = {
+  [sym_module] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_class_definition] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_trait_definition] = {
     .visible = true,
     .named = true,
   },
-  [sym_enum_definition] = {
+  [sym_import] = {
     .visible = true,
     .named = true,
   },
-  [sym_fun_definition] = {
+  [sym_module_name] = {
     .visible = true,
     .named = true,
   },
-  [sym_decorator_name] = {
+  [sym_unqualified_imports] = {
     .visible = true,
     .named = true,
   },
-  [sym_trait_list] = {
+  [sym_unqualified_import] = {
     .visible = true,
     .named = true,
   },
-  [sym_generic_list] = {
+  [sym_record] = {
     .visible = true,
     .named = true,
   },
@@ -514,7 +260,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [sym_param] = {
+  [sym_type_name] = {
     .visible = true,
     .named = true,
   },
@@ -522,86 +268,18 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [sym_fun_field] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_trait_field] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_enum_field] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym__block] = {
-    .visible = false,
-    .named = true,
-  },
-  [sym__primary_expression] = {
-    .visible = false,
-    .named = true,
-  },
-  [sym__extension] = {
-    .visible = false,
-    .named = true,
-  },
-  [sym_url] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_package] = {
-    .visible = true,
-    .named = true,
-  },
   [sym_identifier] = {
     .visible = true,
     .named = true,
   },
-  [sym_boolean_literal] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_character_literal] = {
+  [sym_type_identifier] = {
     .visible = true,
     .named = true,
   },
-  [sym_character_escape_seq] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym__uni_character_literal] = {
-    .visible = false,
-    .named = true,
-  },
-  [sym__string_literal] = {
+  [sym_generic_list] = {
-    .visible = false,
-    .named = true,
-  },
-  [sym_line_string_literal] = {
-    .visible = true,
-    .named = true,
-  },
-  [sym_multi_line_string_literal] = {
     .visible = true,
     .named = true,
   },
-  [sym__line_string_content] = {
-    .visible = false,
-    .named = true,
-  },
-  [sym__multi_line_string_content] = {
-    .visible = false,
-    .named = true,
-  },
-  [sym__interpolation] = {
-    .visible = false,
-    .named = true,
-  },
-  [sym__literal_constant] = {
-    .visible = false,
-    .named = true,
-  },
   [aux_sym_source_file_repeat1] = {
     .visible = false,
     .named = false,
@@ -610,667 +288,129 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = false,
   },
-  [aux_sym_class_definition_repeat1] = {
-    .visible = false,
-    .named = false,
-  },
-  [aux_sym_class_definition_repeat2] = {
-    .visible = false,
-    .named = false,
-  },
-  [aux_sym_trait_definition_repeat1] = {
-    .visible = false,
-    .named = false,
-  },
-  [aux_sym_enum_definition_repeat1] = {
-    .visible = false,
-    .named = false,
-  },
-  [aux_sym_fun_definition_repeat1] = {
+  [aux_sym_module_name_repeat1] = {
-    .visible = false,
-    .named = false,
-  },
-  [aux_sym_fun_definition_repeat2] = {
     .visible = false,
     .named = false,
   },
-  [aux_sym_decorator_name_repeat1] = {
+  [aux_sym_unqualified_imports_repeat1] = {
     .visible = false,
     .named = false,
   },
-  [aux_sym_trait_list_repeat1] = {
+  [aux_sym_record_repeat1] = {
     .visible = false,
     .named = false,
   },
-  [aux_sym_generic_list_repeat1] = {
+  [aux_sym_type_repeat1] = {
     .visible = false,
     .named = false,
   },
-  [aux_sym_url_repeat1] = {
+  [aux_sym_return_type_repeat1] = {
     .visible = false,
     .named = false,
   },
-  [aux_sym_line_string_literal_repeat1] = {
+  [aux_sym_type_name_repeat1] = {
     .visible = false,
     .named = false,
   },
-  [aux_sym_multi_line_string_literal_repeat1] = {
-    .visible = false,
-    .named = false,
-  },
-  [alias_sym_interpolated_identifier] = {
-    .visible = true,
-    .named = true,
-  },
 };
 enum {
-  field_body = 1,
+  field_alias = 1,
-  field_decorators = 2,
-  field_fields = 3,
+  field_fields = 2,
-  field_generics = 4,
+  field_generics = 3,
+  field_imports = 4,
+  field_module = 5,
-  field_name = 5,
+  field_name = 6,
-  field_params = 6,
-  field_returns = 7,
-  field_traits = 8,
-  field_type = 9,
+  field_type = 7,
-  field_types = 10,
+  field_types = 8,
 };
 static const char * const ts_field_names[] = {
   [0] = NULL,
-  [field_body] = "body",
+  [field_alias] = "alias",
-  [field_decorators] = "decorators",
   [field_fields] = "fields",
   [field_generics] = "generics",
+  [field_imports] = "imports",
+  [field_module] = "module",
   [field_name] = "name",
-  [field_params] = "params",
-  [field_returns] = "returns",
-  [field_traits] = "traits",
   [field_type] = "type",
   [field_types] = "types",
 };
 static const TSFieldMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
-  [1] = {.index = 0, .length = 4},
+  [1] = {.index = 0, .length = 1},
-  [2] = {.index = 4, .length = 5},
+  [2] = {.index = 1, .length = 1},
-  [3] = {.index = 9, .length = 5},
+  [3] = {.index = 2, .length = 2},
-  [4] = {.index = 14, .length = 5},
+  [4] = {.index = 4, .length = 2},
+  [5] = {.index = 6, .length = 2},
+  [6] = {.index = 8, .length = 2},
-  [5] = {.index = 19, .length = 4},
+  [7] = {.index = 10, .length = 3},
-  [6] = {.index = 23, .length = 2},
+  [8] = {.index = 13, .length = 2},
-  [8] = {.index = 25, .length = 5},
+  [9] = {.index = 15, .length = 1},
-  [9] = {.index = 30, .length = 2},
-  [10] = {.index = 32, .length = 6},
+  [10] = {.index = 16, .length = 2},
-  [11] = {.index = 38, .length = 6},
+  [11] = {.index = 18, .length = 3},
-  [12] = {.index = 44, .length = 6},
+  [12] = {.index = 21, .length = 3},
-  [13] = {.index = 50, .length = 5},
+  [13] = {.index = 24, .length = 3},
-  [14] = {.index = 55, .length = 5},
-  [15] = {.index = 60, .length = 5},
-  [16] = {.index = 65, .length = 6},
-  [17] = {.index = 71, .length = 6},
-  [18] = {.index = 77, .length = 6},
-  [19] = {.index = 83, .length = 5},
-  [20] = {.index = 88, .length = 7},
-  [21] = {.index = 95, .length = 3},
-  [22] = {.index = 98, .length = 7},
-  [23] = {.index = 105, .length = 6},
-  [24] = {.index = 111, .length = 6},
-  [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},
+  [14] = {.index = 27, .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},
+  [15] = {.index = 31, .length = 2},
-  [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[] = {
   [0] =
+    {field_module, 1},
+  [1] =
+    {field_name, 1},
+  [2] =
-    {field_fields, 2},
+    {field_generics, 2},
-    {field_fields, 3},
-    {field_fields, 4},
     {field_name, 1},
   [4] =
     {field_fields, 2},
-    {field_fields, 3},
-    {field_fields, 4},
-    {field_fields, 5},
-    {field_name, 1},
-  [9] =
-    {field_fields, 3},
-    {field_fields, 4},
-    {field_fields, 5},
     {field_name, 1},
+  [6] =
+    {field_imports, 3},
+    {field_module, 1},
+  [8] =
-    {field_traits, 2},
+    {field_alias, 3},
+    {field_module, 1},
-  [14] =
+  [10] =
     {field_fields, 3},
-    {field_fields, 4},
-    {field_fields, 5},
     {field_generics, 2},
     {field_name, 1},
-  [19] =
+  [13] =
-    {field_body, 5},
     {field_name, 1},
-    {field_params, 2},
-    {field_params, 3},
+    {field_types, 3},
-  [23] =
+  [15] =
+    {field_name, 0},
+  [16] =
     {field_name, 0},
     {field_type, 2},
-  [25] =
-    {field_decorators, 0},
-    {field_fields, 3},
-    {field_fields, 4},
-    {field_fields, 5},
-    {field_name, 2},
-  [30] =
-    {field_name, 1},
-    {field_type, 3},
-  [32] =
-    {field_fields, 3},
-    {field_fields, 4},
-    {field_fields, 5},
-    {field_fields, 6},
-    {field_name, 1},
-    {field_traits, 2},
-  [38] =
+  [18] =
-    {field_fields, 3},
-    {field_fields, 4},
-    {field_fields, 5},
-    {field_fields, 6},
-    {field_generics, 2},
-    {field_name, 1},
-  [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},
-  [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, 3},
-  [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, 3},
-  [95] =
-    {field_name, 1},
-    {field_params, 2},
-    {field_params, 3},
-  [98] =
-    {field_fields, 5},
-    {field_fields, 6},
-    {field_fields, 7},
-    {field_name, 1},
-    {field_types, 2},
     {field_types, 3},
     {field_types, 4},
-  [105] =
-    {field_body, 7},
-    {field_name, 1},
-    {field_params, 2},
-    {field_params, 3},
-    {field_returns, 5},
-    {field_returns, 6},
-  [111] =
+  [21] =
-    {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},
-  [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, 4},
-  [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},
-    {field_fields, 8},
-    {field_name, 1},
-    {field_types, 2},
-    {field_types, 3},
-    {field_types, 4},
-  [190] =
-    {field_fields, 6},
-    {field_fields, 7},
-    {field_fields, 8},
-    {field_name, 1},
-    {field_types, 2},
-    {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] =
+  [24] =
-    {field_body, 8},
-    {field_name, 1},
-    {field_params, 2},
-    {field_params, 3},
-    {field_params, 4},
-    {field_params, 5},
+    {field_alias, 5},
-    {field_returns, 7},
-  [212] =
-    {field_body, 8},
-    {field_generics, 2},
-    {field_name, 1},
-    {field_params, 3},
+    {field_imports, 3},
-    {field_params, 4},
-    {field_returns, 6},
-    {field_returns, 7},
-  [219] =
-    {field_body, 8},
+    {field_module, 1},
-    {field_generics, 2},
-    {field_name, 1},
-    {field_params, 3},
-    {field_params, 4},
-    {field_params, 5},
-    {field_returns, 7},
-  [226] =
+  [27] =
-    {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},
-  [281] =
-    {field_name, 1},
-    {field_params, 2},
-    {field_params, 3},
-    {field_params, 4},
-    {field_returns, 6},
-  [286] =
-    {field_name, 1},
-    {field_params, 2},
-    {field_params, 3},
-    {field_params, 4},
-    {field_params, 5},
-  [291] =
-    {field_fields, 6},
-    {field_fields, 7},
-    {field_fields, 8},
-    {field_fields, 9},
-    {field_name, 1},
-    {field_types, 2},
-    {field_types, 3},
     {field_types, 4},
     {field_types, 5},
-  [300] =
+  [31] =
-    {field_body, 9},
+    {field_alias, 2},
-    {field_name, 1},
+    {field_name, 0},
-    {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},
-  [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},
-  [412] =
-    {field_name, 1},
-    {field_params, 2},
-    {field_params, 3},
-    {field_params, 4},
-    {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},
-  [7] = {
-    [1] = alias_sym_interpolated_identifier,
-  },
 };
 static const uint16_t ts_non_terminal_alias_map[] = {
-  sym_identifier, 2,
-    sym_identifier,
-    alias_sym_interpolated_identifier,
   0,
 };
@@ -1285,7 +425,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [7] = 7,
   [8] = 8,
   [9] = 9,
-  [10] = 10,
+  [10] = 7,
   [11] = 11,
   [12] = 12,
   [13] = 13,
@@ -1317,7 +457,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [39] = 39,
   [40] = 40,
   [41] = 41,
-  [42] = 42,
+  [42] = 2,
   [43] = 43,
   [44] = 44,
   [45] = 45,
@@ -1343,7 +483,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [65] = 65,
   [66] = 66,
   [67] = 67,
-  [68] = 68,
+  [68] = 66,
   [69] = 69,
   [70] = 70,
   [71] = 71,
@@ -1360,230 +500,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [82] = 82,
   [83] = 83,
   [84] = 84,
-  [85] = 85,
+  [85] = 83,
-  [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) {
@@ -1591,667 +508,278 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
   eof = lexer->eof(lexer);
   switch (state) {
     case 0:
-      if (eof) ADVANCE(59);
+      if (eof) ADVANCE(23);
-      if (lookahead == '"') ADVANCE(114);
-      if (lookahead == '#') ADVANCE(125);
-      if (lookahead == '$') ADVANCE(123);
-      if (lookahead == '\'') ADVANCE(107);
-      if (lookahead == '(') ADVANCE(63);
+      if (lookahead == '(') ADVANCE(38);
-      if (lookahead == ')') ADVANCE(65);
+      if (lookahead == ')') ADVANCE(39);
-      if (lookahead == ',') ADVANCE(64);
+      if (lookahead == ',') ADVANCE(30);
-      if (lookahead == '.') ADVANCE(78);
+      if (lookahead == '.') ADVANCE(26);
-      if (lookahead == '/') ADVANCE(80);
+      if (lookahead == '/') ADVANCE(28);
-      if (lookahead == '0') ADVANCE(97);
-      if (lookahead == ':') ADVANCE(73);
+      if (lookahead == ':') ADVANCE(40);
-      if (lookahead == '<') ADVANCE(74);
+      if (lookahead == '=') ADVANCE(36);
+      if (lookahead == '_') ADVANCE(51);
+      if (lookahead == 'a') ADVANCE(16);
-      if (lookahead == '=') ADVANCE(8);
+      if (lookahead == 'i') ADVANCE(8);
-      if (lookahead == '>') ADVANCE(75);
-      if (lookahead == '?') ADVANCE(76);
-      if (lookahead == '@') ADVANCE(72);
-      if (lookahead == '\\') ADVANCE(48);
-      if (lookahead == '_') ADVANCE(92);
+      if (lookahead == 'm') ADVANCE(9);
+      if (lookahead == 'r') ADVANCE(4);
-      if (lookahead == '`') ADVANCE(115);
+      if (lookahead == 't') ADVANCE(19);
-      if (lookahead == 'c') ADVANCE(32);
+      if (lookahead == '{') ADVANCE(29);
-      if (lookahead == 'e') ADVANCE(37);
+      if (lookahead == '|') ADVANCE(37);
-      if (lookahead == 'f') ADVANCE(18);
-      if (lookahead == 'i') ADVANCE(34);
+      if (lookahead == '}') ADVANCE(31);
-      if (lookahead == 'n') ADVANCE(49);
-      if (lookahead == 'p') ADVANCE(14);
-      if (lookahead == 't') ADVANCE(40);
-      if (lookahead == 'v') ADVANCE(19);
-      if (lookahead == '{') ADVANCE(68);
-      if (lookahead == '}') ADVANCE(69);
-      if (('a' <= lookahead && lookahead <= 'd')) ADVANCE(58);
       if (lookahead == '\t' ||
           lookahead == '\n' ||
           lookahead == '\r' ||
           lookahead == ' ') SKIP(0)
-      if (('A' <= lookahead && lookahead <= 'F')) ADVANCE(83);
+      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(53);
-      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(100);
-      if (('G' <= lookahead && lookahead <= 'Z')) ADVANCE(87);
       END_STATE();
     case 1:
-      if (lookahead == '"') ADVANCE(114);
-      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 == 'c') ADVANCE(11);
-      if (lookahead == 'f') ADVANCE(20);
-      if (lookahead == 'n') ADVANCE(49);
-      if (lookahead == 't') ADVANCE(42);
-      if (lookahead == '{') ADVANCE(68);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') SKIP(1)
-      if (('1' <= lookahead && lookahead <= '9')) ADVANCE(96);
-      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(86);
       END_STATE();
     case 2:
-      if (lookahead == '"') ADVANCE(114);
-      if (lookahead == '#') ADVANCE(117);
+      if (lookahead == 'd') ADVANCE(18);
-      if (lookahead == '$') ADVANCE(123);
-      if (lookahead == '\\') ADVANCE(48);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(118);
-      if (lookahead != 0) ADVANCE(119);
       END_STATE();
     case 3:
-      if (lookahead == '"') ADVANCE(114);
-      if (lookahead == '#') ADVANCE(120);
+      if (lookahead == 'd') ADVANCE(32);
-      if (lookahead == '$') ADVANCE(123);
-      if (lookahead == '`') ADVANCE(116);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(121);
-      if (lookahead != 0) ADVANCE(122);
       END_STATE();
     case 4:
-      if (lookahead == '#') ADVANCE(125);
+      if (lookahead == 'e') ADVANCE(1);
-      if (lookahead == ')') ADVANCE(65);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') SKIP(4)
-      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(88);
-      if (('A' <= lookahead && lookahead <= 'Z') ||
-          lookahead == '_') ADVANCE(92);
       END_STATE();
     case 5:
-      if (lookahead == '#') ADVANCE(125);
+      if (lookahead == 'e') ADVANCE(34);
-      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 == 'e') ADVANCE(24);
-      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 == 'l') ADVANCE(6);
-      if (lookahead == '\\') ADVANCE(48);
-      if (lookahead == '\t' ||
-          lookahead == ' ') ADVANCE(109);
-      if (lookahead == '\n' ||
-          lookahead == '\r') SKIP(7)
-      if (lookahead != 0 &&
-          lookahead != '\'') ADVANCE(108);
       END_STATE();
     case 8:
-      if (lookahead == '>') ADVANCE(71);
+      if (lookahead == 'm') ADVANCE(12);
       END_STATE();
     case 9:
-      if (lookahead == '_') ADVANCE(9);
+      if (lookahead == 'o') ADVANCE(2);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(98);
       END_STATE();
     case 10:
-      if (lookahead == '_') ADVANCE(10);
+      if (lookahead == 'o') ADVANCE(14);
-      if (lookahead == '0' ||
-          lookahead == '1') ADVANCE(103);
       END_STATE();
     case 11:
-      if (lookahead == '_') ADVANCE(11);
+      if (lookahead == 'o') ADVANCE(15);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(102);
       END_STATE();
     case 12:
-      if (lookahead == '_') ADVANCE(12);
+      if (lookahead == 'p') ADVANCE(10);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(96);
       END_STATE();
     case 13:
-      if (lookahead == '_') ADVANCE(13);
+      if (lookahead == 'p') ADVANCE(5);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(106);
       END_STATE();
     case 14:
-      if (lookahead == 'a') ADVANCE(21);
+      if (lookahead == 'r') ADVANCE(17);
       END_STATE();
     case 15:
-      if (lookahead == 'a') ADVANCE(45);
+      if (lookahead == 'r') ADVANCE(3);
       END_STATE();
     case 16:
-      if (lookahead == 'a') ADVANCE(26);
+      if (lookahead == 's') ADVANCE(27);
-      if (lookahead == 'u') ADVANCE(22);
       END_STATE();
     case 17:
-      if (lookahead == 'a') ADVANCE(25);
+      if (lookahead == 't') ADVANCE(25);
       END_STATE();
     case 18:
-      if (lookahead == 'a') ADVANCE(31);
-      if (lookahead == 'u') ADVANCE(36);
+      if (lookahead == 'u') ADVANCE(7);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('b' <= lookahead && lookahead <= 'f')) ADVANCE(57);
       END_STATE();
     case 19:
-      if (lookahead == 'a') ADVANCE(28);
+      if (lookahead == 'y') ADVANCE(13);
       END_STATE();
     case 20:
-      if (lookahead == 'a') ADVANCE(30);
+      if (lookahead == '}') ADVANCE(31);
+      if (lookahead == '\t' ||
+          lookahead == '\n' ||
+          lookahead == '\r' ||
+          lookahead == ' ') SKIP(20)
+      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(41);
+      if (lookahead == '_' ||
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
       END_STATE();
     case 21:
+      if (lookahead == '\t' ||
+          lookahead == '\n' ||
+          lookahead == '\r' ||
-      if (lookahead == 'c') ADVANCE(27);
+          lookahead == ' ') SKIP(21)
+      if (lookahead == '_' ||
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(52);
       END_STATE();
     case 22:
+      if (eof) ADVANCE(23);
-      if (lookahead == 'e') ADVANCE(93);
+      if (lookahead == '(') ADVANCE(38);
+      if (lookahead == ')') ADVANCE(39);
+      if (lookahead == ',') ADVANCE(30);
+      if (lookahead == '=') ADVANCE(36);
+      if (lookahead == 'r') ADVANCE(44);
+      if (lookahead == 't') ADVANCE(49);
+      if (lookahead == '}') ADVANCE(31);
+      if (lookahead == '\t' ||
+          lookahead == '\n' ||
+          lookahead == '\r' ||
+          lookahead == ' ') SKIP(22)
+      if (('A' <= lookahead && lookahead <= 'Z') ||
+          lookahead == '_' ||
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
       END_STATE();
     case 23:
-      if (lookahead == 'e') ADVANCE(94);
+      ACCEPT_TOKEN(ts_builtin_sym_end);
       END_STATE();
     case 24:
-      if (lookahead == 'e') ADVANCE(60);
+      ACCEPT_TOKEN(anon_sym_module);
       END_STATE();
     case 25:
-      if (lookahead == 'g') ADVANCE(24);
+      ACCEPT_TOKEN(anon_sym_import);
       END_STATE();
     case 26:
-      if (lookahead == 'i') ADVANCE(46);
+      ACCEPT_TOKEN(anon_sym_DOT);
       END_STATE();
     case 27:
-      if (lookahead == 'k') ADVANCE(17);
+      ACCEPT_TOKEN(anon_sym_as);
       END_STATE();
     case 28:
-      if (lookahead == 'l') ADVANCE(77);
+      ACCEPT_TOKEN(anon_sym_SLASH);
       END_STATE();
     case 29:
-      if (lookahead == 'l') ADVANCE(124);
+      ACCEPT_TOKEN(anon_sym_LBRACE);
       END_STATE();
     case 30:
-      if (lookahead == 'l') ADVANCE(44);
+      ACCEPT_TOKEN(anon_sym_COMMA);
       END_STATE();
     case 31:
-      if (lookahead == 'l') ADVANCE(44);
+      ACCEPT_TOKEN(anon_sym_RBRACE);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(56);
       END_STATE();
     case 32:
-      if (lookahead == 'l') ADVANCE(15);
+      ACCEPT_TOKEN(anon_sym_record);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(57);
       END_STATE();
     case 33:
+      ACCEPT_TOKEN(anon_sym_record);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
-      if (lookahead == 'l') ADVANCE(29);
+          lookahead == '_' ||
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
       END_STATE();
     case 34:
-      if (lookahead == 'm') ADVANCE(39);
+      ACCEPT_TOKEN(anon_sym_type);
       END_STATE();
     case 35:
+      ACCEPT_TOKEN(anon_sym_type);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
-      if (lookahead == 'm') ADVANCE(67);
+          lookahead == '_' ||
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
       END_STATE();
     case 36:
-      if (lookahead == 'n') ADVANCE(70);
+      ACCEPT_TOKEN(anon_sym_EQ);
       END_STATE();
     case 37:
-      if (lookahead == 'n') ADVANCE(51);
+      ACCEPT_TOKEN(anon_sym_PIPE);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(57);
       END_STATE();
     case 38:
-      if (lookahead == 'o') ADVANCE(41);
+      ACCEPT_TOKEN(anon_sym_LPAREN);
       END_STATE();
     case 39:
-      if (lookahead == 'p') ADVANCE(38);
+      ACCEPT_TOKEN(anon_sym_RPAREN);
       END_STATE();
     case 40:
-      if (lookahead == 'r') ADVANCE(16);
+      ACCEPT_TOKEN(anon_sym_COLON);
       END_STATE();
     case 41:
+      ACCEPT_TOKEN(aux_sym_identifier_token1);
-      if (lookahead == 'r') ADVANCE(47);
+      if (lookahead == '_') ADVANCE(50);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(41);
       END_STATE();
     case 42:
+      ACCEPT_TOKEN(aux_sym_identifier_token1);
-      if (lookahead == 'r') ADVANCE(50);
+      if (lookahead == 'c') ADVANCE(46);
+      if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
+          lookahead == '_' ||
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
       END_STATE();
     case 43:
-      if (lookahead == 's') ADVANCE(62);
-      END_STATE();
-    case 44:
-      if (lookahead == 's') ADVANCE(23);
-      END_STATE();
-    case 45:
-      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(111);
-      if (lookahead == '"' ||
-          lookahead == '$' ||
-          lookahead == '\'' ||
-          lookahead == '\\' ||
-          lookahead == 'b' ||
-          lookahead == 'n' ||
-          lookahead == 'r' ||
-          lookahead == 't') ADVANCE(113);
+      ACCEPT_TOKEN(aux_sym_identifier_token1);
-      END_STATE();
-    case 49:
-      if (lookahead == 'u') ADVANCE(33);
+      if (lookahead == 'd') 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 53:
-      if (lookahead == '0' ||
-          lookahead == '1') ADVANCE(103);
-      END_STATE();
-    case 54:
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(106);
-      END_STATE();
-    case 55:
       if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
+          lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(102);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
       END_STATE();
-    case 56:
+    case 44:
+      ACCEPT_TOKEN(aux_sym_identifier_token1);
+      if (lookahead == 'e') ADVANCE(42);
       if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
+          lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
       END_STATE();
-    case 57:
+    case 45:
+      ACCEPT_TOKEN(aux_sym_identifier_token1);
+      if (lookahead == 'e') ADVANCE(35);
       if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
+          lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(56);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
       END_STATE();
-    case 58:
+    case 46:
+      ACCEPT_TOKEN(aux_sym_identifier_token1);
+      if (lookahead == 'o') ADVANCE(48);
       if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
+          lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(57);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
-      END_STATE();
-    case 59:
-      ACCEPT_TOKEN(ts_builtin_sym_end);
-      END_STATE();
-    case 60:
-      ACCEPT_TOKEN(anon_sym_package);
-      END_STATE();
-    case 61:
-      ACCEPT_TOKEN(anon_sym_import);
-      END_STATE();
-    case 62:
-      ACCEPT_TOKEN(anon_sym_class);
-      END_STATE();
-    case 63:
-      ACCEPT_TOKEN(anon_sym_LPAREN);
-      END_STATE();
-    case 64:
-      ACCEPT_TOKEN(anon_sym_COMMA);
-      END_STATE();
-    case 65:
-      ACCEPT_TOKEN(anon_sym_RPAREN);
-      END_STATE();
-    case 66:
-      ACCEPT_TOKEN(anon_sym_trait);
-      END_STATE();
-    case 67:
-      ACCEPT_TOKEN(anon_sym_enum);
-      END_STATE();
-    case 68:
-      ACCEPT_TOKEN(anon_sym_LBRACE);
-      END_STATE();
-    case 69:
-      ACCEPT_TOKEN(anon_sym_RBRACE);
-      END_STATE();
-    case 70:
-      ACCEPT_TOKEN(anon_sym_fun);
-      END_STATE();
-    case 71:
-      ACCEPT_TOKEN(anon_sym_EQ_GT);
-      END_STATE();
-    case 72:
-      ACCEPT_TOKEN(anon_sym_AT);
-      END_STATE();
-    case 73:
-      ACCEPT_TOKEN(anon_sym_COLON);
-      END_STATE();
-    case 74:
-      ACCEPT_TOKEN(anon_sym_LT);
-      END_STATE();
-    case 75:
-      ACCEPT_TOKEN(anon_sym_GT);
-      END_STATE();
-    case 76:
-      ACCEPT_TOKEN(anon_sym_QMARK);
-      END_STATE();
-    case 77:
-      ACCEPT_TOKEN(anon_sym_val);
-      END_STATE();
-    case 78:
-      ACCEPT_TOKEN(anon_sym_DOT);
       END_STATE();
-    case 79:
+    case 47:
-      ACCEPT_TOKEN(aux_sym_url_token1);
+      ACCEPT_TOKEN(aux_sym_identifier_token1);
+      if (lookahead == 'p') ADVANCE(45);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
           lookahead == '_' ||
-          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(79);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
-      END_STATE();
-    case 80:
-      ACCEPT_TOKEN(anon_sym_SLASH);
-      END_STATE();
-    case 81:
-      ACCEPT_TOKEN(sym_definition_name);
-      if (('A' <= lookahead && lookahead <= 'F')) ADVANCE(84);
-      if (('a' <= lookahead && lookahead <= 'f')) ADVANCE(82);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(56);
-      if (('G' <= lookahead && lookahead <= 'Z')) ADVANCE(86);
-      if (('g' <= lookahead && lookahead <= 'z')) ADVANCE(85);
       END_STATE();
-    case 82:
+    case 48:
-      ACCEPT_TOKEN(sym_definition_name);
+      ACCEPT_TOKEN(aux_sym_identifier_token1);
-      if (('A' <= lookahead && lookahead <= 'F')) ADVANCE(86);
+      if (lookahead == 'r') ADVANCE(43);
-      if (('a' <= lookahead && lookahead <= 'f')) ADVANCE(85);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(112);
-      if (('G' <= lookahead && lookahead <= 'Z')) ADVANCE(86);
-      if (('g' <= lookahead && lookahead <= 'z')) ADVANCE(85);
-      END_STATE();
-    case 83:
-      ACCEPT_TOKEN(sym_definition_name);
-      if (('a' <= lookahead && lookahead <= 'f')) ADVANCE(81);
       if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
+          lookahead == '_' ||
-          ('A' <= lookahead && lookahead <= 'F')) ADVANCE(91);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
-      if (('g' <= lookahead && lookahead <= 'z')) ADVANCE(85);
-      if (('G' <= lookahead && lookahead <= 'Z') ||
-          lookahead == '_') ADVANCE(92);
       END_STATE();
-    case 84:
+    case 49:
-      ACCEPT_TOKEN(sym_definition_name);
+      ACCEPT_TOKEN(aux_sym_identifier_token1);
-      if (('a' <= lookahead && lookahead <= 'f')) ADVANCE(85);
+      if (lookahead == 'y') ADVANCE(47);
       if (('0' <= lookahead && lookahead <= '9') ||
+          ('A' <= lookahead && lookahead <= 'Z') ||
+          lookahead == '_' ||
-          ('A' <= lookahead && lookahead <= 'F')) ADVANCE(112);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
-      if (('g' <= lookahead && lookahead <= 'z')) ADVANCE(85);
-      END_STATE();
-    case 85:
-      ACCEPT_TOKEN(sym_definition_name);
-      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(86);
-      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(85);
-      END_STATE();
-    case 86:
-      ACCEPT_TOKEN(sym_definition_name);
-      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(85);
       END_STATE();
-    case 87:
+    case 50:
-      ACCEPT_TOKEN(sym_definition_name);
+      ACCEPT_TOKEN(aux_sym_identifier_token1);
-      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(85);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
-          lookahead == '_') ADVANCE(92);
+          lookahead == '_' ||
-      END_STATE();
-    case 88:
-      ACCEPT_TOKEN(sym_variable_name);
-      if (('A' <= lookahead && lookahead <= 'Z')) ADVANCE(89);
-      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(88);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(50);
-      END_STATE();
-    case 89:
-      ACCEPT_TOKEN(sym_variable_name);
-      if (('a' <= lookahead && lookahead <= 'z')) ADVANCE(88);
       END_STATE();
-    case 90:
+    case 51:
-      ACCEPT_TOKEN(sym_enum_field_name);
+      ACCEPT_TOKEN(sym__discard_name);
-      if (('a' <= lookahead && lookahead <= 'f')) ADVANCE(112);
       if (('0' <= lookahead && lookahead <= '9') ||
+          lookahead == '_' ||
-          ('A' <= lookahead && lookahead <= 'F')) ADVANCE(92);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(51);
-      if (('G' <= lookahead && lookahead <= 'Z') ||
-          lookahead == '_') ADVANCE(92);
       END_STATE();
-    case 91:
+    case 52:
-      ACCEPT_TOKEN(sym_enum_field_name);
+      ACCEPT_TOKEN(sym__name);
-      if (('a' <= lookahead && lookahead <= 'f')) ADVANCE(56);
       if (('0' <= lookahead && lookahead <= '9') ||
+          lookahead == '_' ||
-          ('A' <= lookahead && lookahead <= 'F')) ADVANCE(90);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(52);
-      if (('G' <= lookahead && lookahead <= 'Z') ||
-          lookahead == '_') ADVANCE(92);
       END_STATE();
-    case 92:
+    case 53:
-      ACCEPT_TOKEN(sym_enum_field_name);
+      ACCEPT_TOKEN(sym__upname);
       if (('0' <= lookahead && lookahead <= '9') ||
           ('A' <= lookahead && lookahead <= 'Z') ||
-          lookahead == '_') ADVANCE(92);
-      END_STATE();
-    case 93:
-      ACCEPT_TOKEN(anon_sym_true);
-      END_STATE();
-    case 94:
-      ACCEPT_TOKEN(anon_sym_false);
-      END_STATE();
-    case 95:
-      ACCEPT_TOKEN(sym_integer_literal);
-      if (lookahead == '.') ADVANCE(54);
-      if (lookahead == '_') ADVANCE(12);
-      if (lookahead == 'B' ||
-          lookahead == 'b') ADVANCE(53);
-      if (lookahead == 'F' ||
-          lookahead == 'f') ADVANCE(105);
-      if (lookahead == 'X' ||
-          lookahead == 'x') ADVANCE(55);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(96);
-      END_STATE();
-    case 96:
-      ACCEPT_TOKEN(sym_integer_literal);
-      if (lookahead == '.') ADVANCE(54);
-      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(9);
-      if (lookahead == 'B' ||
-          lookahead == 'b') ADVANCE(52);
-      if (lookahead == 'X' ||
-          lookahead == 'x') ADVANCE(55);
-      if (('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(57);
+          ('a' <= lookahead && lookahead <= 'z')) ADVANCE(53);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(101);
-      END_STATE();
-    case 98:
-      ACCEPT_TOKEN(sym_integer_literal);
-      if (lookahead == '_') ADVANCE(9);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(98);
-      END_STATE();
-    case 99:
-      ACCEPT_TOKEN(sym_integer_literal);
-      if (lookahead == '_') ADVANCE(9);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(98);
-      if (('A' <= lookahead && lookahead <= 'F') ||
-          ('a' <= lookahead && lookahead <= 'f')) ADVANCE(112);
-      END_STATE();
-    case 100:
-      ACCEPT_TOKEN(sym_integer_literal);
-      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(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(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(10);
-      END_STATE();
-    case 104:
-      ACCEPT_TOKEN(sym_bin_literal);
-      if (lookahead == '_') ADVANCE(10);
-      if (('0' <= lookahead && lookahead <= '9') ||
-          ('A' <= lookahead && lookahead <= 'F') ||
-          ('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(13);
-      if (lookahead == 'F' ||
-          lookahead == 'f') ADVANCE(105);
-      if (('0' <= lookahead && lookahead <= '9')) ADVANCE(106);
-      END_STATE();
-    case 107:
-      ACCEPT_TOKEN(anon_sym_SQUOTE);
-      END_STATE();
-    case 108:
-      ACCEPT_TOKEN(aux_sym_character_literal_token1);
-      END_STATE();
-    case 109:
-      ACCEPT_TOKEN(aux_sym_character_literal_token1);
-      if (lookahead == '#') ADVANCE(110);
-      if (lookahead == '\t' ||
-          lookahead == ' ') ADVANCE(109);
-      if (lookahead != 0 &&
-          lookahead != '\n' &&
-          lookahead != '\r' &&
-          lookahead != '\'' &&
-          lookahead != '\\') ADVANCE(108);
-      END_STATE();
-    case 110:
-      ACCEPT_TOKEN(aux_sym_character_literal_token1);
-      if (lookahead != 0 &&
-          lookahead != '\n') ADVANCE(125);
-      END_STATE();
-    case 111:
-      ACCEPT_TOKEN(anon_sym_BSLASHu);
-      END_STATE();
-    case 112:
-      ACCEPT_TOKEN(aux_sym__uni_character_literal_token1);
-      END_STATE();
-    case 113:
-      ACCEPT_TOKEN(sym__escaped_identifier);
-      END_STATE();
-    case 114:
-      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(122);
-      END_STATE();
-    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(118);
-      if (lookahead != 0 &&
-          (lookahead < '"' || '$' < lookahead) &&
-          lookahead != '\\') ADVANCE(119);
-      END_STATE();
-    case 119:
-      ACCEPT_TOKEN(sym__line_str_text);
-      if (lookahead != 0 &&
-          lookahead != '"' &&
-          lookahead != '$' &&
-          lookahead != '\\') ADVANCE(119);
-      END_STATE();
-    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(116);
-      if (lookahead == '\t' ||
-          lookahead == '\n' ||
-          lookahead == '\r' ||
-          lookahead == ' ') ADVANCE(121);
-      if (lookahead != 0 &&
-          (lookahead < '"' || '$' < lookahead)) ADVANCE(122);
-      END_STATE();
-    case 122:
-      ACCEPT_TOKEN(sym__multi_line_str_text);
-      if (lookahead != 0 &&
-          lookahead != '"' &&
-          lookahead != '$') ADVANCE(122);
-      END_STATE();
-    case 123:
-      ACCEPT_TOKEN(anon_sym_DOLLAR);
-      END_STATE();
-    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;
@@ -2261,39 +789,39 @@ 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 = 1},
+  [2] = {.lex_state = 0},
   [3] = {.lex_state = 0},
-  [4] = {.lex_state = 1},
+  [4] = {.lex_state = 22},
-  [5] = {.lex_state = 1},
+  [5] = {.lex_state = 0},
   [6] = {.lex_state = 0},
   [7] = {.lex_state = 0},
   [8] = {.lex_state = 0},
   [9] = {.lex_state = 0},
-  [10] = {.lex_state = 0},
+  [10] = {.lex_state = 22},
-  [11] = {.lex_state = 2},
+  [11] = {.lex_state = 22},
-  [12] = {.lex_state = 2},
+  [12] = {.lex_state = 22},
-  [13] = {.lex_state = 2},
+  [13] = {.lex_state = 22},
   [14] = {.lex_state = 0},
-  [15] = {.lex_state = 0},
+  [15] = {.lex_state = 22},
   [16] = {.lex_state = 0},
   [17] = {.lex_state = 0},
-  [18] = {.lex_state = 0},
+  [18] = {.lex_state = 22},
-  [19] = {.lex_state = 0},
+  [19] = {.lex_state = 20},
   [20] = {.lex_state = 0},
-  [21] = {.lex_state = 3},
+  [21] = {.lex_state = 0},
-  [22] = {.lex_state = 3},
+  [22] = {.lex_state = 0},
-  [23] = {.lex_state = 3},
+  [23] = {.lex_state = 20},
-  [24] = {.lex_state = 0},
+  [24] = {.lex_state = 20},
   [25] = {.lex_state = 0},
   [26] = {.lex_state = 0},
   [27] = {.lex_state = 0},
-  [28] = {.lex_state = 0},
+  [28] = {.lex_state = 22},
-  [29] = {.lex_state = 0},
+  [29] = {.lex_state = 20},
   [30] = {.lex_state = 0},
   [31] = {.lex_state = 0},
   [32] = {.lex_state = 0},
   [33] = {.lex_state = 0},
-  [34] = {.lex_state = 0},
+  [34] = {.lex_state = 22},
   [35] = {.lex_state = 0},
   [36] = {.lex_state = 0},
   [37] = {.lex_state = 0},
@@ -2301,7 +829,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [39] = {.lex_state = 0},
   [40] = {.lex_state = 0},
   [41] = {.lex_state = 0},
-  [42] = {.lex_state = 0},
+  [42] = {.lex_state = 22},
   [43] = {.lex_state = 0},
   [44] = {.lex_state = 0},
   [45] = {.lex_state = 0},
@@ -2312,3795 +840,916 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [50] = {.lex_state = 0},
   [51] = {.lex_state = 0},
   [52] = {.lex_state = 0},
-  [53] = {.lex_state = 0},
+  [53] = {.lex_state = 20},
   [54] = {.lex_state = 0},
   [55] = {.lex_state = 0},
   [56] = {.lex_state = 0},
   [57] = {.lex_state = 0},
-  [58] = {.lex_state = 0},
+  [58] = {.lex_state = 20},
   [59] = {.lex_state = 0},
   [60] = {.lex_state = 0},
   [61] = {.lex_state = 0},
   [62] = {.lex_state = 0},
-  [63] = {.lex_state = 0},
+  [63] = {.lex_state = 20},
   [64] = {.lex_state = 0},
-  [65] = {.lex_state = 0},
+  [65] = {.lex_state = 21},
-  [66] = {.lex_state = 0},
+  [66] = {.lex_state = 20},
   [67] = {.lex_state = 0},
-  [68] = {.lex_state = 0},
+  [68] = {.lex_state = 20},
   [69] = {.lex_state = 0},
   [70] = {.lex_state = 0},
   [71] = {.lex_state = 0},
   [72] = {.lex_state = 0},
   [73] = {.lex_state = 0},
   [74] = {.lex_state = 0},
-  [75] = {.lex_state = 0},
+  [75] = {.lex_state = 20},
-  [76] = {.lex_state = 0},
+  [76] = {.lex_state = 20},
-  [77] = {.lex_state = 0},
+  [77] = {.lex_state = 21},
-  [78] = {.lex_state = 0},
+  [78] = {.lex_state = 20},
   [79] = {.lex_state = 0},
-  [80] = {.lex_state = 0},
+  [80] = {.lex_state = 20},
   [81] = {.lex_state = 0},
   [82] = {.lex_state = 0},
   [83] = {.lex_state = 0},
-  [84] = {.lex_state = 0},
+  [84] = {.lex_state = 21},
   [85] = {.lex_state = 0},
-  [86] = {.lex_state = 2},
-  [87] = {.lex_state = 2},
-  [88] = {.lex_state = 2},
-  [89] = {.lex_state = 2},
-  [90] = {.lex_state = 0},
-  [91] = {.lex_state = 0},
-  [92] = {.lex_state = 0},
-  [93] = {.lex_state = 0},
-  [94] = {.lex_state = 0},
-  [95] = {.lex_state = 0},
-  [96] = {.lex_state = 0},
-  [97] = {.lex_state = 7},
-  [98] = {.lex_state = 0},
-  [99] = {.lex_state = 0},
-  [100] = {.lex_state = 1},
-  [101] = {.lex_state = 1},
-  [102] = {.lex_state = 0},
-  [103] = {.lex_state = 0},
-  [104] = {.lex_state = 3},
-  [105] = {.lex_state = 1},
-  [106] = {.lex_state = 0},
-  [107] = {.lex_state = 1},
-  [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 = 1},
-  [116] = {.lex_state = 0},
-  [117] = {.lex_state = 0},
-  [118] = {.lex_state = 1},
-  [119] = {.lex_state = 0},
-  [120] = {.lex_state = 0},
-  [121] = {.lex_state = 0},
-  [122] = {.lex_state = 1},
-  [123] = {.lex_state = 1},
-  [124] = {.lex_state = 1},
-  [125] = {.lex_state = 0},
-  [126] = {.lex_state = 0},
-  [127] = {.lex_state = 0},
-  [128] = {.lex_state = 1},
-  [129] = {.lex_state = 1},
-  [130] = {.lex_state = 0},
-  [131] = {.lex_state = 0},
-  [132] = {.lex_state = 0},
-  [133] = {.lex_state = 0},
-  [134] = {.lex_state = 0},
-  [135] = {.lex_state = 0},
-  [136] = {.lex_state = 1},
-  [137] = {.lex_state = 1},
-  [138] = {.lex_state = 1},
-  [139] = {.lex_state = 0},
-  [140] = {.lex_state = 0},
-  [141] = {.lex_state = 0},
-  [142] = {.lex_state = 3},
-  [143] = {.lex_state = 0},
-  [144] = {.lex_state = 0},
-  [145] = {.lex_state = 0},
-  [146] = {.lex_state = 0},
-  [147] = {.lex_state = 4},
-  [148] = {.lex_state = 5},
-  [149] = {.lex_state = 0},
-  [150] = {.lex_state = 0},
-  [151] = {.lex_state = 0},
-  [152] = {.lex_state = 0},
-  [153] = {.lex_state = 0},
-  [154] = {.lex_state = 0},
-  [155] = {.lex_state = 0},
-  [156] = {.lex_state = 0},
-  [157] = {.lex_state = 5},
-  [158] = {.lex_state = 0},
-  [159] = {.lex_state = 0},
-  [160] = {.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 = 0},
-  [169] = {.lex_state = 0},
-  [170] = {.lex_state = 0},
-  [171] = {.lex_state = 0},
-  [172] = {.lex_state = 0},
-  [173] = {.lex_state = 0},
-  [174] = {.lex_state = 0},
-  [175] = {.lex_state = 0},
-  [176] = {.lex_state = 0},
-  [177] = {.lex_state = 0},
-  [178] = {.lex_state = 0},
-  [179] = {.lex_state = 5},
-  [180] = {.lex_state = 0},
-  [181] = {.lex_state = 0},
-  [182] = {.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 = 0},
-  [191] = {.lex_state = 0},
-  [192] = {.lex_state = 4},
-  [193] = {.lex_state = 0},
-  [194] = {.lex_state = 0},
-  [195] = {.lex_state = 0},
-  [196] = {.lex_state = 4},
-  [197] = {.lex_state = 0},
-  [198] = {.lex_state = 0},
-  [199] = {.lex_state = 0},
-  [200] = {.lex_state = 0},
-  [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] = {
   [0] = {
     [ts_builtin_sym_end] = ACTIONS(1),
-    [anon_sym_package] = ACTIONS(1),
+    [anon_sym_module] = ACTIONS(1),
     [anon_sym_import] = ACTIONS(1),
+    [anon_sym_DOT] = ACTIONS(1),
-    [anon_sym_class] = ACTIONS(1),
+    [anon_sym_as] = ACTIONS(1),
-    [anon_sym_LPAREN] = ACTIONS(1),
+    [anon_sym_SLASH] = ACTIONS(1),
-    [anon_sym_COMMA] = ACTIONS(1),
-    [anon_sym_RPAREN] = ACTIONS(1),
-    [anon_sym_trait] = ACTIONS(1),
-    [anon_sym_enum] = ACTIONS(1),
     [anon_sym_LBRACE] = ACTIONS(1),
+    [anon_sym_COMMA] = ACTIONS(1),
     [anon_sym_RBRACE] = ACTIONS(1),
+    [anon_sym_record] = ACTIONS(1),
-    [anon_sym_fun] = ACTIONS(1),
+    [anon_sym_type] = ACTIONS(1),
-    [anon_sym_EQ_GT] = ACTIONS(1),
-    [anon_sym_AT] = ACTIONS(1),
+    [anon_sym_EQ] = ACTIONS(1),
+    [anon_sym_PIPE] = ACTIONS(1),
+    [anon_sym_LPAREN] = ACTIONS(1),
+    [anon_sym_RPAREN] = ACTIONS(1),
     [anon_sym_COLON] = ACTIONS(1),
-    [anon_sym_LT] = ACTIONS(1),
-    [anon_sym_GT] = ACTIONS(1),
-    [anon_sym_QMARK] = ACTIONS(1),
-    [anon_sym_val] = ACTIONS(1),
-    [anon_sym_DOT] = ACTIONS(1),
-    [anon_sym_SLASH] = ACTIONS(1),
-    [sym_definition_name] = ACTIONS(1),
+    [sym__discard_name] = ACTIONS(1),
-    [sym_enum_field_name] = ACTIONS(1),
-    [anon_sym_true] = ACTIONS(1),
-    [anon_sym_false] = ACTIONS(1),
-    [sym_integer_literal] = ACTIONS(1),
-    [sym_hex_literal] = ACTIONS(1),
-    [sym_bin_literal] = ACTIONS(1),
-    [anon_sym_SQUOTE] = ACTIONS(1),
-    [anon_sym_BSLASHu] = ACTIONS(1),
-    [aux_sym__uni_character_literal_token1] = ACTIONS(1),
-    [sym__escaped_identifier] = ACTIONS(1),
-    [anon_sym_DQUOTE] = ACTIONS(1),
-    [anon_sym_BQUOTE] = ACTIONS(1),
-    [anon_sym_DOLLAR] = ACTIONS(1),
-    [anon_sym_null] = ACTIONS(1),
-    [sym_comment] = ACTIONS(3),
+    [sym__upname] = ACTIONS(1),
   },
   [1] = {
-    [sym_source_file] = STATE(306),
+    [sym_source_file] = STATE(82),
+    [sym_module] = STATE(3),
-    [anon_sym_package] = ACTIONS(5),
+    [anon_sym_module] = ACTIONS(3),
-    [sym_comment] = ACTIONS(3),
   },
 };
 static const uint16_t ts_small_parse_table[] = {
-  [0] = 9,
+  [0] = 1,
-    ACTIONS(3), 1,
+    ACTIONS(5), 9,
+      ts_builtin_sym_end,
-      sym_comment,
+      anon_sym_import,
+      anon_sym_as,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+      anon_sym_record,
-    ACTIONS(7), 1,
+      anon_sym_type,
       anon_sym_RPAREN,
-    ACTIONS(11), 1,
-      sym_integer_literal,
-    ACTIONS(15), 1,
-      anon_sym_SQUOTE,
+      anon_sym_COLON,
+  [12] = 6,
-    ACTIONS(17), 1,
+    ACTIONS(7), 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,
+    ACTIONS(9), 1,
       anon_sym_import,
-    ACTIONS(25), 1,
-      anon_sym_class,
-    ACTIONS(27), 1,
-      anon_sym_trait,
-    ACTIONS(29), 1,
-      anon_sym_enum,
-    ACTIONS(31), 1,
+    ACTIONS(11), 1,
-      anon_sym_fun,
+      anon_sym_record,
-    ACTIONS(33), 1,
+    ACTIONS(13), 1,
-      anon_sym_AT,
+      anon_sym_type,
-    STATE(6), 2,
+    STATE(5), 2,
-      sym_import_statement,
+      sym_import,
       aux_sym_source_file_repeat1,
-    STATE(8), 2,
+    STATE(16), 3,
-      sym_definitions,
+      sym_record,
+      sym_type,
       aux_sym_source_file_repeat2,
-    STATE(90), 2,
-      sym_decorator_name,
-      aux_sym_class_definition_repeat1,
-    STATE(26), 4,
-      sym_class_definition,
-      sym_trait_definition,
-      sym_enum_definition,
-      sym_fun_definition,
-  [81] = 8,
+  [34] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(15), 1,
-      anon_sym_SQUOTE,
-    ACTIONS(17), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(19), 1,
-      anon_sym_BQUOTE,
-    ACTIONS(35), 1,
-      sym_integer_literal,
-    ACTIONS(9), 2,
-      anon_sym_true,
-      anon_sym_false,
-    ACTIONS(37), 4,
-      sym_hex_literal,
-      sym_bin_literal,
-      sym_float_literal,
-      anon_sym_null,
-    STATE(245), 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,
-  [116] = 8,
-    ACTIONS(3), 1,
-      sym_comment,
     ACTIONS(15), 1,
-      anon_sym_SQUOTE,
+      ts_builtin_sym_end,
-    ACTIONS(17), 1,
-      anon_sym_DQUOTE,
     ACTIONS(19), 1,
-      anon_sym_BQUOTE,
+      anon_sym_LPAREN,
-    ACTIONS(39), 1,
-      sym_integer_literal,
-    ACTIONS(9), 2,
-      anon_sym_true,
-      anon_sym_false,
-    ACTIONS(41), 4,
-      sym_hex_literal,
-      sym_bin_literal,
-      sym_float_literal,
-      anon_sym_null,
-    STATE(191), 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,
-  [151] = 12,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(23), 1,
+    ACTIONS(21), 1,
+      aux_sym_identifier_token1,
+    STATE(12), 1,
+      sym_generic_list,
+    STATE(83), 1,
+      sym_identifier,
+    ACTIONS(17), 2,
+      anon_sym_record,
+      anon_sym_type,
+    STATE(11), 2,
+      sym_type_field,
+      aux_sym_record_repeat1,
+  [58] = 6,
+    ACTIONS(9), 1,
       anon_sym_import,
+    ACTIONS(11), 1,
+      anon_sym_record,
+    ACTIONS(13), 1,
+      anon_sym_type,
-    ACTIONS(25), 1,
+    ACTIONS(23), 1,
-      anon_sym_class,
-    ACTIONS(27), 1,
-      anon_sym_trait,
-    ACTIONS(29), 1,
-      anon_sym_enum,
-    ACTIONS(31), 1,
-      anon_sym_fun,
-    ACTIONS(33), 1,
-      anon_sym_AT,
-    ACTIONS(43), 1,
       ts_builtin_sym_end,
-    STATE(7), 2,
-      sym_definitions,
-      aux_sym_source_file_repeat2,
-    STATE(16), 2,
+    STATE(20), 2,
-      sym_import_statement,
+      sym_import,
       aux_sym_source_file_repeat1,
-    STATE(90), 2,
-      sym_decorator_name,
-      aux_sym_class_definition_repeat1,
-    STATE(26), 4,
+    STATE(21), 3,
-      sym_class_definition,
-      sym_trait_definition,
-      sym_enum_definition,
-      sym_fun_definition,
+      sym_record,
-  [194] = 10,
-    ACTIONS(3), 1,
-      sym_comment,
+      sym_type,
-    ACTIONS(25), 1,
-      anon_sym_class,
-    ACTIONS(27), 1,
-      anon_sym_trait,
-    ACTIONS(29), 1,
-      anon_sym_enum,
-    ACTIONS(31), 1,
-      anon_sym_fun,
-    ACTIONS(33), 1,
-      anon_sym_AT,
-    ACTIONS(45), 1,
-      ts_builtin_sym_end,
-    STATE(9), 2,
-      sym_definitions,
       aux_sym_source_file_repeat2,
-    STATE(90), 2,
-      sym_decorator_name,
-      aux_sym_class_definition_repeat1,
-    STATE(26), 4,
-      sym_class_definition,
-      sym_trait_definition,
-      sym_enum_definition,
-      sym_fun_definition,
-  [230] = 10,
+  [80] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(25), 1,
-      anon_sym_class,
     ACTIONS(27), 1,
-      anon_sym_trait,
-    ACTIONS(29), 1,
-      anon_sym_enum,
-    ACTIONS(31), 1,
-      anon_sym_fun,
-    ACTIONS(33), 1,
-      anon_sym_AT,
+      anon_sym_SLASH,
-    ACTIONS(43), 1,
-      ts_builtin_sym_end,
-    STATE(9), 2,
+    STATE(9), 1,
-      sym_definitions,
-      aux_sym_source_file_repeat2,
+      aux_sym_module_name_repeat1,
-    STATE(90), 2,
-      sym_decorator_name,
-      aux_sym_class_definition_repeat1,
-    STATE(26), 4,
-      sym_class_definition,
-      sym_trait_definition,
-      sym_enum_definition,
-      sym_fun_definition,
-  [266] = 10,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(47), 1,
-      ts_builtin_sym_end,
-    ACTIONS(49), 1,
-      anon_sym_class,
-    ACTIONS(52), 1,
-      anon_sym_trait,
-    ACTIONS(55), 1,
+    ACTIONS(25), 6,
-      anon_sym_enum,
-    ACTIONS(58), 1,
-      anon_sym_fun,
-    ACTIONS(61), 1,
-      anon_sym_AT,
-    STATE(9), 2,
-      sym_definitions,
-      aux_sym_source_file_repeat2,
-    STATE(90), 2,
-      sym_decorator_name,
-      aux_sym_class_definition_repeat1,
-    STATE(26), 4,
-      sym_class_definition,
-      sym_trait_definition,
-      sym_enum_definition,
-      sym_fun_definition,
-  [302] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(64), 12,
       ts_builtin_sym_end,
       anon_sym_import,
-      anon_sym_class,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-      anon_sym_LT,
-      anon_sym_GT,
       anon_sym_DOT,
+      anon_sym_as,
+      anon_sym_record,
+      anon_sym_type,
-  [320] = 8,
+  [95] = 1,
-    ACTIONS(66), 1,
-      anon_sym_BSLASHu,
-    ACTIONS(69), 1,
+    ACTIONS(29), 8,
-      sym__escaped_identifier,
+      ts_builtin_sym_end,
+      anon_sym_as,
-    ACTIONS(72), 1,
+      anon_sym_COMMA,
-      anon_sym_DQUOTE,
+      anon_sym_RBRACE,
-    ACTIONS(74), 1,
+      anon_sym_record,
-      sym__line_str_text,
+      anon_sym_type,
+      anon_sym_PIPE,
+      anon_sym_LPAREN,
+  [106] = 3,
-    ACTIONS(77), 1,
+    ACTIONS(27), 1,
-      anon_sym_DOLLAR,
-    ACTIONS(80), 1,
-      sym_comment,
-    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,
-  [348] = 8,
-    ACTIONS(80), 1,
-      sym_comment,
-    ACTIONS(82), 1,
-      anon_sym_BSLASHu,
-    ACTIONS(84), 1,
-      sym__escaped_identifier,
-    ACTIONS(86), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(88), 1,
-      sym__line_str_text,
-    ACTIONS(90), 1,
-      anon_sym_DOLLAR,
-    STATE(89), 1,
-      sym__uni_character_literal,
-    STATE(13), 4,
-      sym_character_escape_seq,
-      sym__line_string_content,
-      sym__interpolation,
-      aux_sym_line_string_literal_repeat1,
-  [376] = 8,
-    ACTIONS(80), 1,
-      sym_comment,
-    ACTIONS(82), 1,
-      anon_sym_BSLASHu,
-    ACTIONS(84), 1,
-      sym__escaped_identifier,
-    ACTIONS(90), 1,
-      anon_sym_DOLLAR,
-    ACTIONS(92), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(94), 1,
-      sym__line_str_text,
-    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,
-  [404] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(98), 1,
       anon_sym_SLASH,
-    STATE(14), 1,
+    STATE(6), 1,
-      aux_sym_url_repeat1,
+      aux_sym_module_name_repeat1,
-    ACTIONS(96), 7,
+    ACTIONS(31), 6,
       ts_builtin_sym_end,
       anon_sym_import,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
+      anon_sym_DOT,
+      anon_sym_as,
+      anon_sym_record,
+      anon_sym_type,
-  [423] = 4,
+  [121] = 3,
-    ACTIONS(3), 1,
+    ACTIONS(35), 1,
-      sym_comment,
-    ACTIONS(103), 1,
       anon_sym_SLASH,
-    STATE(14), 1,
+    STATE(9), 1,
-      aux_sym_url_repeat1,
+      aux_sym_module_name_repeat1,
-    ACTIONS(101), 7,
+    ACTIONS(33), 6,
       ts_builtin_sym_end,
       anon_sym_import,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
+      anon_sym_DOT,
+      anon_sym_as,
+      anon_sym_record,
+      anon_sym_type,
-  [442] = 4,
+  [136] = 2,
-    ACTIONS(3), 1,
+    ACTIONS(38), 3,
-      sym_comment,
-    ACTIONS(107), 1,
-      anon_sym_import,
+      anon_sym_record,
-    STATE(16), 2,
-      sym_import_statement,
+      anon_sym_type,
-      aux_sym_source_file_repeat1,
+      aux_sym_identifier_token1,
-    ACTIONS(105), 6,
+    ACTIONS(29), 5,
       ts_builtin_sym_end,
-      anon_sym_class,
+      anon_sym_COMMA,
-      anon_sym_trait,
+      anon_sym_RBRACE,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
+      anon_sym_EQ,
+      anon_sym_LPAREN,
-  [461] = 4,
+  [149] = 5,
-    ACTIONS(3), 1,
+    ACTIONS(21), 1,
-      sym_comment,
+      aux_sym_identifier_token1,
-    ACTIONS(103), 1,
+    ACTIONS(40), 1,
-      anon_sym_SLASH,
-    STATE(15), 1,
-      aux_sym_url_repeat1,
-    ACTIONS(110), 7,
       ts_builtin_sym_end,
+    STATE(83), 1,
+      sym_identifier,
+    ACTIONS(42), 2,
-      anon_sym_import,
+      anon_sym_record,
-      anon_sym_class,
-      anon_sym_trait,
+      anon_sym_type,
-      anon_sym_enum,
+    STATE(13), 2,
-      anon_sym_fun,
+      sym_type_field,
-      anon_sym_AT,
+      aux_sym_record_repeat1,
-  [480] = 2,
+  [167] = 5,
-    ACTIONS(3), 1,
+    ACTIONS(21), 1,
-      sym_comment,
+      aux_sym_identifier_token1,
-    ACTIONS(96), 8,
+    ACTIONS(44), 1,
       ts_builtin_sym_end,
+    STATE(83), 1,
+      sym_identifier,
+    ACTIONS(46), 2,
-      anon_sym_import,
+      anon_sym_record,
-      anon_sym_class,
-      anon_sym_trait,
+      anon_sym_type,
-      anon_sym_enum,
+    STATE(15), 2,
-      anon_sym_fun,
+      sym_type_field,
-      anon_sym_AT,
-      anon_sym_SLASH,
+      aux_sym_record_repeat1,
-  [494] = 2,
+  [185] = 5,
-    ACTIONS(3), 1,
+    ACTIONS(48), 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,
-  [507] = 2,
-    ACTIONS(3), 1,
+    ACTIONS(52), 1,
+      aux_sym_identifier_token1,
+    STATE(83), 1,
-      sym_comment,
+      sym_identifier,
+    ACTIONS(50), 2,
+      anon_sym_record,
+      anon_sym_type,
+    STATE(13), 2,
+      sym_type_field,
+      aux_sym_record_repeat1,
+  [203] = 1,
-    ACTIONS(114), 7,
+    ACTIONS(33), 7,
       ts_builtin_sym_end,
       anon_sym_import,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [520] = 5,
-    ACTIONS(80), 1,
-      sym_comment,
-    ACTIONS(119), 1,
-      anon_sym_BQUOTE,
-    ACTIONS(121), 1,
-      anon_sym_DOLLAR,
-    ACTIONS(116), 2,
-      anon_sym_DQUOTE,
-      sym__multi_line_str_text,
-    STATE(21), 3,
-      sym__multi_line_string_content,
-      sym__interpolation,
-      aux_sym_multi_line_string_literal_repeat1,
-  [539] = 5,
-    ACTIONS(80), 1,
-      sym_comment,
-    ACTIONS(126), 1,
-      anon_sym_BQUOTE,
-    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(130), 2,
-      anon_sym_DQUOTE,
-      sym__multi_line_str_text,
-    STATE(21), 3,
-      sym__multi_line_string_content,
-      sym__interpolation,
-      aux_sym_multi_line_string_literal_repeat1,
-  [577] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(134), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [589] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(136), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [601] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(138), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [613] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(140), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [625] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(142), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [637] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(144), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [649] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(146), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [661] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(148), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [673] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(150), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [685] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(152), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [697] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(154), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [709] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(156), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [721] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(158), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [733] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(160), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [745] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(162), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [757] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(164), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [769] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(166), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [781] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(168), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [793] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(170), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [805] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(172), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [817] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(174), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [829] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(176), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [841] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(178), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [853] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(180), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [865] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(182), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [877] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(184), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [889] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(186), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [901] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(188), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [913] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(190), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [925] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(192), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [937] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(194), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [949] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(196), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [961] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(198), 6,
-      ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [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,
+      anon_sym_DOT,
+      anon_sym_as,
+      anon_sym_SLASH,
+      anon_sym_record,
+      anon_sym_type,
+  [213] = 5,
+    ACTIONS(21), 1,
+      aux_sym_identifier_token1,
+    ACTIONS(55), 1,
       ts_builtin_sym_end,
+    STATE(83), 1,
+      sym_identifier,
+    ACTIONS(57), 2,
-      anon_sym_class,
+      anon_sym_record,
-      anon_sym_trait,
+      anon_sym_type,
+    STATE(13), 2,
+      sym_type_field,
+      aux_sym_record_repeat1,
+  [231] = 4,
+    ACTIONS(11), 1,
-      anon_sym_enum,
+      anon_sym_record,
-      anon_sym_fun,
-      anon_sym_AT,
-  [1117] = 2,
-    ACTIONS(3), 1,
+    ACTIONS(13), 1,
-      sym_comment,
+      anon_sym_type,
-    ACTIONS(224), 6,
+    ACTIONS(23), 1,
       ts_builtin_sym_end,
+    STATE(22), 3,
-      anon_sym_class,
+      sym_record,
-      anon_sym_trait,
+      sym_type,
+      aux_sym_source_file_repeat2,
+  [246] = 3,
-      anon_sym_enum,
+    ACTIONS(61), 1,
-      anon_sym_fun,
-      anon_sym_AT,
+      anon_sym_DOT,
-  [1129] = 2,
-    ACTIONS(3), 1,
+    ACTIONS(63), 1,
-      sym_comment,
+      anon_sym_as,
-    ACTIONS(226), 6,
+    ACTIONS(59), 4,
       ts_builtin_sym_end,
-      anon_sym_class,
+      anon_sym_import,
+      anon_sym_record,
-      anon_sym_trait,
+      anon_sym_type,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [1141] = 2,
+  [259] = 2,
-    ACTIONS(3), 1,
+    ACTIONS(65), 3,
-      sym_comment,
-    ACTIONS(228), 6,
       ts_builtin_sym_end,
-      anon_sym_class,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+    ACTIONS(67), 3,
+      anon_sym_record,
-      anon_sym_trait,
+      anon_sym_type,
-      anon_sym_enum,
+      aux_sym_identifier_token1,
+  [270] = 6,
-      anon_sym_fun,
+    ACTIONS(69), 1,
-      anon_sym_AT,
+      anon_sym_RBRACE,
-  [1153] = 2,
+    ACTIONS(71), 1,
+      aux_sym_identifier_token1,
-    ACTIONS(3), 1,
+    ACTIONS(73), 1,
-      sym_comment,
+      sym__upname,
+    STATE(46), 1,
+      sym_type_identifier,
+    STATE(56), 1,
+      sym_identifier,
+    STATE(60), 1,
+      sym_unqualified_import,
+  [289] = 3,
-    ACTIONS(230), 6,
+    ACTIONS(77), 1,
+      anon_sym_import,
+    STATE(20), 2,
+      sym_import,
+      aux_sym_source_file_repeat1,
+    ACTIONS(75), 3,
       ts_builtin_sym_end,
-      anon_sym_class,
+      anon_sym_record,
-      anon_sym_trait,
+      anon_sym_type,
+  [302] = 4,
+    ACTIONS(11), 1,
-      anon_sym_enum,
+      anon_sym_record,
-      anon_sym_fun,
-      anon_sym_AT,
-  [1165] = 2,
-    ACTIONS(3), 1,
+    ACTIONS(13), 1,
-      sym_comment,
+      anon_sym_type,
-    ACTIONS(232), 6,
+    ACTIONS(80), 1,
       ts_builtin_sym_end,
+    STATE(22), 3,
-      anon_sym_class,
+      sym_record,
-      anon_sym_trait,
+      sym_type,
-      anon_sym_enum,
+      aux_sym_source_file_repeat2,
-      anon_sym_fun,
-      anon_sym_AT,
-  [1177] = 2,
+  [317] = 4,
-    ACTIONS(3), 1,
+    ACTIONS(82), 1,
-      sym_comment,
-    ACTIONS(234), 6,
       ts_builtin_sym_end,
+    ACTIONS(84), 1,
-      anon_sym_class,
+      anon_sym_record,
+    ACTIONS(87), 1,
-      anon_sym_trait,
+      anon_sym_type,
+    STATE(22), 3,
+      sym_record,
-      anon_sym_enum,
+      sym_type,
-      anon_sym_fun,
+      aux_sym_source_file_repeat2,
-      anon_sym_AT,
-  [1189] = 2,
+  [332] = 6,
+    ACTIONS(71), 1,
+      aux_sym_identifier_token1,
-    ACTIONS(3), 1,
+    ACTIONS(73), 1,
-      sym_comment,
+      sym__upname,
+    ACTIONS(90), 1,
+      anon_sym_RBRACE,
+    STATE(46), 1,
+      sym_type_identifier,
+    STATE(56), 1,
+      sym_identifier,
+    STATE(70), 1,
+      sym_unqualified_import,
+  [351] = 6,
+    ACTIONS(71), 1,
+      aux_sym_identifier_token1,
-    ACTIONS(236), 6,
+    ACTIONS(73), 1,
+      sym__upname,
+    ACTIONS(92), 1,
+      anon_sym_RBRACE,
+    STATE(46), 1,
+      sym_type_identifier,
+    STATE(56), 1,
+      sym_identifier,
+    STATE(70), 1,
+      sym_unqualified_import,
+  [370] = 3,
+    ACTIONS(96), 1,
+      anon_sym_PIPE,
+    STATE(31), 1,
+      aux_sym_type_repeat1,
+    ACTIONS(94), 3,
       ts_builtin_sym_end,
-      anon_sym_class,
+      anon_sym_record,
-      anon_sym_trait,
+      anon_sym_type,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [1201] = 2,
+  [382] = 1,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(238), 6,
+    ACTIONS(98), 5,
       ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
+      anon_sym_import,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
+      anon_sym_as,
+      anon_sym_record,
+      anon_sym_type,
+  [390] = 3,
+    ACTIONS(96), 1,
+      anon_sym_PIPE,
+    STATE(25), 1,
+      aux_sym_type_repeat1,
+    ACTIONS(100), 3,
+      ts_builtin_sym_end,
+      anon_sym_record,
+      anon_sym_type,
-  [1213] = 2,
+  [402] = 2,
+    ACTIONS(102), 2,
+      ts_builtin_sym_end,
+      anon_sym_EQ,
+    ACTIONS(104), 3,
+      anon_sym_record,
+      anon_sym_type,
+      aux_sym_identifier_token1,
+  [412] = 5,
+    ACTIONS(71), 1,
+      aux_sym_identifier_token1,
-    ACTIONS(3), 1,
+    ACTIONS(73), 1,
-      sym_comment,
+      sym__upname,
+    STATE(46), 1,
+      sym_type_identifier,
+    STATE(56), 1,
+      sym_identifier,
+    STATE(70), 1,
+      sym_unqualified_import,
+  [428] = 3,
+    ACTIONS(96), 1,
+      anon_sym_PIPE,
+    STATE(31), 1,
+      aux_sym_type_repeat1,
+    ACTIONS(106), 3,
+      ts_builtin_sym_end,
+      anon_sym_record,
+      anon_sym_type,
+  [440] = 3,
-    ACTIONS(240), 6,
+    ACTIONS(110), 1,
+      anon_sym_PIPE,
+    STATE(31), 1,
+      aux_sym_type_repeat1,
+    ACTIONS(108), 3,
+      ts_builtin_sym_end,
+      anon_sym_record,
+      anon_sym_type,
+  [452] = 3,
+    ACTIONS(96), 1,
+      anon_sym_PIPE,
+    STATE(30), 1,
+      aux_sym_type_repeat1,
+    ACTIONS(113), 3,
       ts_builtin_sym_end,
-      anon_sym_class,
+      anon_sym_record,
-      anon_sym_trait,
+      anon_sym_type,
+  [464] = 2,
-      anon_sym_enum,
+    ACTIONS(117), 1,
-      anon_sym_fun,
-      anon_sym_AT,
+      anon_sym_as,
-  [1225] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(242), 6,
+    ACTIONS(115), 4,
       ts_builtin_sym_end,
-      anon_sym_class,
+      anon_sym_import,
+      anon_sym_record,
-      anon_sym_trait,
+      anon_sym_type,
+  [474] = 2,
+    ACTIONS(119), 2,
-      anon_sym_enum,
+      ts_builtin_sym_end,
-      anon_sym_fun,
-      anon_sym_AT,
+      anon_sym_EQ,
+    ACTIONS(121), 3,
+      anon_sym_record,
+      anon_sym_type,
+      aux_sym_identifier_token1,
-  [1237] = 2,
+  [484] = 1,
-    ACTIONS(3), 1,
+    ACTIONS(123), 5,
-      sym_comment,
-    ACTIONS(244), 6,
       ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
+      anon_sym_import,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
+      anon_sym_as,
+      anon_sym_record,
+      anon_sym_type,
-  [1249] = 2,
+  [492] = 2,
-    ACTIONS(3), 1,
+    ACTIONS(127), 1,
-      sym_comment,
+      anon_sym_LPAREN,
-    ACTIONS(246), 6,
+    ACTIONS(125), 4,
       ts_builtin_sym_end,
-      anon_sym_class,
+      anon_sym_record,
-      anon_sym_trait,
+      anon_sym_type,
-      anon_sym_enum,
+      anon_sym_PIPE,
-      anon_sym_fun,
-      anon_sym_AT,
-  [1261] = 2,
+  [502] = 1,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(248), 6,
+    ACTIONS(129), 5,
       ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
+      anon_sym_import,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
+      anon_sym_as,
+      anon_sym_record,
+      anon_sym_type,
-  [1273] = 2,
+  [510] = 1,
-    ACTIONS(3), 1,
+    ACTIONS(131), 5,
-      sym_comment,
-    ACTIONS(250), 6,
       ts_builtin_sym_end,
-      anon_sym_class,
-      anon_sym_trait,
+      anon_sym_import,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
+      anon_sym_as,
+      anon_sym_record,
+      anon_sym_type,
+  [518] = 1,
+    ACTIONS(108), 4,
+      ts_builtin_sym_end,
+      anon_sym_record,
+      anon_sym_type,
+      anon_sym_PIPE,
-  [1285] = 2,
+  [525] = 1,
-    ACTIONS(3), 1,
+    ACTIONS(133), 4,
-      sym_comment,
-    ACTIONS(252), 6,
       ts_builtin_sym_end,
-      anon_sym_class,
+      anon_sym_import,
+      anon_sym_record,
-      anon_sym_trait,
+      anon_sym_type,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [1297] = 2,
+  [532] = 1,
-    ACTIONS(3), 1,
+    ACTIONS(135), 4,
-      sym_comment,
-    ACTIONS(254), 6,
       ts_builtin_sym_end,
-      anon_sym_class,
+      anon_sym_import,
+      anon_sym_record,
-      anon_sym_trait,
+      anon_sym_type,
-      anon_sym_enum,
-      anon_sym_fun,
-      anon_sym_AT,
-  [1309] = 2,
+  [539] = 2,
-    ACTIONS(3), 1,
+    ACTIONS(5), 1,
-      sym_comment,
+      ts_builtin_sym_end,
-    ACTIONS(256), 6,
+    ACTIONS(137), 3,
+      anon_sym_record,
+      anon_sym_type,
+      aux_sym_identifier_token1,
+  [548] = 1,
+    ACTIONS(139), 4,
+      ts_builtin_sym_end,
+      anon_sym_record,
+      anon_sym_type,
+      anon_sym_PIPE,
+  [555] = 1,
+    ACTIONS(141), 4,
       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_import,
+      anon_sym_record,
+      anon_sym_type,
+  [562] = 1,
+    ACTIONS(143), 4,
+      ts_builtin_sym_end,
+      anon_sym_record,
+      anon_sym_type,
+      anon_sym_PIPE,
+  [569] = 2,
+    ACTIONS(145), 1,
+      anon_sym_as,
+    ACTIONS(147), 2,
       anon_sym_COMMA,
-    ACTIONS(295), 1,
-      anon_sym_LBRACE,
+      anon_sym_RBRACE,
-    STATE(46), 1,
-      sym__block,
-    STATE(102), 1,
-      aux_sym_fun_definition_repeat2,
-  [1597] = 2,
+  [577] = 3,
-    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,
+    ACTIONS(149), 1,
-      sym_definition_name,
-    STATE(195), 1,
-      sym_type,
-    ACTIONS(306), 2,
       anon_sym_COMMA,
+    ACTIONS(152), 1,
       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,
+    STATE(47), 1,
-      sym__block,
-    STATE(102), 1,
-      aux_sym_fun_definition_repeat2,
+      aux_sym_return_type_repeat1,
-  [1637] = 5,
+  [587] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
+    ACTIONS(154), 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,
+    ACTIONS(157), 1,
       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,
+    STATE(48), 1,
-      aux_sym_fun_definition_repeat2,
+      aux_sym_type_name_repeat1,
-  [2067] = 3,
+  [597] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(318), 1,
+    ACTIONS(159), 1,
-      anon_sym_QMARK,
-    ACTIONS(316), 3,
       anon_sym_COMMA,
+    ACTIONS(161), 1,
       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,
+      aux_sym_return_type_repeat1,
-  [2095] = 5,
+  [607] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(295), 1,
+    ACTIONS(159), 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,
+      anon_sym_COMMA,
+    ACTIONS(163), 1,
+      anon_sym_RPAREN,
+    STATE(47), 1,
+      aux_sym_return_type_repeat1,
+  [617] = 3,
-    ACTIONS(295), 1,
+    ACTIONS(165), 1,
+      sym__upname,
+    STATE(36), 1,
+      sym_type_identifier,
+    STATE(39), 1,
+      sym_type_name,
+  [627] = 3,
+    ACTIONS(165), 1,
+      sym__upname,
+    STATE(27), 1,
+      sym_type_name,
+    STATE(36), 1,
+      sym_type_identifier,
+  [637] = 3,
+    ACTIONS(71), 1,
+      aux_sym_identifier_token1,
+    STATE(61), 1,
-      anon_sym_LBRACE,
+      sym_type_field,
     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(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(187), 1,
-      aux_sym_class_definition_repeat2,
-  [2240] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(326), 1,
-      anon_sym_COMMA,
-    ACTIONS(330), 1,
-      anon_sym_RPAREN,
-    STATE(180), 1,
-      aux_sym_class_definition_repeat2,
-  [2253] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    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(132), 1,
-      sym_identifier,
-    STATE(151), 1,
-      sym__extension,
-  [2279] = 4,
-    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(345), 1,
-      anon_sym_COMMA,
-    ACTIONS(348), 1,
-      anon_sym_RPAREN,
-    STATE(152), 1,
-      aux_sym_fun_definition_repeat1,
-  [2331] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(326), 1,
-      anon_sym_COMMA,
-    ACTIONS(350), 1,
-      anon_sym_RPAREN,
-    STATE(187), 1,
-      aux_sym_class_definition_repeat2,
-  [2344] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(352), 1,
-      anon_sym_COMMA,
-    ACTIONS(355), 1,
-      anon_sym_RPAREN,
-    STATE(149), 1,
-      aux_sym_fun_definition_repeat2,
-  [2357] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(357), 1,
-      anon_sym_COMMA,
-    ACTIONS(360), 1,
-      anon_sym_RPAREN,
-    STATE(155), 1,
-      aux_sym_trait_definition_repeat1,
-  [2370] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(362), 1,
-      anon_sym_COMMA,
-    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(158), 1,
-      aux_sym_generic_list_repeat1,
-  [2409] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(276), 1,
-      anon_sym_COLON,
-    ACTIONS(372), 1,
-      anon_sym_LPAREN,
-    STATE(267), 1,
-      sym_trait_list,
-  [2422] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(374), 1,
-      anon_sym_COMMA,
-    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(181), 1,
-      sym_param,
-  [2448] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(380), 1,
-      anon_sym_COMMA,
-    ACTIONS(382), 1,
-      anon_sym_RPAREN,
-    STATE(165), 1,
-      aux_sym_decorator_name_repeat1,
-  [2461] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(278), 1,
-      anon_sym_LT,
-    ACTIONS(308), 1,
-      anon_sym_LPAREN,
-    STATE(281), 1,
-      sym_generic_list,
-  [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(386), 1,
-      anon_sym_COMMA,
-    ACTIONS(389), 1,
-      anon_sym_RPAREN,
-    STATE(165), 1,
-      aux_sym_decorator_name_repeat1,
-  [2496] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(391), 1,
-      anon_sym_COMMA,
-    ACTIONS(394), 1,
-      anon_sym_RPAREN,
-    STATE(156), 1,
-      aux_sym_fun_definition_repeat2,
-  [2509] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(326), 1,
-      anon_sym_COMMA,
-    ACTIONS(396), 1,
-      anon_sym_RPAREN,
-    STATE(187), 1,
-      aux_sym_class_definition_repeat2,
-  [2522] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(326), 1,
-      anon_sym_COMMA,
-    ACTIONS(398), 1,
-      anon_sym_RPAREN,
-    STATE(201), 1,
-      aux_sym_class_definition_repeat2,
-  [2535] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(326), 1,
-      anon_sym_COMMA,
-    ACTIONS(400), 1,
-      anon_sym_RPAREN,
-    STATE(203), 1,
-      aux_sym_class_definition_repeat2,
-  [2548] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(402), 1,
-      anon_sym_COMMA,
-    ACTIONS(405), 1,
-      anon_sym_RPAREN,
-    STATE(102), 1,
-      aux_sym_fun_definition_repeat2,
-  [2561] = 4,
-    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(326), 1,
-      anon_sym_COMMA,
-    ACTIONS(412), 1,
-      anon_sym_RPAREN,
-    STATE(197), 1,
-      aux_sym_class_definition_repeat2,
-  [2587] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(320), 1,
-      anon_sym_COMMA,
-    ACTIONS(414), 1,
-      anon_sym_RPAREN,
-    STATE(152), 1,
-      aux_sym_fun_definition_repeat1,
-  [2600] = 4,
-    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(320), 1,
-      anon_sym_COMMA,
-    ACTIONS(420), 1,
-      anon_sym_RPAREN,
-    STATE(211), 1,
-      aux_sym_fun_definition_repeat1,
-  [2626] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(422), 1,
-      anon_sym_COMMA,
-    ACTIONS(424), 1,
-      anon_sym_GT,
-    STATE(206), 1,
-      aux_sym_generic_list_repeat1,
-  [2639] = 4,
-    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(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(187), 1,
-      aux_sym_class_definition_repeat2,
-  [2691] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    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(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(216), 1,
-      sym_param,
-  [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(440), 1,
-      anon_sym_COMMA,
-    ACTIONS(442), 1,
-      anon_sym_RBRACE,
-    STATE(213), 1,
-      aux_sym_enum_definition_repeat1,
-  [2752] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(380), 1,
-      anon_sym_COMMA,
-    ACTIONS(444), 1,
-      anon_sym_RPAREN,
-    STATE(200), 1,
-      aux_sym_decorator_name_repeat1,
-  [2765] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(446), 1,
-      anon_sym_COMMA,
-    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(190), 1,
-      aux_sym_enum_definition_repeat1,
-  [2800] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(455), 1,
-      anon_sym_COMMA,
-    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(462), 1,
-      anon_sym_RPAREN,
-    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,
-  [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(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(487), 1,
-      anon_sym_RPAREN,
-    STATE(187), 1,
-      aux_sym_class_definition_repeat2,
-  [2978] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(326), 1,
-      anon_sym_COMMA,
-    ACTIONS(489), 1,
-      anon_sym_RPAREN,
-    STATE(205), 1,
-      aux_sym_class_definition_repeat2,
-  [2991] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(326), 1,
-      anon_sym_COMMA,
-    ACTIONS(491), 1,
-      anon_sym_RPAREN,
-    STATE(187), 1,
-      aux_sym_class_definition_repeat2,
-  [3004] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(422), 1,
-      anon_sym_COMMA,
-    ACTIONS(493), 1,
-      anon_sym_GT,
-    STATE(158), 1,
-      aux_sym_generic_list_repeat1,
-  [3017] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(326), 1,
-      anon_sym_COMMA,
-    ACTIONS(495), 1,
-      anon_sym_RPAREN,
-    STATE(153), 1,
-      aux_sym_class_definition_repeat2,
-  [3030] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(326), 1,
-      anon_sym_COMMA,
-    ACTIONS(497), 1,
-      anon_sym_RPAREN,
-    STATE(145), 1,
-      aux_sym_class_definition_repeat2,
-  [3043] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(374), 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(374), 1,
+  [647] = 3,
+    ACTIONS(165), 1,
+      sym__upname,
+    STATE(32), 1,
+      sym_type_name,
+    STATE(36), 1,
+      sym_type_identifier,
+  [657] = 3,
+    ACTIONS(167), 1,
+      anon_sym_COMMA,
+    ACTIONS(169), 1,
+      anon_sym_RPAREN,
+    STATE(48), 1,
+      aux_sym_type_name_repeat1,
+  [667] = 2,
+    ACTIONS(171), 1,
+      anon_sym_as,
+    ACTIONS(147), 2,
       anon_sym_COMMA,
-    ACTIONS(501), 1,
-      anon_sym_RPAREN,
-    STATE(160), 1,
-      aux_sym_trait_definition_repeat1,
-  [3069] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(320), 1,
-      anon_sym_COMMA,
-    ACTIONS(503), 1,
-      anon_sym_RPAREN,
-    STATE(152), 1,
-      aux_sym_fun_definition_repeat1,
-  [3082] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(326), 1,
-      anon_sym_COMMA,
-    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(507), 1,
       anon_sym_RBRACE,
-    STATE(190), 1,
-      aux_sym_enum_definition_repeat1,
-  [3108] = 4,
+  [675] = 3,
-    ACTIONS(3), 1,
+    ACTIONS(92), 1,
-      sym_comment,
-    ACTIONS(440), 1,
-      anon_sym_COMMA,
-    ACTIONS(509), 1,
       anon_sym_RBRACE,
-    STATE(189), 1,
-      aux_sym_enum_definition_repeat1,
-  [3121] = 4,
-    ACTIONS(3), 1,
+    ACTIONS(173), 1,
-      sym_comment,
-    ACTIONS(320), 1,
-      anon_sym_COMMA,
-    ACTIONS(511), 1,
-      anon_sym_RPAREN,
-    STATE(152), 1,
-      aux_sym_fun_definition_repeat1,
-  [3134] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(320), 1,
       anon_sym_COMMA,
+    STATE(59), 1,
+      aux_sym_unqualified_imports_repeat1,
+  [685] = 3,
-    ACTIONS(513), 1,
+    ACTIONS(71), 1,
-      anon_sym_RPAREN,
+      aux_sym_identifier_token1,
-    STATE(143), 1,
+    STATE(79), 1,
-      aux_sym_fun_definition_repeat1,
-  [3147] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(304), 3,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-      anon_sym_LBRACE,
-  [3156] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(297), 1,
-      sym_definition_name,
-    STATE(226), 1,
-      sym_type,
-  [3166] = 3,
-    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(142), 1,
-      sym_identifier,
-  [3186] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(517), 1,
-      sym_enum_field_name,
-    STATE(250), 1,
+    STATE(85), 1,
-      sym_enum_field,
-  [3196] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(519), 1,
-      aux_sym_url_token1,
-    STATE(20), 1,
-      sym_url,
-  [3206] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(348), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [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(360), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [3232] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(521), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [3240] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(336), 1,
-      aux_sym_url_token1,
-    STATE(295), 1,
       sym_identifier,
-  [3250] = 2,
+  [695] = 3,
-    ACTIONS(3), 1,
+    ACTIONS(175), 1,
-      sym_comment,
-    ACTIONS(523), 2,
       anon_sym_COMMA,
+    ACTIONS(178), 1,
       anon_sym_RBRACE,
+    STATE(59), 1,
+      aux_sym_unqualified_imports_repeat1,
-  [3258] = 2,
+  [705] = 3,
-    ACTIONS(3), 1,
+    ACTIONS(180), 1,
-      sym_comment,
-    ACTIONS(525), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [3266] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(527), 2,
       anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [3274] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(272), 1,
+    ACTIONS(182), 1,
-      anon_sym_val,
+      anon_sym_RBRACE,
-    STATE(146), 1,
-      sym_type_field,
-  [3284] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(272), 1,
-      anon_sym_val,
-    STATE(172), 1,
+    STATE(57), 1,
-      sym_type_field,
+      aux_sym_unqualified_imports_repeat1,
-  [3294] = 3,
+  [715] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(336), 1,
+    ACTIONS(167), 1,
-      aux_sym_url_token1,
-    STATE(176), 1,
-      sym_identifier,
-  [3304] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(529), 2,
       anon_sym_COMMA,
+    ACTIONS(184), 1,
       anon_sym_RPAREN,
+    STATE(55), 1,
+      aux_sym_type_name_repeat1,
-  [3312] = 2,
+  [725] = 3,
-    ACTIONS(3), 1,
+    ACTIONS(19), 1,
-      sym_comment,
-    ACTIONS(531), 2,
       anon_sym_LPAREN,
-      anon_sym_COLON,
-  [3320] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(533), 1,
+    ACTIONS(186), 1,
-      aux_sym_url_token1,
+      anon_sym_EQ,
-    STATE(88), 1,
+    STATE(81), 1,
+      sym_generic_list,
+  [735] = 2,
+    ACTIONS(71), 1,
+      aux_sym_identifier_token1,
+    STATE(40), 1,
       sym_identifier,
-  [3330] = 3,
+  [742] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(336), 1,
+    ACTIONS(188), 1,
+      sym__upname,
+    STATE(73), 1,
-      aux_sym_url_token1,
+      sym_type_identifier,
+  [749] = 2,
+    ACTIONS(190), 1,
+      sym__name,
-    STATE(241), 1,
+    STATE(44), 1,
+      sym_module_name,
+  [756] = 2,
+    ACTIONS(192), 1,
+      aux_sym_identifier_token1,
+    STATE(18), 1,
       sym_identifier,
-  [3340] = 2,
+  [763] = 2,
-    ACTIONS(3), 1,
+    ACTIONS(184), 1,
-      sym_comment,
-    ACTIONS(535), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [3348] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(537), 2,
-      anon_sym_COMMA,
       anon_sym_RPAREN,
-  [3356] = 3,
-    ACTIONS(3), 1,
+    ACTIONS(194), 1,
-      sym_comment,
+      anon_sym_COLON,
+  [770] = 2,
-    ACTIONS(272), 1,
+    ACTIONS(71), 1,
-      anon_sym_val,
+      aux_sym_identifier_token1,
-    STATE(178), 1,
+    STATE(18), 1,
-      sym_type_field,
-  [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,
+  [777] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(272), 1,
+    ACTIONS(188), 1,
-      anon_sym_val,
+      sym__upname,
-    STATE(168), 1,
+    STATE(62), 1,
-      sym_type_field,
+      sym_type_identifier,
-  [3404] = 2,
+  [784] = 1,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(389), 2,
+    ACTIONS(178), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [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(539), 2,
       anon_sym_COMMA,
       anon_sym_RBRACE,
-  [3430] = 3,
+  [789] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(272), 1,
+    ACTIONS(188), 1,
-      anon_sym_val,
+      sym__upname,
-    STATE(204), 1,
+    STATE(4), 1,
-      sym_type_field,
+      sym_type_identifier,
-  [3440] = 2,
+  [796] = 1,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(541), 2,
+    ACTIONS(152), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [3448] = 2,
+  [801] = 1,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(458), 2,
+    ACTIONS(196), 2,
       anon_sym_COMMA,
       anon_sym_RBRACE,
-  [3456] = 2,
+  [806] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(543), 2,
-      anon_sym_LPAREN,
-      anon_sym_COLON,
-  [3464] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(297), 1,
+    ACTIONS(198), 1,
+      anon_sym_LBRACE,
+    STATE(33), 1,
+      sym_unqualified_imports,
+  [813] = 2,
+    ACTIONS(71), 1,
+      aux_sym_identifier_token1,
+    STATE(73), 1,
-      sym_definition_name,
+      sym_identifier,
+  [820] = 2,
+    ACTIONS(71), 1,
+      aux_sym_identifier_token1,
-    STATE(249), 1,
+    STATE(49), 1,
-      sym_type,
-  [3474] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(272), 1,
-      anon_sym_val,
-    STATE(199), 1,
-      sym_type_field,
-  [3484] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(449), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [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(545), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [3510] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(517), 1,
-      sym_enum_field_name,
-    STATE(214), 1,
-      sym_enum_field,
-  [3520] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(547), 2,
-      anon_sym_LPAREN,
-      anon_sym_LT,
-  [3528] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(272), 1,
-      anon_sym_val,
-    STATE(207), 1,
-      sym_type_field,
-  [3538] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(407), 2,
-      anon_sym_LPAREN,
-      anon_sym_COMMA,
-  [3546] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(272), 1,
-      anon_sym_val,
-    STATE(208), 1,
-      sym_type_field,
-  [3556] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(336), 1,
-      aux_sym_url_token1,
-    STATE(293), 1,
       sym_identifier,
-  [3566] = 2,
+  [827] = 2,
+    ACTIONS(190), 1,
+      sym__name,
+    STATE(17), 1,
+      sym_module_name,
+  [834] = 2,
-    ACTIONS(3), 1,
+    ACTIONS(71), 1,
+      aux_sym_identifier_token1,
+    STATE(41), 1,
-      sym_comment,
+      sym_identifier,
+  [841] = 1,
-    ACTIONS(549), 2,
+    ACTIONS(157), 2,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [3574] = 2,
+  [846] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(551), 1,
+    ACTIONS(71), 1,
-      anon_sym_EQ_GT,
+      aux_sym_identifier_token1,
+    STATE(72), 1,
+      sym_identifier,
-  [3581] = 2,
+  [853] = 1,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(553), 1,
+    ACTIONS(200), 1,
-      anon_sym_EQ_GT,
+      anon_sym_EQ,
-  [3588] = 2,
+  [857] = 1,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(555), 1,
+    ACTIONS(202), 1,
-      anon_sym_EQ_GT,
+      ts_builtin_sym_end,
-  [3595] = 2,
+  [861] = 1,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(557), 1,
+    ACTIONS(204), 1,
-      anon_sym_LPAREN,
-  [3602] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(559), 1,
-      anon_sym_EQ_GT,
-  [3609] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(561), 1,
       anon_sym_COLON,
-  [3616] = 2,
+  [865] = 1,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(563), 1,
+    ACTIONS(206), 1,
-      anon_sym_LPAREN,
+      sym__name,
-  [3623] = 2,
+  [869] = 1,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(565), 1,
+    ACTIONS(194), 1,
-      anon_sym_LPAREN,
-  [3630] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(567), 1,
-      anon_sym_EQ_GT,
-  [3637] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(569), 1,
-      sym_variable_name,
-  [3644] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    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,
-  [3672] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(579), 1,
-      anon_sym_LPAREN,
-  [3679] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(581), 1,
-      anon_sym_EQ_GT,
-  [3686] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    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,
-  [3707] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(589), 1,
-      anon_sym_LPAREN,
-  [3714] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(591), 1,
-      anon_sym_SQUOTE,
-  [3721] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(593), 1,
-      anon_sym_LPAREN,
-  [3728] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(595), 1,
-      sym_definition_name,
-  [3735] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(597), 1,
-      sym_definition_name,
-  [3742] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(599), 1,
-      anon_sym_EQ_GT,
-  [3749] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(601), 1,
-      aux_sym_url_token1,
-  [3756] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(603), 1,
-      anon_sym_SQUOTE,
-  [3763] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(605), 1,
-      sym_definition_name,
-  [3770] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(607), 1,
-      anon_sym_SQUOTE,
-  [3777] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(609), 1,
-      anon_sym_LPAREN,
-  [3784] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(611), 1,
-      anon_sym_EQ_GT,
-  [3791] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(613), 1,
-      anon_sym_LPAREN,
-  [3798] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(615), 1,
-      anon_sym_EQ_GT,
-  [3805] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(617), 1,
-      anon_sym_LPAREN,
-  [3812] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(619), 1,
-      anon_sym_EQ_GT,
-  [3819] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(621), 1,
-      aux_sym__uni_character_literal_token1,
-  [3826] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(623), 1,
-      anon_sym_LBRACE,
-  [3833] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(625), 1,
-      anon_sym_RBRACE,
-  [3840] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(627), 1,
-      sym_definition_name,
-  [3847] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(629), 1,
-      sym_definition_name,
-  [3854] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(631), 1,
-      sym_definition_name,
-  [3861] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(633), 1,
-      anon_sym_EQ_GT,
-  [3868] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(635), 1,
-      ts_builtin_sym_end,
-  [3875] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(637), 1,
-      aux_sym__uni_character_literal_token1,
-  [3882] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(639), 1,
-      anon_sym_EQ_GT,
 };
 static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(2)] = 0,
-  [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,
+  [SMALL_STATE(3)] = 12,
+  [SMALL_STATE(4)] = 34,
+  [SMALL_STATE(5)] = 58,
+  [SMALL_STATE(6)] = 80,
+  [SMALL_STATE(7)] = 95,
+  [SMALL_STATE(8)] = 106,
+  [SMALL_STATE(9)] = 121,
+  [SMALL_STATE(10)] = 136,
+  [SMALL_STATE(11)] = 149,
+  [SMALL_STATE(12)] = 167,
+  [SMALL_STATE(13)] = 185,
+  [SMALL_STATE(14)] = 203,
+  [SMALL_STATE(15)] = 213,
+  [SMALL_STATE(16)] = 231,
+  [SMALL_STATE(17)] = 246,
+  [SMALL_STATE(18)] = 259,
+  [SMALL_STATE(19)] = 270,
+  [SMALL_STATE(20)] = 289,
+  [SMALL_STATE(21)] = 302,
+  [SMALL_STATE(22)] = 317,
+  [SMALL_STATE(23)] = 332,
+  [SMALL_STATE(24)] = 351,
+  [SMALL_STATE(25)] = 370,
+  [SMALL_STATE(26)] = 382,
+  [SMALL_STATE(27)] = 390,
+  [SMALL_STATE(28)] = 402,
+  [SMALL_STATE(29)] = 412,
+  [SMALL_STATE(30)] = 428,
+  [SMALL_STATE(31)] = 440,
+  [SMALL_STATE(32)] = 452,
+  [SMALL_STATE(33)] = 464,
+  [SMALL_STATE(34)] = 474,
+  [SMALL_STATE(35)] = 484,
+  [SMALL_STATE(36)] = 492,
+  [SMALL_STATE(37)] = 502,
+  [SMALL_STATE(38)] = 510,
+  [SMALL_STATE(39)] = 518,
+  [SMALL_STATE(40)] = 525,
+  [SMALL_STATE(41)] = 532,
+  [SMALL_STATE(42)] = 539,
+  [SMALL_STATE(43)] = 548,
+  [SMALL_STATE(44)] = 555,
+  [SMALL_STATE(45)] = 562,
+  [SMALL_STATE(46)] = 569,
+  [SMALL_STATE(47)] = 577,
+  [SMALL_STATE(48)] = 587,
+  [SMALL_STATE(49)] = 597,
+  [SMALL_STATE(50)] = 607,
+  [SMALL_STATE(51)] = 617,
+  [SMALL_STATE(52)] = 627,
+  [SMALL_STATE(53)] = 637,
+  [SMALL_STATE(54)] = 647,
+  [SMALL_STATE(55)] = 657,
+  [SMALL_STATE(56)] = 667,
+  [SMALL_STATE(57)] = 675,
+  [SMALL_STATE(58)] = 685,
+  [SMALL_STATE(59)] = 695,
+  [SMALL_STATE(60)] = 705,
+  [SMALL_STATE(61)] = 715,
+  [SMALL_STATE(62)] = 725,
+  [SMALL_STATE(63)] = 735,
+  [SMALL_STATE(64)] = 742,
+  [SMALL_STATE(65)] = 749,
+  [SMALL_STATE(66)] = 756,
+  [SMALL_STATE(67)] = 763,
+  [SMALL_STATE(68)] = 770,
+  [SMALL_STATE(69)] = 777,
+  [SMALL_STATE(70)] = 784,
+  [SMALL_STATE(71)] = 789,
+  [SMALL_STATE(72)] = 796,
+  [SMALL_STATE(73)] = 801,
+  [SMALL_STATE(74)] = 806,
+  [SMALL_STATE(75)] = 813,
+  [SMALL_STATE(76)] = 820,
+  [SMALL_STATE(77)] = 827,
+  [SMALL_STATE(78)] = 834,
+  [SMALL_STATE(79)] = 841,
+  [SMALL_STATE(80)] = 846,
+  [SMALL_STATE(81)] = 853,
+  [SMALL_STATE(82)] = 857,
+  [SMALL_STATE(83)] = 861,
+  [SMALL_STATE(84)] = 865,
+  [SMALL_STATE(85)] = 869,
 };
 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_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),
+  [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
+  [5] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_identifier, 1),
+  [7] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 1),
+  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
+  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
+  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
+  [15] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record, 2, .production_id = 2),
+  [17] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record, 2, .production_id = 2),
+  [19] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
+  [21] = {.entry = {.count = 1, .reusable = false}}, SHIFT(2),
+  [23] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 2),
+  [25] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_name, 2),
+  [27] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
+  [29] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_identifier, 1),
+  [31] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_name, 1),
+  [33] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_name_repeat1, 2),
+  [35] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_name_repeat1, 2), SHIFT_REPEAT(84),
+  [38] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_identifier, 1),
+  [40] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record, 3, .production_id = 4),
+  [42] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record, 3, .production_id = 4),
+  [44] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record, 3, .production_id = 3),
+  [46] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record, 3, .production_id = 3),
+  [48] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_record_repeat1, 2),
+  [50] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_record_repeat1, 2),
+  [52] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_record_repeat1, 2), SHIFT_REPEAT(2),
+  [55] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record, 4, .production_id = 7),
+  [57] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record, 4, .production_id = 7),
+  [59] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 2, .production_id = 1),
+  [61] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
+  [63] = {.entry = {.count = 1, .reusable = true}}, SHIFT(63),
+  [65] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_field, 3, .production_id = 10),
+  [67] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_field, 3, .production_id = 10),
+  [69] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [71] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
+  [73] = {.entry = {.count = 1, .reusable = false}}, SHIFT(7),
+  [75] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2),
+  [77] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(77),
+  [80] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 3),
+  [82] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2),
+  [84] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2), SHIFT_REPEAT(71),
+  [87] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat2, 2), SHIFT_REPEAT(69),
+  [90] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
+  [92] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
+  [94] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 6, .production_id = 14),
+  [96] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
+  [98] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqualified_imports, 3),
+  [100] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 5, .production_id = 12),
+  [102] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generic_list, 4),
+  [104] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_generic_list, 4),
+  [106] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 5, .production_id = 11),
+  [108] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_repeat1, 2),
+  [110] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_type_repeat1, 2), SHIFT_REPEAT(51),
+  [113] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 4, .production_id = 8),
+  [115] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 4, .production_id = 5),
+  [117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
+  [119] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generic_list, 3),
+  [121] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_generic_list, 3),
+  [123] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqualified_imports, 2),
+  [125] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_name, 1, .production_id = 9),
+  [127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
+  [129] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqualified_imports, 4),
+  [131] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqualified_imports, 5),
+  [133] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 4, .production_id = 6),
+  [135] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import, 6, .production_id = 13),
+  [137] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_identifier, 1),
+  [139] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_name, 4, .production_id = 9),
+  [141] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 2, .production_id = 1),
+  [143] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_name, 5, .production_id = 9),
+  [145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
+  [147] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqualified_import, 1, .production_id = 9),
+  [149] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_return_type_repeat1, 2), SHIFT_REPEAT(80),
+  [152] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_return_type_repeat1, 2),
+  [154] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_type_name_repeat1, 2), SHIFT_REPEAT(58),
+  [157] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_type_name_repeat1, 2),
+  [159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
+  [161] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
+  [163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
+  [165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
+  [167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
+  [169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
+  [173] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
+  [175] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_unqualified_imports_repeat1, 2), SHIFT_REPEAT(29),
+  [178] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_unqualified_imports_repeat1, 2),
+  [180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
+  [182] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
+  [184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
+  [186] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
+  [188] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10),
+  [190] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
+  [192] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
+  [194] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
+  [196] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_unqualified_import, 3, .production_id = 15),
+  [198] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
+  [200] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
+  [202] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [204] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
+  [206] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
 };
 #ifdef __cplusplus
@@ -6110,7 +1759,7 @@ extern "C" {
 #define extern __declspec(dllexport)
 #endif
-extern const TSLanguage *tree_sitter_pine(void) {
+extern const TSLanguage *tree_sitter_palm(void) {
   static const TSLanguage language = {
     .version = LANGUAGE_VERSION,
     .symbol_count = SYMBOL_COUNT,

test/corpus/class_definitions.txt DELETED Viewed

@@ -1,128 +0,0 @@
-================================================================================
-Class definitions - Simple
-================================================================================
-package definitions
-class AnimalStrong(
-  val count: String,
-  val userName: Int,
-  val currentAddress: Address
-)
---------------------------------------------------------------------------------
-(source_file
-  (package
-    (identifier))
-  (definitions
-    (class_definition
-      (definition_name)
-      (type_field
-        (variable_name)
-        (type
-          (definition_name)))
-      (type_field
-        (variable_name)
-        (type
-          (definition_name)))
-      (type_field
-        (variable_name)
-        (type
-          (definition_name))))))
-================================================================================
-Class definitions - Generic
-================================================================================
-package definitions
-class Bat<S, T>(
-  val a: S,
-  val b: T
-)
---------------------------------------------------------------------------------
-(source_file
-  (package
-    (identifier))
-  (definitions
-    (class_definition
-      (definition_name)
-      (generic_list
-        (identifier)
-        (identifier))
-      (type_field
-        (variable_name)
-        (type
-          (definition_name)))
-      (type_field
-        (variable_name)
-        (type
-          (definition_name))))))
-================================================================================
-Class definitions - Traits
-================================================================================
-package definitions
-class AnimalSubSpecies : B, C (
-  val a: String,
-  val b: Float
-)
---------------------------------------------------------------------------------
-(source_file
-  (package
-    (identifier))
-  (definitions
-    (class_definition
-      (definition_name)
-      (trait_list
-        (definition_name)
-        (definition_name))
-      (type_field
-        (variable_name)
-        (type
-          (definition_name)))
-      (type_field
-        (variable_name)
-        (type
-          (definition_name))))))
-================================================================================
-Class definitions - Genrics + Traits
-================================================================================
-package definitions
-class A<S, T>: B, C (
-  val a: S,
-  val b: T
-)
---------------------------------------------------------------------------------
-(source_file
-  (package
-    (identifier))
-  (definitions
-    (class_definition
-      (definition_name)
-      (generic_list
-        (identifier)
-        (identifier))
-      (trait_list
-        (definition_name)
-        (definition_name))
-      (type_field
-        (variable_name)
-        (type
-          (definition_name)))
-      (type_field
-        (variable_name)
-        (type
-          (definition_name))))))

test/corpus/enum_definitions.txt DELETED Viewed

@@ -1,117 +0,0 @@
-================================================================================
-Enum definitions - Int
-================================================================================
-package definitions
-enum Colors(val rgb: Int) { # define colors here
-  RED(0xFF0000),
-  GREEN(0x00FF00), # this needs to sorted
-  BLUE(0x0000FF)
-}
---------------------------------------------------------------------------------
-(source_file
-  (package
-    (identifier))
-  (definitions
-    (enum_definition
-      (definition_name)
-      (type_field
-        (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)))))
-================================================================================
-Enum definitions - Float
-================================================================================
-package definitions
-enum ColorsAlpha(val a: Int, val b: Float) {
-  RED(1, 0.1),
-  GREEN(2, 0.2),
-  BLUE(3, 0.3)
-}
---------------------------------------------------------------------------------
-(source_file
-  (package
-    (identifier))
-  (definitions
-    (enum_definition
-      (definition_name)
-      (type_field
-        (variable_name)
-        (type
-          (definition_name)))
-      (type_field
-        (variable_name)
-        (type
-          (definition_name)))
-      (enum_field
-        (enum_field_name)
-        (integer_literal)
-        (float_literal))
-      (enum_field
-        (enum_field_name)
-        (integer_literal)
-        (float_literal))
-      (enum_field
-        (enum_field_name)
-        (integer_literal)
-        (float_literal)))))
-================================================================================
-Enum definitions - String
-================================================================================
-package definitions
-enum ColorsAlpha(val a: Int, val b: String) {
-  RED(1, "1"),
-  GREEN(2, "2"),
-  BLUE(3, "3")
-}
---------------------------------------------------------------------------------
-(source_file
-  (package
-    (identifier))
-  (definitions
-    (enum_definition
-      (definition_name)
-      (type_field
-        (variable_name)
-        (type
-          (definition_name)))
-      (type_field
-        (variable_name)
-        (type
-          (definition_name)))
-      (enum_field
-        (enum_field_name)
-        (integer_literal)
-        (line_string_literal))
-      (enum_field
-        (enum_field_name)
-        (integer_literal)
-        (line_string_literal))
-      (enum_field
-        (enum_field_name)
-        (integer_literal)
-        (line_string_literal)))))

test/corpus/functions.txt CHANGED Viewed

@@ -4,8 +4,8 @@ Functions - Simple
 package definitions
-fun main() => {
+main() =
-}
+  todo("Not done")
 --------------------------------------------------------------------------------

test/corpus/import.txt ADDED Viewed

@@ -0,0 +1,40 @@
+================================================================================
+Module Statement
+================================================================================
+module palm
+--------------------------------------------------------------------------------
+(source_file
+  (module
+    (module_name)))
+================================================================================
+Import statements
+================================================================================
+module palm/std
+import palm/std/list
+import palm/std/list.{List, contains}
+import palm/std/bool as boolean
+--------------------------------------------------------------------------------
+(source_file
+  (module
+    (module_name))
+  (import
+    (module_name))
+  (import
+    (module_name)
+    (unqualified_imports
+      (unqualified_import
+        (identifier))
+      (unqualified_import
+        (identifier))))
+  (import
+    (module_name)
+    (identifier)))

test/corpus/import_statements.txt DELETED Viewed

@@ -1,16 +0,0 @@
-================================================================================
-Import statements
-================================================================================
-package imports
-import github/pine/std  # importing std library here
---------------------------------------------------------------------------------
-(source_file
-  (package
-    (identifier))
-  (import_statement
-    (url))
-    (comment))

test/corpus/record.txt ADDED Viewed

@@ -0,0 +1,65 @@
+================================================================================
+Record - Simple
+================================================================================
+module std
+record Cat
+  firstName: String
+  middleName: String
+  lastName: String
+  age : Int
+record Dog
+  name: String
+--------------------------------------------------------------------------------
+(source_file
+  (module
+    (module_name))
+  (record
+    (type_identifier)
+    (type_field
+      (identifier)
+      (identifier))
+    (type_field
+      (identifier)
+      (identifier))
+    (type_field
+      (identifier)
+      (identifier))
+    (type_field
+      (identifier)
+      (identifier)))
+  (record
+    (type_identifier)
+    (type_field
+      (identifier)
+      (identifier))))
+================================================================================
+Record - Generic
+================================================================================
+module std
+record Shape(a)
+  name: String
+  area: a
+--------------------------------------------------------------------------------
+(source_file
+  (module
+    (module_name))
+  (record
+    (type_identifier)
+    (generic_list
+      (identifier))
+    (type_field
+      (identifier)
+      (identifier))
+    (type_field
+      (identifier)
+      (identifier))))

test/corpus/traits.txt DELETED Viewed

@@ -1,65 +0,0 @@
-================================================================================
-Traits - Simple
-================================================================================
-package definitions
-trait Animal(
-  val name: String,
-  fun legs() => Int
-)
---------------------------------------------------------------------------------
-(source_file
-  (package
-    (identifier))
-  (definitions
-    (trait_definition
-      (definition_name)
-      (trait_field
-        (type_field
-          (variable_name)
-          (type
-            (definition_name))))
-      (trait_field
-        (fun_field
-          (identifier)
-          (type
-            (definition_name)))))))
-================================================================================
-Traits - Generics
-================================================================================
-package definitions
-trait Shape<T>(
-  val name: T,
-  fun area(size: Float) => T
-)
---------------------------------------------------------------------------------
-(source_file
-  (package
-    (identifier))
-  (definitions
-    (trait_definition
-      (definition_name)
-      (generic_list
-        (identifier))
-      (trait_field
-        (type_field
-          (variable_name)
-          (type
-            (definition_name))))
-      (trait_field
-        (fun_field
-          (identifier)
-          (param
-            (variable_name)
-            (type
-              (definition_name)))
-          (type
-            (definition_name)))))))

test/corpus/type.txt ADDED Viewed

@@ -0,0 +1,77 @@
+================================================================================
+Type - Simple
+================================================================================
+module palm
+type User = Guest | LoggedIn(name: String, session_id: String)
+--------------------------------------------------------------------------------
+(source_file
+  (module
+    (module_name))
+  (type
+    (type_identifier)
+    (type_name
+      (type_identifier))
+    (type_name
+      (type_identifier)
+      (type_field
+        (identifier)
+        (identifier))
+      (type_field
+        (identifier)
+        (identifier)))))
+================================================================================
+Type - Generic
+================================================================================
+module palm
+type User(a) = Guest | LoggedIn(name: a, age: Int)
+type Option(a) = Some(a) | None
+type Result(a, b) = Ok(a) | Error(b)
+--------------------------------------------------------------------------------
+(source_file
+  (module
+    (module_name))
+  (type
+    (type_identifier)
+    (generic_list
+      (identifier))
+    (type_name
+      (type_identifier))
+    (type_name
+      (type_identifier)
+      (type_field
+        (identifier)
+        (identifier))
+      (type_field
+        (identifier)
+        (identifier))))
+  (type
+    (type_identifier)
+    (generic_list
+      (identifier))
+    (type_name
+      (type_identifier)
+      (identifier))
+    (type_name
+      (type_identifier)))
+  (type
+    (type_identifier)
+    (generic_list
+      (identifier)
+      (identifier))
+    (type_name
+      (type_identifier)
+      (identifier))
+    (type_name
+      (type_identifier)
+      (identifier))))

~repos /plum

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

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