From 44b2eab248c1f12e33a48f02acdb757692fb69fc Mon Sep 17 00:00:00 2001
From: joker1007 <kakyoin.hierophant@gmail.com>
Date: Thu, 7 Dec 2023 22:50:28 +0900
Subject: [PATCH] feat: add fields to class_decl, module_decl, interface_decl,
 method_type

---
 grammar.js          |   49 +-
 src/grammar.json    |  582 +--
 src/node-types.json |  492 ++-
 src/parser.c        | 9324 ++++++++++++++++++++++---------------------
 4 files changed, 5532 insertions(+), 4915 deletions(-)

diff --git a/grammar.js b/grammar.js
index 5e138bd..724a4a9 100644
--- a/grammar.js
+++ b/grammar.js
@@ -170,8 +170,8 @@ module.exports = grammar({
     ),
 
     decl: $ => seq(
-      alias(repeat($.annotation), $.annotations),
-      choice(
+      field("annotations", alias(repeat($.annotation), $.annotations)),
+      field("body", choice(
         $.class_decl,
         $.module_decl,
         $.class_alias_decl,
@@ -180,7 +180,7 @@ module.exports = grammar({
         $.type_alias_decl,
         $.const_decl,
         $.global_decl,
-      )
+      ))
     ),
 
     _nestable_decls: $ => choice(
@@ -196,23 +196,23 @@ module.exports = grammar({
     class_decl: $ => choice(
       seq(
         "class",
-        $.class_name,
-        optional($.module_type_parameters),
-        optional($.superclass),
-        alias(repeat(choice($.member, $._nestable_decls)), $.members),
+        field("name", $.class_name),
+        field("type_parameters", optional($.module_type_parameters)),
+        field("superclass", optional($.superclass)),
+        field("body", alias(repeat(choice($.member, $._nestable_decls)), $.members)),
         "end"
       )
     ),
 
-    superclass: $ => seq("<", $.class_name, optional($.type_arguments)),
+    superclass: $ => seq("<", field("name", $.class_name), field("type_arguments", optional($.type_arguments))),
 
     module_decl: $ => choice(
       seq(
         "module",
-        alias($.class_name, $.module_name),
-        optional($.module_type_parameters),
-        optional($.module_self_type_binds),
-        alias(repeat(choice($.member, $._nestable_decls)), $.members),
+        field("name", alias($.class_name, $.module_name)),
+        field("type_parameters", optional($.module_type_parameters)),
+        field("self_type_binds", optional($.module_self_type_binds)),
+        field("body", alias(repeat(choice($.member, $._nestable_decls)), $.members)),
         "end"
       )
     ),
@@ -227,15 +227,21 @@ module.exports = grammar({
       seq($.interface_name, optional($.type_arguments), optional(seq(",", $.module_self_types))),
     ),
 
-    interface_decl: $ => seq("interface", $.interface_name, optional($.module_type_parameters), alias(repeat($.interface_member), $.interface_members), "end"),
+    interface_decl: $ => seq(
+      "interface",
+      field("name", $.interface_name),
+      field("type_parameters", optional($.module_type_parameters)),
+      field("body", alias(repeat($.interface_member), $.interface_members)),
+      "end"
+    ),
 
     interface_member: $ => seq(
-      alias(repeat($.annotation), $.annotations),
-      choice(
+      field("annotations", alias(repeat($.annotation), $.annotations)),
+      field("body", choice(
         $.method_member,
         $.include_member,
         $.alias_member,
-      )
+      ))
     ),
 
     type_alias_decl: $ => seq("type", $.alias_name, optional($.module_type_parameters), "=", $.type),
@@ -331,8 +337,8 @@ module.exports = grammar({
     ),
 
     member: $ => seq(
-      alias(repeat($.annotation), $.annotations),
-      choice(
+      field("annotations", alias(repeat($.annotation), $.annotations)),
+      field("body", choice(
         $.ivar_member,
         $.method_member,
         prec.right($.attribute_member),
@@ -341,7 +347,7 @@ module.exports = grammar({
         $.prepend_member,
         $.alias_member,
         prec.left($.visibility_member),
-      )
+      ))
     ),
 
     ivar_member: $ => choice(
@@ -356,7 +362,10 @@ module.exports = grammar({
       seq("def", $.self, "?.", $.method_name, ":", $.method_types),
     ),
 
-    method_type: $ => seq(optional($.method_type_parameters), alias(repeat($.annotation), $.annotations), $.method_type_body),
+    method_type: $ => seq(
+      field("type_parameters", optional($.method_type_parameters)),
+      field("annotations", alias(repeat($.annotation), $.annotations)),
+      field("body", $.method_type_body)),
 
     method_types: $ => choice(
       sep1($.method_type, "|"),
diff --git a/src/grammar.json b/src/grammar.json
index ef96146..c2e2254 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -1206,53 +1206,61 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "ALIAS",
+          "type": "FIELD",
+          "name": "annotations",
           "content": {
-            "type": "REPEAT",
+            "type": "ALIAS",
             "content": {
-              "type": "SYMBOL",
-              "name": "annotation"
-            }
-          },
-          "named": true,
-          "value": "annotations"
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "annotation"
+              }
+            },
+            "named": true,
+            "value": "annotations"
+          }
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "class_decl"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "module_decl"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "class_alias_decl"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "module_alias_decl"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "interface_decl"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "type_alias_decl"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "const_decl"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "global_decl"
-            }
-          ]
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "class_decl"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "module_decl"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "class_alias_decl"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "module_alias_decl"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "interface_decl"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "type_alias_decl"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "const_decl"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "global_decl"
+              }
+            ]
+          }
         }
       ]
     },
@@ -1300,53 +1308,69 @@
               "value": "class"
             },
             {
-              "type": "SYMBOL",
-              "name": "class_name"
+              "type": "FIELD",
+              "name": "name",
+              "content": {
+                "type": "SYMBOL",
+                "name": "class_name"
+              }
             },
             {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "module_type_parameters"
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
+              "type": "FIELD",
+              "name": "type_parameters",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "module_type_parameters"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              }
             },
             {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "superclass"
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
+              "type": "FIELD",
+              "name": "superclass",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "superclass"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              }
             },
             {
-              "type": "ALIAS",
+              "type": "FIELD",
+              "name": "body",
               "content": {
-                "type": "REPEAT",
+                "type": "ALIAS",
                 "content": {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "member"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "_nestable_decls"
-                    }
-                  ]
-                }
-              },
-              "named": true,
-              "value": "members"
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "member"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "_nestable_decls"
+                      }
+                    ]
+                  }
+                },
+                "named": true,
+                "value": "members"
+              }
             },
             {
               "type": "STRING",
@@ -1364,20 +1388,28 @@
           "value": "<"
         },
         {
-          "type": "SYMBOL",
-          "name": "class_name"
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "class_name"
+          }
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "type_arguments"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          "type": "FIELD",
+          "name": "type_arguments",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "type_arguments"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
         }
       ]
     },
@@ -1392,58 +1424,74 @@
               "value": "module"
             },
             {
-              "type": "ALIAS",
+              "type": "FIELD",
+              "name": "name",
               "content": {
-                "type": "SYMBOL",
-                "name": "class_name"
-              },
-              "named": true,
-              "value": "module_name"
-            },
-            {
-              "type": "CHOICE",
-              "members": [
-                {
+                "type": "ALIAS",
+                "content": {
                   "type": "SYMBOL",
-                  "name": "module_type_parameters"
+                  "name": "class_name"
                 },
-                {
-                  "type": "BLANK"
-                }
-              ]
+                "named": true,
+                "value": "module_name"
+              }
             },
             {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "module_self_type_binds"
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
+              "type": "FIELD",
+              "name": "type_parameters",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "module_type_parameters"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              }
             },
             {
-              "type": "ALIAS",
+              "type": "FIELD",
+              "name": "self_type_binds",
               "content": {
-                "type": "REPEAT",
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "module_self_type_binds"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              }
+            },
+            {
+              "type": "FIELD",
+              "name": "body",
+              "content": {
+                "type": "ALIAS",
                 "content": {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "member"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "_nestable_decls"
-                    }
-                  ]
-                }
-              },
-              "named": true,
-              "value": "members"
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "member"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "_nestable_decls"
+                      }
+                    ]
+                  }
+                },
+                "named": true,
+                "value": "members"
+              }
             },
             {
               "type": "STRING",
@@ -1631,32 +1679,44 @@
           "value": "interface"
         },
         {
-          "type": "SYMBOL",
-          "name": "interface_name"
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "interface_name"
+          }
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "module_type_parameters"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          "type": "FIELD",
+          "name": "type_parameters",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "module_type_parameters"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
         },
         {
-          "type": "ALIAS",
+          "type": "FIELD",
+          "name": "body",
           "content": {
-            "type": "REPEAT",
+            "type": "ALIAS",
             "content": {
-              "type": "SYMBOL",
-              "name": "interface_member"
-            }
-          },
-          "named": true,
-          "value": "interface_members"
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "interface_member"
+              }
+            },
+            "named": true,
+            "value": "interface_members"
+          }
         },
         {
           "type": "STRING",
@@ -1668,33 +1728,41 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "ALIAS",
+          "type": "FIELD",
+          "name": "annotations",
           "content": {
-            "type": "REPEAT",
+            "type": "ALIAS",
             "content": {
-              "type": "SYMBOL",
-              "name": "annotation"
-            }
-          },
-          "named": true,
-          "value": "annotations"
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "annotation"
+              }
+            },
+            "named": true,
+            "value": "annotations"
+          }
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "method_member"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "include_member"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "alias_member"
-            }
-          ]
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "method_member"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "include_member"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "alias_member"
+              }
+            ]
+          }
         }
       ]
     },
@@ -2859,61 +2927,69 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "ALIAS",
+          "type": "FIELD",
+          "name": "annotations",
           "content": {
-            "type": "REPEAT",
+            "type": "ALIAS",
             "content": {
-              "type": "SYMBOL",
-              "name": "annotation"
-            }
-          },
-          "named": true,
-          "value": "annotations"
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "ivar_member"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "method_member"
-            },
-            {
-              "type": "PREC_RIGHT",
-              "value": 0,
+              "type": "REPEAT",
               "content": {
                 "type": "SYMBOL",
-                "name": "attribute_member"
+                "name": "annotation"
               }
             },
-            {
-              "type": "SYMBOL",
-              "name": "include_member"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "extend_member"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "prepend_member"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "alias_member"
-            },
-            {
-              "type": "PREC_LEFT",
-              "value": 0,
-              "content": {
+            "named": true,
+            "value": "annotations"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "ivar_member"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "method_member"
+              },
+              {
+                "type": "PREC_RIGHT",
+                "value": 0,
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "attribute_member"
+                }
+              },
+              {
+                "type": "SYMBOL",
+                "name": "include_member"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "extend_member"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "prepend_member"
+              },
+              {
                 "type": "SYMBOL",
-                "name": "visibility_member"
+                "name": "alias_member"
+              },
+              {
+                "type": "PREC_LEFT",
+                "value": 0,
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "visibility_member"
+                }
               }
-            }
-          ]
+            ]
+          }
         }
       ]
     },
@@ -3093,32 +3169,44 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "method_type_parameters"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          "type": "FIELD",
+          "name": "type_parameters",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "method_type_parameters"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
         },
         {
-          "type": "ALIAS",
+          "type": "FIELD",
+          "name": "annotations",
           "content": {
-            "type": "REPEAT",
+            "type": "ALIAS",
             "content": {
-              "type": "SYMBOL",
-              "name": "annotation"
-            }
-          },
-          "named": true,
-          "value": "annotations"
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "annotation"
+              }
+            },
+            "named": true,
+            "value": "annotations"
+          }
         },
         {
-          "type": "SYMBOL",
-          "name": "method_type_body"
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "SYMBOL",
+            "name": "method_type_body"
+          }
         }
       ]
     },
diff --git a/src/node-types.json b/src/node-types.json
index c3ce735..3333868 100644
--- a/src/node-types.json
+++ b/src/node-types.json
@@ -231,28 +231,47 @@
   {
     "type": "class_decl",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "class_name",
-          "named": true
-        },
-        {
-          "type": "members",
-          "named": true
-        },
-        {
-          "type": "module_type_parameters",
-          "named": true
-        },
-        {
-          "type": "superclass",
-          "named": true
-        }
-      ]
+    "fields": {
+      "body": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "members",
+            "named": true
+          }
+        ]
+      },
+      "name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "class_name",
+            "named": true
+          }
+        ]
+      },
+      "superclass": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "superclass",
+            "named": true
+          }
+        ]
+      },
+      "type_parameters": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "module_type_parameters",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {
@@ -364,48 +383,55 @@
   {
     "type": "decl",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "annotations",
-          "named": true
-        },
-        {
-          "type": "class_alias_decl",
-          "named": true
-        },
-        {
-          "type": "class_decl",
-          "named": true
-        },
-        {
-          "type": "const_decl",
-          "named": true
-        },
-        {
-          "type": "global_decl",
-          "named": true
-        },
-        {
-          "type": "interface_decl",
-          "named": true
-        },
-        {
-          "type": "module_alias_decl",
-          "named": true
-        },
-        {
-          "type": "module_decl",
-          "named": true
-        },
-        {
-          "type": "type_alias_decl",
-          "named": true
-        }
-      ]
+    "fields": {
+      "annotations": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "annotations",
+            "named": true
+          }
+        ]
+      },
+      "body": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "class_alias_decl",
+            "named": true
+          },
+          {
+            "type": "class_decl",
+            "named": true
+          },
+          {
+            "type": "const_decl",
+            "named": true
+          },
+          {
+            "type": "global_decl",
+            "named": true
+          },
+          {
+            "type": "interface_decl",
+            "named": true
+          },
+          {
+            "type": "module_alias_decl",
+            "named": true
+          },
+          {
+            "type": "module_decl",
+            "named": true
+          },
+          {
+            "type": "type_alias_decl",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {
@@ -511,51 +537,71 @@
   {
     "type": "interface_decl",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "interface_members",
-          "named": true
-        },
-        {
-          "type": "interface_name",
-          "named": true
-        },
-        {
-          "type": "module_type_parameters",
-          "named": true
-        }
-      ]
+    "fields": {
+      "body": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "interface_members",
+            "named": true
+          }
+        ]
+      },
+      "name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "interface_name",
+            "named": true
+          }
+        ]
+      },
+      "type_parameters": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "module_type_parameters",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {
     "type": "interface_member",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "alias_member",
-          "named": true
-        },
-        {
-          "type": "annotations",
-          "named": true
-        },
-        {
-          "type": "include_member",
-          "named": true
-        },
-        {
-          "type": "method_member",
-          "named": true
-        }
-      ]
+    "fields": {
+      "annotations": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "annotations",
+            "named": true
+          }
+        ]
+      },
+      "body": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "alias_member",
+            "named": true
+          },
+          {
+            "type": "include_member",
+            "named": true
+          },
+          {
+            "type": "method_member",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {
@@ -705,48 +751,55 @@
   {
     "type": "member",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "alias_member",
-          "named": true
-        },
-        {
-          "type": "annotations",
-          "named": true
-        },
-        {
-          "type": "attribute_member",
-          "named": true
-        },
-        {
-          "type": "extend_member",
-          "named": true
-        },
-        {
-          "type": "include_member",
-          "named": true
-        },
-        {
-          "type": "ivar_member",
-          "named": true
-        },
-        {
-          "type": "method_member",
-          "named": true
-        },
-        {
-          "type": "prepend_member",
-          "named": true
-        },
-        {
-          "type": "visibility_member",
-          "named": true
-        }
-      ]
+    "fields": {
+      "annotations": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "annotations",
+            "named": true
+          }
+        ]
+      },
+      "body": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "alias_member",
+            "named": true
+          },
+          {
+            "type": "attribute_member",
+            "named": true
+          },
+          {
+            "type": "extend_member",
+            "named": true
+          },
+          {
+            "type": "include_member",
+            "named": true
+          },
+          {
+            "type": "ivar_member",
+            "named": true
+          },
+          {
+            "type": "method_member",
+            "named": true
+          },
+          {
+            "type": "prepend_member",
+            "named": true
+          },
+          {
+            "type": "visibility_member",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {
@@ -861,24 +914,37 @@
   {
     "type": "method_type",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "annotations",
-          "named": true
-        },
-        {
-          "type": "method_type_body",
-          "named": true
-        },
-        {
-          "type": "method_type_parameters",
-          "named": true
-        }
-      ]
+    "fields": {
+      "annotations": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "annotations",
+            "named": true
+          }
+        ]
+      },
+      "body": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "method_type_body",
+            "named": true
+          }
+        ]
+      },
+      "type_parameters": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "method_type_parameters",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {
@@ -963,28 +1029,47 @@
   {
     "type": "module_decl",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "members",
-          "named": true
-        },
-        {
-          "type": "module_name",
-          "named": true
-        },
-        {
-          "type": "module_self_type_binds",
-          "named": true
-        },
-        {
-          "type": "module_type_parameters",
-          "named": true
-        }
-      ]
+    "fields": {
+      "body": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "members",
+            "named": true
+          }
+        ]
+      },
+      "name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "module_name",
+            "named": true
+          }
+        ]
+      },
+      "self_type_binds": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "module_self_type_binds",
+            "named": true
+          }
+        ]
+      },
+      "type_parameters": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "module_type_parameters",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {
@@ -1474,20 +1559,27 @@
   {
     "type": "superclass",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "class_name",
-          "named": true
-        },
-        {
-          "type": "type_arguments",
-          "named": true
-        }
-      ]
+    "fields": {
+      "name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "class_name",
+            "named": true
+          }
+        ]
+      },
+      "type_arguments": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "type_arguments",
+            "named": true
+          }
+        ]
+      }
     }
   },
   {
diff --git a/src/parser.c b/src/parser.c
index 07849d2..f5223a1 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -6,15 +6,15 @@
 #endif
 
 #define LANGUAGE_VERSION 14
-#define STATE_COUNT 472
+#define STATE_COUNT 478
 #define LARGE_STATE_COUNT 2
 #define SYMBOL_COUNT 203
 #define ALIAS_COUNT 8
 #define TOKEN_COUNT 108
 #define EXTERNAL_TOKEN_COUNT 0
-#define FIELD_COUNT 6
+#define FIELD_COUNT 13
 #define MAX_ALIAS_SEQUENCE_LENGTH 11
-#define PRODUCTION_ID_COUNT 24
+#define PRODUCTION_ID_COUNT 36
 
 enum {
   sym_identifier = 1,
@@ -1505,119 +1505,231 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
 };
 
 enum {
-  field_key = 1,
-  field_left = 2,
-  field_new_name = 3,
-  field_origin_name = 4,
-  field_right = 5,
-  field_value = 6,
+  field_annotations = 1,
+  field_body = 2,
+  field_key = 3,
+  field_left = 4,
+  field_name = 5,
+  field_new_name = 6,
+  field_origin_name = 7,
+  field_right = 8,
+  field_self_type_binds = 9,
+  field_superclass = 10,
+  field_type_arguments = 11,
+  field_type_parameters = 12,
+  field_value = 13,
 };
 
 static const char * const ts_field_names[] = {
   [0] = NULL,
+  [field_annotations] = "annotations",
+  [field_body] = "body",
   [field_key] = "key",
   [field_left] = "left",
+  [field_name] = "name",
   [field_new_name] = "new_name",
   [field_origin_name] = "origin_name",
   [field_right] = "right",
+  [field_self_type_binds] = "self_type_binds",
+  [field_superclass] = "superclass",
+  [field_type_arguments] = "type_arguments",
+  [field_type_parameters] = "type_parameters",
   [field_value] = "value",
 };
 
 static const TSFieldMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
-  [4] = {.index = 0, .length = 2},
-  [7] = {.index = 0, .length = 2},
-  [10] = {.index = 2, .length = 2},
-  [14] = {.index = 4, .length = 2},
-  [15] = {.index = 6, .length = 2},
-  [18] = {.index = 8, .length = 2},
-  [19] = {.index = 10, .length = 4},
-  [20] = {.index = 14, .length = 4},
+  [1] = {.index = 0, .length = 1},
+  [3] = {.index = 1, .length = 2},
+  [4] = {.index = 3, .length = 1},
+  [5] = {.index = 3, .length = 1},
+  [6] = {.index = 4, .length = 2},
+  [7] = {.index = 6, .length = 2},
+  [8] = {.index = 8, .length = 2},
+  [9] = {.index = 10, .length = 2},
+  [11] = {.index = 4, .length = 2},
+  [12] = {.index = 12, .length = 2},
+  [13] = {.index = 8, .length = 2},
+  [14] = {.index = 10, .length = 2},
+  [15] = {.index = 10, .length = 2},
+  [16] = {.index = 14, .length = 2},
+  [17] = {.index = 16, .length = 2},
+  [18] = {.index = 18, .length = 3},
+  [19] = {.index = 21, .length = 3},
+  [20] = {.index = 24, .length = 3},
+  [21] = {.index = 27, .length = 3},
+  [22] = {.index = 30, .length = 3},
+  [23] = {.index = 24, .length = 3},
+  [24] = {.index = 24, .length = 3},
+  [25] = {.index = 33, .length = 2},
+  [26] = {.index = 35, .length = 2},
+  [27] = {.index = 37, .length = 4},
+  [28] = {.index = 41, .length = 4},
+  [29] = {.index = 45, .length = 2},
+  [30] = {.index = 47, .length = 4},
+  [31] = {.index = 51, .length = 4},
+  [32] = {.index = 55, .length = 2},
+  [34] = {.index = 57, .length = 3},
 };
 
 static const TSFieldMapEntry ts_field_map_entries[] = {
   [0] =
+    {field_body, 0},
+  [1] =
+    {field_annotations, 0},
+    {field_body, 1},
+  [3] =
+    {field_name, 1},
+  [4] =
     {field_new_name, 1},
     {field_origin_name, 3},
-  [2] =
+  [6] =
+    {field_name, 1},
+    {field_superclass, 2},
+  [8] =
+    {field_name, 1},
+    {field_type_parameters, 2},
+  [10] =
+    {field_body, 2},
+    {field_name, 1},
+  [12] =
+    {field_name, 1},
+    {field_self_type_binds, 2},
+  [14] =
+    {field_name, 1},
+    {field_type_arguments, 2},
+  [16] =
     {field_new_name, 1},
     {field_origin_name, 2},
-  [4] =
+  [18] =
+    {field_body, 3},
+    {field_name, 1},
+    {field_superclass, 2},
+  [21] =
+    {field_name, 1},
+    {field_superclass, 3},
+    {field_type_parameters, 2},
+  [24] =
+    {field_body, 3},
+    {field_name, 1},
+    {field_type_parameters, 2},
+  [27] =
+    {field_body, 3},
+    {field_name, 1},
+    {field_self_type_binds, 2},
+  [30] =
+    {field_name, 1},
+    {field_self_type_binds, 3},
+    {field_type_parameters, 2},
+  [33] =
     {field_key, 1, .inherited = true},
     {field_value, 1, .inherited = true},
-  [6] =
+  [35] =
     {field_left, 0},
     {field_right, 2},
-  [8] =
+  [37] =
+    {field_body, 4},
+    {field_name, 1},
+    {field_superclass, 3},
+    {field_type_parameters, 2},
+  [41] =
+    {field_body, 4},
+    {field_name, 1},
+    {field_self_type_binds, 3},
+    {field_type_parameters, 2},
+  [45] =
     {field_key, 0},
     {field_value, 2},
-  [10] =
+  [47] =
     {field_key, 1, .inherited = true},
     {field_key, 2, .inherited = true},
     {field_value, 1, .inherited = true},
     {field_value, 2, .inherited = true},
-  [14] =
+  [51] =
     {field_key, 0, .inherited = true},
     {field_key, 1, .inherited = true},
     {field_value, 0, .inherited = true},
     {field_value, 1, .inherited = true},
+  [55] =
+    {field_body, 1},
+    {field_type_parameters, 0},
+  [57] =
+    {field_annotations, 1},
+    {field_body, 2},
+    {field_type_parameters, 0},
 };
 
 static const TSSymbol ts_alias_sequences[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE_LENGTH] = {
   [0] = {0},
-  [1] = {
+  [2] = {
     [0] = alias_sym_type_name,
   },
-  [2] = {
+  [3] = {
     [0] = alias_sym_annotations,
   },
-  [3] = {
+  [5] = {
     [1] = alias_sym_module_name,
   },
-  [5] = {
+  [9] = {
     [2] = alias_sym_members,
   },
-  [6] = {
+  [10] = {
     [0] = alias_sym_type_name,
     [2] = alias_sym_simple_type_name,
   },
-  [7] = {
+  [11] = {
     [1] = alias_sym_module_name,
     [3] = alias_sym_module_name,
   },
-  [8] = {
+  [12] = {
+    [1] = alias_sym_module_name,
+  },
+  [13] = {
+    [1] = alias_sym_module_name,
+  },
+  [14] = {
     [1] = alias_sym_module_name,
     [2] = alias_sym_members,
   },
-  [9] = {
+  [15] = {
     [2] = alias_sym_interface_members,
   },
-  [11] = {
+  [18] = {
     [3] = alias_sym_members,
   },
-  [12] = {
+  [20] = {
+    [3] = alias_sym_members,
+  },
+  [21] = {
     [1] = alias_sym_module_name,
     [3] = alias_sym_members,
   },
-  [13] = {
+  [22] = {
+    [1] = alias_sym_module_name,
+  },
+  [23] = {
+    [1] = alias_sym_module_name,
+    [3] = alias_sym_members,
+  },
+  [24] = {
     [3] = alias_sym_interface_members,
   },
-  [16] = {
+  [27] = {
     [4] = alias_sym_members,
   },
-  [17] = {
+  [28] = {
     [1] = alias_sym_module_name,
     [4] = alias_sym_members,
   },
-  [18] = {
+  [29] = {
     [0] = alias_sym_record_key,
   },
-  [21] = {
+  [33] = {
     [0] = alias_sym_keyword,
   },
-  [22] = {
+  [34] = {
     [1] = alias_sym_annotations,
   },
-  [23] = {
+  [35] = {
     [1] = alias_sym_keyword,
   },
 };
@@ -1709,22 +1821,22 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [63] = 63,
   [64] = 64,
   [65] = 65,
-  [66] = 65,
+  [66] = 66,
   [67] = 67,
-  [68] = 68,
+  [68] = 67,
   [69] = 69,
   [70] = 70,
   [71] = 71,
   [72] = 72,
-  [73] = 71,
-  [74] = 71,
-  [75] = 75,
-  [76] = 76,
+  [73] = 73,
+  [74] = 74,
+  [75] = 74,
+  [76] = 74,
   [77] = 77,
   [78] = 78,
-  [79] = 78,
+  [79] = 79,
   [80] = 80,
-  [81] = 81,
+  [81] = 79,
   [82] = 82,
   [83] = 83,
   [84] = 84,
@@ -1795,8 +1907,8 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [149] = 149,
   [150] = 150,
   [151] = 151,
-  [152] = 125,
-  [153] = 124,
+  [152] = 152,
+  [153] = 153,
   [154] = 154,
   [155] = 155,
   [156] = 156,
@@ -1825,11 +1937,11 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [179] = 179,
   [180] = 180,
   [181] = 181,
-  [182] = 182,
+  [182] = 127,
   [183] = 183,
   [184] = 184,
-  [185] = 185,
-  [186] = 86,
+  [185] = 126,
+  [186] = 186,
   [187] = 187,
   [188] = 188,
   [189] = 189,
@@ -1837,28 +1949,28 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [191] = 191,
   [192] = 192,
   [193] = 193,
-  [194] = 92,
-  [195] = 91,
+  [194] = 194,
+  [195] = 195,
   [196] = 196,
   [197] = 197,
   [198] = 198,
   [199] = 199,
-  [200] = 87,
+  [200] = 200,
   [201] = 201,
   [202] = 202,
   [203] = 203,
-  [204] = 89,
-  [205] = 205,
-  [206] = 90,
+  [204] = 204,
+  [205] = 87,
+  [206] = 206,
   [207] = 207,
-  [208] = 208,
-  [209] = 209,
+  [208] = 95,
+  [209] = 92,
   [210] = 210,
-  [211] = 211,
+  [211] = 91,
   [212] = 212,
-  [213] = 213,
+  [213] = 88,
   [214] = 214,
-  [215] = 215,
+  [215] = 89,
   [216] = 216,
   [217] = 217,
   [218] = 218,
@@ -1882,15 +1994,15 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [236] = 236,
   [237] = 237,
   [238] = 238,
-  [239] = 125,
-  [240] = 124,
+  [239] = 239,
+  [240] = 240,
   [241] = 241,
   [242] = 242,
   [243] = 243,
   [244] = 244,
   [245] = 245,
-  [246] = 246,
-  [247] = 247,
+  [246] = 126,
+  [247] = 127,
   [248] = 248,
   [249] = 249,
   [250] = 250,
@@ -1907,15 +2019,15 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [261] = 261,
   [262] = 262,
   [263] = 263,
-  [264] = 124,
+  [264] = 264,
   [265] = 265,
   [266] = 266,
   [267] = 267,
   [268] = 268,
-  [269] = 269,
+  [269] = 126,
   [270] = 270,
-  [271] = 125,
-  [272] = 272,
+  [271] = 271,
+  [272] = 127,
   [273] = 273,
   [274] = 274,
   [275] = 275,
@@ -2003,7 +2115,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [357] = 357,
   [358] = 358,
   [359] = 359,
-  [360] = 355,
+  [360] = 360,
   [361] = 361,
   [362] = 362,
   [363] = 363,
@@ -2029,7 +2141,7 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [383] = 383,
   [384] = 384,
   [385] = 385,
-  [386] = 386,
+  [386] = 363,
   [387] = 387,
   [388] = 388,
   [389] = 389,
@@ -2095,13 +2207,13 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [449] = 449,
   [450] = 450,
   [451] = 451,
-  [452] = 279,
+  [452] = 452,
   [453] = 453,
   [454] = 454,
   [455] = 455,
   [456] = 456,
   [457] = 457,
-  [458] = 458,
+  [458] = 279,
   [459] = 459,
   [460] = 460,
   [461] = 461,
@@ -2112,9 +2224,15 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [466] = 466,
   [467] = 467,
   [468] = 468,
-  [469] = 400,
-  [470] = 400,
+  [469] = 469,
+  [470] = 470,
   [471] = 471,
+  [472] = 472,
+  [473] = 473,
+  [474] = 474,
+  [475] = 445,
+  [476] = 445,
+  [477] = 477,
 };
 
 static bool ts_lex(TSLexer *lexer, TSStateId state) {
@@ -3845,10 +3963,10 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [60] = {.lex_state = 60},
   [61] = {.lex_state = 60},
   [62] = {.lex_state = 60},
-  [63] = {.lex_state = 61},
-  [64] = {.lex_state = 61},
-  [65] = {.lex_state = 12},
-  [66] = {.lex_state = 12},
+  [63] = {.lex_state = 60},
+  [64] = {.lex_state = 60},
+  [65] = {.lex_state = 61},
+  [66] = {.lex_state = 61},
   [67] = {.lex_state = 12},
   [68] = {.lex_state = 12},
   [69] = {.lex_state = 12},
@@ -3862,22 +3980,22 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [77] = {.lex_state = 12},
   [78] = {.lex_state = 12},
   [79] = {.lex_state = 12},
-  [80] = {.lex_state = 61},
-  [81] = {.lex_state = 61},
+  [80] = {.lex_state = 12},
+  [81] = {.lex_state = 12},
   [82] = {.lex_state = 61},
   [83] = {.lex_state = 61},
   [84] = {.lex_state = 61},
-  [85] = {.lex_state = 63},
-  [86] = {.lex_state = 12},
+  [85] = {.lex_state = 61},
+  [86] = {.lex_state = 61},
   [87] = {.lex_state = 12},
-  [88] = {.lex_state = 61},
+  [88] = {.lex_state = 12},
   [89] = {.lex_state = 12},
-  [90] = {.lex_state = 12},
+  [90] = {.lex_state = 61},
   [91] = {.lex_state = 12},
   [92] = {.lex_state = 12},
-  [93] = {.lex_state = 61},
+  [93] = {.lex_state = 63},
   [94] = {.lex_state = 61},
-  [95] = {.lex_state = 61},
+  [95] = {.lex_state = 12},
   [96] = {.lex_state = 61},
   [97] = {.lex_state = 61},
   [98] = {.lex_state = 61},
@@ -3906,20 +4024,20 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [121] = {.lex_state = 61},
   [122] = {.lex_state = 61},
   [123] = {.lex_state = 61},
-  [124] = {.lex_state = 12},
-  [125] = {.lex_state = 12},
+  [124] = {.lex_state = 61},
+  [125] = {.lex_state = 61},
   [126] = {.lex_state = 12},
-  [127] = {.lex_state = 60},
-  [128] = {.lex_state = 61},
-  [129] = {.lex_state = 61},
+  [127] = {.lex_state = 12},
+  [128] = {.lex_state = 12},
+  [129] = {.lex_state = 60},
   [130] = {.lex_state = 60},
-  [131] = {.lex_state = 60},
+  [131] = {.lex_state = 61},
   [132] = {.lex_state = 61},
-  [133] = {.lex_state = 60},
+  [133] = {.lex_state = 61},
   [134] = {.lex_state = 60},
-  [135] = {.lex_state = 61},
-  [136] = {.lex_state = 61},
-  [137] = {.lex_state = 60},
+  [135] = {.lex_state = 60},
+  [136] = {.lex_state = 60},
+  [137] = {.lex_state = 61},
   [138] = {.lex_state = 61},
   [139] = {.lex_state = 61},
   [140] = {.lex_state = 61},
@@ -3932,10 +4050,10 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [147] = {.lex_state = 61},
   [148] = {.lex_state = 61},
   [149] = {.lex_state = 61},
-  [150] = {.lex_state = 60},
+  [150] = {.lex_state = 61},
   [151] = {.lex_state = 60},
-  [152] = {.lex_state = 63},
-  [153] = {.lex_state = 63},
+  [152] = {.lex_state = 60},
+  [153] = {.lex_state = 60},
   [154] = {.lex_state = 60},
   [155] = {.lex_state = 60},
   [156] = {.lex_state = 60},
@@ -3964,10 +4082,10 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [179] = {.lex_state = 60},
   [180] = {.lex_state = 60},
   [181] = {.lex_state = 60},
-  [182] = {.lex_state = 60},
+  [182] = {.lex_state = 63},
   [183] = {.lex_state = 60},
   [184] = {.lex_state = 60},
-  [185] = {.lex_state = 60},
+  [185] = {.lex_state = 63},
   [186] = {.lex_state = 60},
   [187] = {.lex_state = 60},
   [188] = {.lex_state = 60},
@@ -4010,132 +4128,132 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [225] = {.lex_state = 60},
   [226] = {.lex_state = 60},
   [227] = {.lex_state = 60},
-  [228] = {.lex_state = 61},
+  [228] = {.lex_state = 60},
   [229] = {.lex_state = 60},
   [230] = {.lex_state = 60},
   [231] = {.lex_state = 60},
   [232] = {.lex_state = 60},
-  [233] = {.lex_state = 60},
+  [233] = {.lex_state = 61},
   [234] = {.lex_state = 60},
   [235] = {.lex_state = 60},
   [236] = {.lex_state = 60},
   [237] = {.lex_state = 60},
   [238] = {.lex_state = 60},
-  [239] = {.lex_state = 63},
-  [240] = {.lex_state = 63},
+  [239] = {.lex_state = 60},
+  [240] = {.lex_state = 60},
   [241] = {.lex_state = 60},
   [242] = {.lex_state = 60},
   [243] = {.lex_state = 60},
   [244] = {.lex_state = 60},
-  [245] = {.lex_state = 0},
-  [246] = {.lex_state = 60},
-  [247] = {.lex_state = 60},
+  [245] = {.lex_state = 60},
+  [246] = {.lex_state = 63},
+  [247] = {.lex_state = 63},
   [248] = {.lex_state = 60},
   [249] = {.lex_state = 60},
   [250] = {.lex_state = 60},
   [251] = {.lex_state = 60},
-  [252] = {.lex_state = 60},
+  [252] = {.lex_state = 0},
   [253] = {.lex_state = 60},
   [254] = {.lex_state = 60},
   [255] = {.lex_state = 60},
-  [256] = {.lex_state = 16},
-  [257] = {.lex_state = 61},
-  [258] = {.lex_state = 0},
-  [259] = {.lex_state = 0},
-  [260] = {.lex_state = 0},
-  [261] = {.lex_state = 0},
-  [262] = {.lex_state = 0},
-  [263] = {.lex_state = 61},
-  [264] = {.lex_state = 16},
+  [256] = {.lex_state = 60},
+  [257] = {.lex_state = 60},
+  [258] = {.lex_state = 60},
+  [259] = {.lex_state = 60},
+  [260] = {.lex_state = 60},
+  [261] = {.lex_state = 16},
+  [262] = {.lex_state = 60},
+  [263] = {.lex_state = 0},
+  [264] = {.lex_state = 61},
   [265] = {.lex_state = 0},
-  [266] = {.lex_state = 61},
-  [267] = {.lex_state = 60},
+  [266] = {.lex_state = 0},
+  [267] = {.lex_state = 0},
   [268] = {.lex_state = 0},
-  [269] = {.lex_state = 0},
-  [270] = {.lex_state = 5},
-  [271] = {.lex_state = 16},
-  [272] = {.lex_state = 0},
-  [273] = {.lex_state = 61},
-  [274] = {.lex_state = 0},
-  [275] = {.lex_state = 0},
-  [276] = {.lex_state = 61},
-  [277] = {.lex_state = 61},
-  [278] = {.lex_state = 61},
+  [269] = {.lex_state = 16},
+  [270] = {.lex_state = 0},
+  [271] = {.lex_state = 61},
+  [272] = {.lex_state = 16},
+  [273] = {.lex_state = 0},
+  [274] = {.lex_state = 61},
+  [275] = {.lex_state = 5},
+  [276] = {.lex_state = 0},
+  [277] = {.lex_state = 60},
+  [278] = {.lex_state = 0},
   [279] = {.lex_state = 5},
-  [280] = {.lex_state = 0},
+  [280] = {.lex_state = 61},
   [281] = {.lex_state = 0},
   [282] = {.lex_state = 0},
-  [283] = {.lex_state = 60},
-  [284] = {.lex_state = 15},
-  [285] = {.lex_state = 60},
+  [283] = {.lex_state = 61},
+  [284] = {.lex_state = 0},
+  [285] = {.lex_state = 61},
   [286] = {.lex_state = 61},
-  [287] = {.lex_state = 20},
+  [287] = {.lex_state = 0},
   [288] = {.lex_state = 15},
-  [289] = {.lex_state = 61},
-  [290] = {.lex_state = 20},
-  [291] = {.lex_state = 60},
-  [292] = {.lex_state = 20},
-  [293] = {.lex_state = 60},
-  [294] = {.lex_state = 15},
-  [295] = {.lex_state = 20},
-  [296] = {.lex_state = 15},
-  [297] = {.lex_state = 61},
-  [298] = {.lex_state = 0},
-  [299] = {.lex_state = 0},
+  [289] = {.lex_state = 60},
+  [290] = {.lex_state = 60},
+  [291] = {.lex_state = 0},
+  [292] = {.lex_state = 61},
+  [293] = {.lex_state = 0},
+  [294] = {.lex_state = 60},
+  [295] = {.lex_state = 60},
+  [296] = {.lex_state = 61},
+  [297] = {.lex_state = 60},
+  [298] = {.lex_state = 61},
+  [299] = {.lex_state = 60},
   [300] = {.lex_state = 0},
-  [301] = {.lex_state = 15},
-  [302] = {.lex_state = 61},
-  [303] = {.lex_state = 61},
-  [304] = {.lex_state = 0},
-  [305] = {.lex_state = 60},
+  [301] = {.lex_state = 60},
+  [302] = {.lex_state = 15},
+  [303] = {.lex_state = 60},
+  [304] = {.lex_state = 20},
+  [305] = {.lex_state = 61},
   [306] = {.lex_state = 60},
-  [307] = {.lex_state = 20},
+  [307] = {.lex_state = 60},
   [308] = {.lex_state = 61},
-  [309] = {.lex_state = 0},
-  [310] = {.lex_state = 61},
-  [311] = {.lex_state = 60},
-  [312] = {.lex_state = 60},
-  [313] = {.lex_state = 60},
-  [314] = {.lex_state = 60},
-  [315] = {.lex_state = 60},
-  [316] = {.lex_state = 60},
+  [309] = {.lex_state = 60},
+  [310] = {.lex_state = 20},
+  [311] = {.lex_state = 61},
+  [312] = {.lex_state = 20},
+  [313] = {.lex_state = 15},
+  [314] = {.lex_state = 15},
+  [315] = {.lex_state = 20},
+  [316] = {.lex_state = 0},
   [317] = {.lex_state = 61},
-  [318] = {.lex_state = 60},
-  [319] = {.lex_state = 60},
-  [320] = {.lex_state = 0},
+  [318] = {.lex_state = 61},
+  [319] = {.lex_state = 15},
+  [320] = {.lex_state = 20},
   [321] = {.lex_state = 0},
-  [322] = {.lex_state = 0},
-  [323] = {.lex_state = 12},
-  [324] = {.lex_state = 12},
-  [325] = {.lex_state = 0},
-  [326] = {.lex_state = 60},
+  [322] = {.lex_state = 60},
+  [323] = {.lex_state = 60},
+  [324] = {.lex_state = 0},
+  [325] = {.lex_state = 12},
+  [326] = {.lex_state = 12},
   [327] = {.lex_state = 0},
   [328] = {.lex_state = 0},
   [329] = {.lex_state = 0},
   [330] = {.lex_state = 0},
   [331] = {.lex_state = 0},
-  [332] = {.lex_state = 12},
+  [332] = {.lex_state = 0},
   [333] = {.lex_state = 0},
   [334] = {.lex_state = 0},
   [335] = {.lex_state = 0},
-  [336] = {.lex_state = 60},
+  [336] = {.lex_state = 0},
   [337] = {.lex_state = 0},
   [338] = {.lex_state = 60},
-  [339] = {.lex_state = 61},
+  [339] = {.lex_state = 12},
   [340] = {.lex_state = 0},
   [341] = {.lex_state = 12},
-  [342] = {.lex_state = 0},
-  [343] = {.lex_state = 0},
-  [344] = {.lex_state = 0},
-  [345] = {.lex_state = 0},
+  [342] = {.lex_state = 60},
+  [343] = {.lex_state = 12},
+  [344] = {.lex_state = 60},
+  [345] = {.lex_state = 60},
   [346] = {.lex_state = 0},
-  [347] = {.lex_state = 12},
+  [347] = {.lex_state = 61},
   [348] = {.lex_state = 0},
   [349] = {.lex_state = 0},
   [350] = {.lex_state = 0},
   [351] = {.lex_state = 0},
-  [352] = {.lex_state = 60},
-  [353] = {.lex_state = 0},
+  [352] = {.lex_state = 0},
+  [353] = {.lex_state = 60},
   [354] = {.lex_state = 0},
   [355] = {.lex_state = 0},
   [356] = {.lex_state = 0},
@@ -4149,10 +4267,10 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [364] = {.lex_state = 0},
   [365] = {.lex_state = 0},
   [366] = {.lex_state = 0},
-  [367] = {.lex_state = 60},
-  [368] = {.lex_state = 61},
+  [367] = {.lex_state = 0},
+  [368] = {.lex_state = 0},
   [369] = {.lex_state = 0},
-  [370] = {.lex_state = 0},
+  [370] = {.lex_state = 18},
   [371] = {.lex_state = 0},
   [372] = {.lex_state = 0},
   [373] = {.lex_state = 0},
@@ -4162,98 +4280,104 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [377] = {.lex_state = 0},
   [378] = {.lex_state = 0},
   [379] = {.lex_state = 0},
-  [380] = {.lex_state = 18},
+  [380] = {.lex_state = 0},
   [381] = {.lex_state = 0},
   [382] = {.lex_state = 0},
   [383] = {.lex_state = 0},
-  [384] = {.lex_state = 0},
+  [384] = {.lex_state = 60},
   [385] = {.lex_state = 0},
   [386] = {.lex_state = 0},
   [387] = {.lex_state = 0},
   [388] = {.lex_state = 0},
   [389] = {.lex_state = 0},
-  [390] = {.lex_state = 0},
+  [390] = {.lex_state = 61},
   [391] = {.lex_state = 0},
   [392] = {.lex_state = 60},
   [393] = {.lex_state = 0},
-  [394] = {.lex_state = 60},
+  [394] = {.lex_state = 0},
   [395] = {.lex_state = 0},
   [396] = {.lex_state = 0},
-  [397] = {.lex_state = 12},
-  [398] = {.lex_state = 12},
-  [399] = {.lex_state = 12},
-  [400] = {.lex_state = 0},
+  [397] = {.lex_state = 0},
+  [398] = {.lex_state = 0},
+  [399] = {.lex_state = 0},
+  [400] = {.lex_state = 12},
   [401] = {.lex_state = 0},
   [402] = {.lex_state = 0},
   [403] = {.lex_state = 0},
-  [404] = {.lex_state = 0},
-  [405] = {.lex_state = 12},
-  [406] = {.lex_state = 12},
-  [407] = {.lex_state = 0},
-  [408] = {.lex_state = 0},
-  [409] = {.lex_state = 12},
-  [410] = {.lex_state = 60},
+  [404] = {.lex_state = 12},
+  [405] = {.lex_state = 0},
+  [406] = {.lex_state = 0},
+  [407] = {.lex_state = 12},
+  [408] = {.lex_state = 60},
+  [409] = {.lex_state = 0},
+  [410] = {.lex_state = 0},
   [411] = {.lex_state = 0},
-  [412] = {.lex_state = 12},
-  [413] = {.lex_state = 0},
+  [412] = {.lex_state = 0},
+  [413] = {.lex_state = 12},
   [414] = {.lex_state = 60},
-  [415] = {.lex_state = 0},
-  [416] = {.lex_state = 12},
+  [415] = {.lex_state = 12},
+  [416] = {.lex_state = 0},
   [417] = {.lex_state = 60},
   [418] = {.lex_state = 60},
   [419] = {.lex_state = 0},
   [420] = {.lex_state = 0},
-  [421] = {.lex_state = 0},
-  [422] = {.lex_state = 0},
-  [423] = {.lex_state = 12},
+  [421] = {.lex_state = 60},
+  [422] = {.lex_state = 12},
+  [423] = {.lex_state = 0},
   [424] = {.lex_state = 0},
   [425] = {.lex_state = 0},
-  [426] = {.lex_state = 60},
-  [427] = {.lex_state = 0},
+  [426] = {.lex_state = 0},
+  [427] = {.lex_state = 12},
   [428] = {.lex_state = 0},
-  [429] = {.lex_state = 60},
-  [430] = {.lex_state = 0},
-  [431] = {.lex_state = 60},
+  [429] = {.lex_state = 12},
+  [430] = {.lex_state = 12},
+  [431] = {.lex_state = 12},
   [432] = {.lex_state = 60},
-  [433] = {.lex_state = 12},
+  [433] = {.lex_state = 60},
   [434] = {.lex_state = 0},
   [435] = {.lex_state = 60},
   [436] = {.lex_state = 0},
   [437] = {.lex_state = 60},
   [438] = {.lex_state = 0},
   [439] = {.lex_state = 12},
-  [440] = {.lex_state = 12},
-  [441] = {.lex_state = 60},
-  [442] = {.lex_state = 12},
-  [443] = {.lex_state = 12},
+  [440] = {.lex_state = 0},
+  [441] = {.lex_state = 0},
+  [442] = {.lex_state = 0},
+  [443] = {.lex_state = 60},
   [444] = {.lex_state = 12},
   [445] = {.lex_state = 0},
   [446] = {.lex_state = 12},
-  [447] = {.lex_state = 0},
+  [447] = {.lex_state = 60},
   [448] = {.lex_state = 0},
   [449] = {.lex_state = 0},
-  [450] = {.lex_state = 0},
+  [450] = {.lex_state = 60},
   [451] = {.lex_state = 0},
-  [452] = {.lex_state = 0},
+  [452] = {.lex_state = 12},
   [453] = {.lex_state = 0},
-  [454] = {.lex_state = 0},
-  [455] = {.lex_state = 12},
+  [454] = {.lex_state = 12},
+  [455] = {.lex_state = 0},
   [456] = {.lex_state = 0},
   [457] = {.lex_state = 0},
   [458] = {.lex_state = 0},
   [459] = {.lex_state = 21},
-  [460] = {.lex_state = 22},
-  [461] = {.lex_state = 23},
-  [462] = {.lex_state = 122},
-  [463] = {.lex_state = 117},
-  [464] = {.lex_state = 60},
+  [460] = {.lex_state = 0},
+  [461] = {.lex_state = 60},
+  [462] = {.lex_state = 22},
+  [463] = {.lex_state = 23},
+  [464] = {.lex_state = 12},
   [465] = {.lex_state = 0},
-  [466] = {.lex_state = 0},
-  [467] = {.lex_state = 0},
-  [468] = {.lex_state = 12},
-  [469] = {.lex_state = 0},
+  [466] = {.lex_state = 12},
+  [467] = {.lex_state = 60},
+  [468] = {.lex_state = 122},
+  [469] = {.lex_state = 117},
   [470] = {.lex_state = 0},
-  [471] = {.lex_state = 60},
+  [471] = {.lex_state = 0},
+  [472] = {.lex_state = 0},
+  [473] = {.lex_state = 0},
+  [474] = {.lex_state = 12},
+  [475] = {.lex_state = 0},
+  [476] = {.lex_state = 0},
+  [477] = {.lex_state = 0},
 };
 
 static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
@@ -4344,23 +4468,23 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [aux_sym_method_name_token1] = ACTIONS(1),
   },
   [1] = {
-    [sym_program] = STATE(454),
-    [sym_namespace] = STATE(453),
-    [sym_use_directive] = STATE(131),
-    [sym_annotation] = STATE(133),
-    [sym_decl] = STATE(155),
-    [sym_class_decl] = STATE(241),
-    [sym_module_decl] = STATE(241),
-    [sym_class_alias_decl] = STATE(241),
-    [sym_module_alias_decl] = STATE(241),
-    [sym_interface_decl] = STATE(241),
-    [sym_type_alias_decl] = STATE(241),
-    [sym_const_decl] = STATE(241),
-    [sym_const_name] = STATE(443),
-    [sym_global_decl] = STATE(241),
-    [aux_sym_program_repeat1] = STATE(131),
-    [aux_sym_program_repeat2] = STATE(155),
-    [aux_sym_decl_repeat1] = STATE(214),
+    [sym_program] = STATE(441),
+    [sym_namespace] = STATE(440),
+    [sym_use_directive] = STATE(134),
+    [sym_annotation] = STATE(135),
+    [sym_decl] = STATE(156),
+    [sym_class_decl] = STATE(245),
+    [sym_module_decl] = STATE(245),
+    [sym_class_alias_decl] = STATE(245),
+    [sym_module_alias_decl] = STATE(245),
+    [sym_interface_decl] = STATE(245),
+    [sym_type_alias_decl] = STATE(245),
+    [sym_const_decl] = STATE(245),
+    [sym_const_name] = STATE(427),
+    [sym_global_decl] = STATE(245),
+    [aux_sym_program_repeat1] = STATE(134),
+    [aux_sym_program_repeat2] = STATE(156),
+    [aux_sym_decl_repeat1] = STATE(220),
     [ts_builtin_sym_end] = ACTIONS(5),
     [sym_constant] = ACTIONS(7),
     [anon_sym_class] = ACTIONS(9),
@@ -4423,34 +4547,34 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_QMARK2,
     ACTIONS(73), 1,
       anon_sym_STAR_STAR,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(257), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(264), 1,
       sym_type,
-    STATE(334), 1,
+    STATE(332), 1,
       sym_parameter,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
-    STATE(363), 1,
+    STATE(396), 1,
       sym_required_positionals,
-    STATE(364), 1,
-      sym_optional_positionals,
-    STATE(365), 1,
+    STATE(397), 1,
       sym_rest_positional,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
-      sym_splat_keyword,
-    STATE(449), 1,
+    STATE(398), 1,
+      sym_optional_positionals,
+    STATE(401), 1,
       sym_keywords,
+    STATE(409), 1,
+      sym_splat_keyword,
+    STATE(413), 1,
+      sym_var_name,
     ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(447), 2,
+    STATE(410), 2,
       sym_required_keywords,
       sym_optional_keywords,
     ACTIONS(39), 9,
@@ -4463,7 +4587,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -4519,32 +4643,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR_STAR,
     ACTIONS(75), 1,
       anon_sym_QMARK2,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(257), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(264), 1,
       sym_type,
     STATE(335), 1,
-      sym_parameter,
-    STATE(345), 1,
       sym_namespace,
-    STATE(370), 1,
-      sym_trailing_positionals,
-    STATE(371), 1,
+    STATE(346), 1,
+      sym_parameter,
+    STATE(361), 1,
       sym_rest_positional,
-    STATE(428), 1,
-      sym_keywords,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
+    STATE(383), 1,
+      sym_trailing_positionals,
+    STATE(409), 1,
       sym_splat_keyword,
+    STATE(413), 1,
+      sym_var_name,
+    STATE(416), 1,
+      sym_keywords,
     ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(447), 2,
+    STATE(410), 2,
       sym_required_keywords,
       sym_optional_keywords,
     ACTIONS(39), 9,
@@ -4557,7 +4681,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -4613,32 +4737,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR_STAR,
     ACTIONS(75), 1,
       anon_sym_QMARK2,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(257), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(264), 1,
       sym_type,
     STATE(335), 1,
-      sym_parameter,
-    STATE(345), 1,
       sym_namespace,
+    STATE(346), 1,
+      sym_parameter,
     STATE(373), 1,
       sym_rest_positional,
-    STATE(377), 1,
+    STATE(374), 1,
       sym_trailing_positionals,
-    STATE(425), 1,
-      sym_keywords,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
+    STATE(409), 1,
       sym_splat_keyword,
+    STATE(413), 1,
+      sym_var_name,
+    STATE(434), 1,
+      sym_keywords,
     ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(447), 2,
+    STATE(410), 2,
       sym_required_keywords,
       sym_optional_keywords,
     ACTIONS(39), 9,
@@ -4651,7 +4775,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -4705,30 +4829,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR_STAR,
     ACTIONS(75), 1,
       anon_sym_QMARK2,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(257), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(264), 1,
       sym_type,
     STATE(335), 1,
-      sym_parameter,
-    STATE(345), 1,
       sym_namespace,
-    STATE(377), 1,
+    STATE(346), 1,
+      sym_parameter,
+    STATE(383), 1,
       sym_trailing_positionals,
-    STATE(425), 1,
-      sym_keywords,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
+    STATE(409), 1,
       sym_splat_keyword,
+    STATE(413), 1,
+      sym_var_name,
+    STATE(416), 1,
+      sym_keywords,
     ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(447), 2,
+    STATE(410), 2,
       sym_required_keywords,
       sym_optional_keywords,
     ACTIONS(39), 9,
@@ -4741,7 +4865,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -4795,30 +4919,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR_STAR,
     ACTIONS(75), 1,
       anon_sym_QMARK2,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(257), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(264), 1,
       sym_type,
     STATE(335), 1,
-      sym_parameter,
-    STATE(345), 1,
       sym_namespace,
-    STATE(366), 1,
+    STATE(346), 1,
+      sym_parameter,
+    STATE(377), 1,
       sym_trailing_positionals,
-    STATE(445), 1,
-      sym_keywords,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
+    STATE(409), 1,
       sym_splat_keyword,
+    STATE(413), 1,
+      sym_var_name,
+    STATE(434), 1,
+      sym_keywords,
     ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(447), 2,
+    STATE(410), 2,
       sym_required_keywords,
       sym_optional_keywords,
     ACTIONS(39), 9,
@@ -4831,7 +4955,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -4885,30 +5009,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_STAR_STAR,
     ACTIONS(75), 1,
       anon_sym_QMARK2,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(257), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(264), 1,
       sym_type,
     STATE(335), 1,
-      sym_parameter,
-    STATE(345), 1,
       sym_namespace,
-    STATE(369), 1,
+    STATE(346), 1,
+      sym_parameter,
+    STATE(387), 1,
       sym_trailing_positionals,
-    STATE(428), 1,
-      sym_keywords,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
+    STATE(409), 1,
       sym_splat_keyword,
+    STATE(413), 1,
+      sym_var_name,
+    STATE(451), 1,
+      sym_keywords,
     ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
-    STATE(447), 2,
+    STATE(410), 2,
       sym_required_keywords,
       sym_optional_keywords,
     ACTIONS(39), 9,
@@ -4921,7 +5045,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -4983,25 +5107,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
     STATE(10), 1,
       sym_module_type_parameters,
-    STATE(13), 1,
+    STATE(14), 1,
       aux_sym_class_decl_repeat1,
-    STATE(15), 1,
+    STATE(25), 1,
       sym_module_self_type_binds,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -5013,14 +5137,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -5076,25 +5200,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_EQ2,
     STATE(11), 1,
       sym_module_type_parameters,
-    STATE(16), 1,
-      aux_sym_class_decl_repeat1,
-    STATE(17), 1,
+    STATE(12), 1,
       sym_superclass,
-    STATE(70), 1,
+    STATE(18), 1,
+      aux_sym_class_decl_repeat1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -5106,14 +5230,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -5163,25 +5287,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
     ACTIONS(109), 1,
       anon_sym_end,
-    STATE(12), 1,
+    STATE(23), 1,
       sym_module_self_type_binds,
-    STATE(19), 1,
+    STATE(24), 1,
       aux_sym_class_decl_repeat1,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -5193,14 +5317,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -5250,25 +5374,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LT,
     ACTIONS(111), 1,
       anon_sym_end,
-    STATE(18), 1,
+    STATE(20), 1,
       aux_sym_class_decl_repeat1,
-    STATE(23), 1,
+    STATE(21), 1,
       sym_superclass,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -5280,14 +5404,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -5335,23 +5459,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
     ACTIONS(113), 1,
       anon_sym_end,
-    STATE(20), 1,
+    STATE(22), 1,
       aux_sym_class_decl_repeat1,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -5363,14 +5487,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -5418,23 +5542,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
     ACTIONS(115), 1,
       anon_sym_end,
-    STATE(22), 1,
+    STATE(15), 1,
       aux_sym_class_decl_repeat1,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -5446,14 +5570,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -5501,23 +5625,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
     ACTIONS(117), 1,
       anon_sym_end,
-    STATE(22), 1,
+    STATE(15), 1,
       aux_sym_class_decl_repeat1,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -5529,14 +5653,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -5548,78 +5672,78 @@ static const uint16_t ts_small_parse_table[] = {
   [1616] = 33,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(7), 1,
+    ACTIONS(119), 1,
       sym_constant,
-    ACTIONS(9), 1,
+    ACTIONS(122), 1,
+      sym_self,
+    ACTIONS(125), 1,
       anon_sym_class,
-    ACTIONS(11), 1,
+    ACTIONS(128), 1,
       sym__scope,
-    ACTIONS(15), 1,
+    ACTIONS(131), 1,
       anon_sym_PERCENTa_LBRACE,
-    ACTIONS(17), 1,
+    ACTIONS(134), 1,
       anon_sym_PERCENTa_LPAREN,
-    ACTIONS(19), 1,
+    ACTIONS(137), 1,
       anon_sym_PERCENTa_LBRACK,
-    ACTIONS(21), 1,
+    ACTIONS(140), 1,
       anon_sym_PERCENTa_PIPE,
-    ACTIONS(23), 1,
+    ACTIONS(143), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(25), 1,
+    ACTIONS(146), 1,
+      anon_sym_end,
+    ACTIONS(148), 1,
       anon_sym_module,
-    ACTIONS(27), 1,
+    ACTIONS(151), 1,
       anon_sym_interface,
-    ACTIONS(29), 1,
+    ACTIONS(154), 1,
       anon_sym_type,
-    ACTIONS(77), 1,
-      sym_self,
-    ACTIONS(87), 1,
+    ACTIONS(157), 1,
       anon_sym_def,
-    ACTIONS(93), 1,
+    ACTIONS(166), 1,
       anon_sym_include,
-    ACTIONS(95), 1,
+    ACTIONS(169), 1,
       anon_sym_extend,
-    ACTIONS(97), 1,
+    ACTIONS(172), 1,
       anon_sym_prepend,
-    ACTIONS(99), 1,
+    ACTIONS(175), 1,
       anon_sym_alias,
-    ACTIONS(109), 1,
-      anon_sym_end,
-    STATE(19), 1,
+    STATE(15), 1,
       aux_sym_class_decl_repeat1,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
-    ACTIONS(89), 2,
+    ACTIONS(160), 2,
       anon_sym_public,
       anon_sym_private,
-    ACTIONS(101), 2,
+    ACTIONS(178), 2,
       sym_ivar_name,
       sym_cvar_name,
-    ACTIONS(91), 3,
+    ACTIONS(163), 3,
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -5665,25 +5789,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
     ACTIONS(99), 1,
       anon_sym_alias,
-    ACTIONS(119), 1,
+    ACTIONS(181), 1,
       anon_sym_end,
-    STATE(22), 1,
+    STATE(15), 1,
       aux_sym_class_decl_repeat1,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -5695,14 +5819,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -5748,25 +5872,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
     ACTIONS(99), 1,
       anon_sym_alias,
-    ACTIONS(111), 1,
+    ACTIONS(183), 1,
       anon_sym_end,
-    STATE(18), 1,
+    STATE(15), 1,
       aux_sym_class_decl_repeat1,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -5778,14 +5902,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -5831,25 +5955,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
     ACTIONS(99), 1,
       anon_sym_alias,
-    ACTIONS(121), 1,
+    ACTIONS(185), 1,
       anon_sym_end,
-    STATE(22), 1,
+    STATE(15), 1,
       aux_sym_class_decl_repeat1,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -5861,14 +5985,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -5877,7 +6001,84 @@ static const uint16_t ts_small_parse_table[] = {
       sym_type_alias_decl,
       sym_const_decl,
       sym_member,
-  [2080] = 33,
+  [2080] = 27,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(11), 1,
+      sym__scope,
+    ACTIONS(33), 1,
+      sym_identifier,
+    ACTIONS(35), 1,
+      sym_constant,
+    ACTIONS(37), 1,
+      sym_interface,
+    ACTIONS(41), 1,
+      anon_sym_LPAREN,
+    ACTIONS(45), 1,
+      anon_sym_singleton,
+    ACTIONS(47), 1,
+      anon_sym_LBRACK,
+    ACTIONS(49), 1,
+      anon_sym_LBRACE,
+    ACTIONS(53), 1,
+      anon_sym_DQUOTE,
+    ACTIONS(55), 1,
+      anon_sym_SQUOTE,
+    ACTIONS(57), 1,
+      anon_sym_COLON_DQUOTE,
+    ACTIONS(59), 1,
+      anon_sym_COLON_SQUOTE,
+    ACTIONS(61), 1,
+      aux_sym_symbol_literal_token1,
+    ACTIONS(63), 1,
+      aux_sym_symbol_literal_token2,
+    ACTIONS(65), 1,
+      sym_integer_literal,
+    ACTIONS(67), 1,
+      anon_sym_CARET,
+    STATE(82), 1,
+      sym_class_name,
+    STATE(85), 1,
+      sym_alias_name,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(264), 1,
+      sym_type,
+    STATE(327), 1,
+      sym_parameter,
+    STATE(335), 1,
+      sym_namespace,
+    STATE(407), 1,
+      sym_var_name,
+    ACTIONS(51), 2,
+      anon_sym_true,
+      anon_sym_false,
+    ACTIONS(39), 9,
+      sym_self,
+      anon_sym_instance,
+      anon_sym_class,
+      anon_sym_bool,
+      anon_sym_untyped,
+      anon_sym_nil,
+      anon_sym_top,
+      anon_sym_bot,
+      anon_sym_void,
+    STATE(116), 14,
+      sym_builtin_type,
+      sym_class_type,
+      sym_interface_type,
+      sym_alias_type,
+      sym_singleton_type,
+      sym_union_type,
+      sym_intersection_type,
+      sym_optional_type,
+      sym_tuple_type,
+      sym_record_type,
+      sym__literal,
+      sym_string_literal,
+      sym_symbol_literal,
+      sym_proc,
+  [2184] = 33,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(7), 1,
@@ -5914,25 +6115,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
     ACTIONS(99), 1,
       anon_sym_alias,
-    ACTIONS(123), 1,
+    ACTIONS(187), 1,
       anon_sym_end,
-    STATE(22), 1,
+    STATE(15), 1,
       aux_sym_class_decl_repeat1,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -5944,14 +6145,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -5960,7 +6161,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_type_alias_decl,
       sym_const_decl,
       sym_member,
-  [2196] = 33,
+  [2300] = 33,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(7), 1,
@@ -5997,25 +6198,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
     ACTIONS(99), 1,
       anon_sym_alias,
-    ACTIONS(125), 1,
+    ACTIONS(189), 1,
       anon_sym_end,
-    STATE(22), 1,
+    STATE(17), 1,
       aux_sym_class_decl_repeat1,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -6027,14 +6228,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -6043,158 +6244,81 @@ static const uint16_t ts_small_parse_table[] = {
       sym_type_alias_decl,
       sym_const_decl,
       sym_member,
-  [2312] = 27,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(11), 1,
-      sym__scope,
-    ACTIONS(33), 1,
-      sym_identifier,
-    ACTIONS(35), 1,
-      sym_constant,
-    ACTIONS(37), 1,
-      sym_interface,
-    ACTIONS(41), 1,
-      anon_sym_LPAREN,
-    ACTIONS(45), 1,
-      anon_sym_singleton,
-    ACTIONS(47), 1,
-      anon_sym_LBRACK,
-    ACTIONS(49), 1,
-      anon_sym_LBRACE,
-    ACTIONS(53), 1,
-      anon_sym_DQUOTE,
-    ACTIONS(55), 1,
-      anon_sym_SQUOTE,
-    ACTIONS(57), 1,
-      anon_sym_COLON_DQUOTE,
-    ACTIONS(59), 1,
-      anon_sym_COLON_SQUOTE,
-    ACTIONS(61), 1,
-      aux_sym_symbol_literal_token1,
-    ACTIONS(63), 1,
-      aux_sym_symbol_literal_token2,
-    ACTIONS(65), 1,
-      sym_integer_literal,
-    ACTIONS(67), 1,
-      anon_sym_CARET,
-    STATE(80), 1,
-      sym_class_name,
-    STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
-      sym_alias_name,
-    STATE(257), 1,
-      sym_type,
-    STATE(321), 1,
-      sym_parameter,
-    STATE(345), 1,
-      sym_namespace,
-    STATE(398), 1,
-      sym_var_name,
-    ACTIONS(51), 2,
-      anon_sym_true,
-      anon_sym_false,
-    ACTIONS(39), 9,
-      sym_self,
-      anon_sym_instance,
-      anon_sym_class,
-      anon_sym_bool,
-      anon_sym_untyped,
-      anon_sym_nil,
-      anon_sym_top,
-      anon_sym_bot,
-      anon_sym_void,
-    STATE(111), 14,
-      sym_builtin_type,
-      sym_class_type,
-      sym_interface_type,
-      sym_alias_type,
-      sym_singleton_type,
-      sym_union_type,
-      sym_intersection_type,
-      sym_optional_type,
-      sym_tuple_type,
-      sym_record_type,
-      sym__literal,
-      sym_string_literal,
-      sym_symbol_literal,
-      sym_proc,
   [2416] = 33,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(127), 1,
+    ACTIONS(7), 1,
       sym_constant,
-    ACTIONS(130), 1,
-      sym_self,
-    ACTIONS(133), 1,
+    ACTIONS(9), 1,
       anon_sym_class,
-    ACTIONS(136), 1,
+    ACTIONS(11), 1,
       sym__scope,
-    ACTIONS(139), 1,
+    ACTIONS(15), 1,
       anon_sym_PERCENTa_LBRACE,
-    ACTIONS(142), 1,
+    ACTIONS(17), 1,
       anon_sym_PERCENTa_LPAREN,
-    ACTIONS(145), 1,
+    ACTIONS(19), 1,
       anon_sym_PERCENTa_LBRACK,
-    ACTIONS(148), 1,
+    ACTIONS(21), 1,
       anon_sym_PERCENTa_PIPE,
-    ACTIONS(151), 1,
+    ACTIONS(23), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(154), 1,
-      anon_sym_end,
-    ACTIONS(156), 1,
+    ACTIONS(25), 1,
       anon_sym_module,
-    ACTIONS(159), 1,
+    ACTIONS(27), 1,
       anon_sym_interface,
-    ACTIONS(162), 1,
+    ACTIONS(29), 1,
       anon_sym_type,
-    ACTIONS(165), 1,
+    ACTIONS(77), 1,
+      sym_self,
+    ACTIONS(87), 1,
       anon_sym_def,
-    ACTIONS(174), 1,
+    ACTIONS(93), 1,
       anon_sym_include,
-    ACTIONS(177), 1,
+    ACTIONS(95), 1,
       anon_sym_extend,
-    ACTIONS(180), 1,
+    ACTIONS(97), 1,
       anon_sym_prepend,
-    ACTIONS(183), 1,
+    ACTIONS(99), 1,
       anon_sym_alias,
-    STATE(22), 1,
+    ACTIONS(191), 1,
+      anon_sym_end,
+    STATE(15), 1,
       aux_sym_class_decl_repeat1,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
-    ACTIONS(168), 2,
+    ACTIONS(89), 2,
       anon_sym_public,
       anon_sym_private,
-    ACTIONS(186), 2,
+    ACTIONS(101), 2,
       sym_ivar_name,
       sym_cvar_name,
-    ACTIONS(171), 3,
+    ACTIONS(91), 3,
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -6240,25 +6364,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
     ACTIONS(99), 1,
       anon_sym_alias,
-    ACTIONS(189), 1,
+    ACTIONS(193), 1,
       anon_sym_end,
-    STATE(14), 1,
+    STATE(16), 1,
       aux_sym_class_decl_repeat1,
-    STATE(70), 1,
+    STATE(72), 1,
       sym_attribyte_type,
     STATE(130), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(191), 1,
+    STATE(203), 1,
       sym_visibility_member,
-    STATE(201), 1,
+    STATE(204), 1,
       sym_attribute_member,
-    STATE(270), 1,
+    STATE(275), 1,
       sym_visibility,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
     ACTIONS(89), 2,
       anon_sym_public,
@@ -6270,14 +6394,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-    STATE(193), 6,
+    STATE(206), 6,
       sym_ivar_member,
       sym_method_member,
       sym_include_member,
       sym_extend_member,
       sym_prepend_member,
       sym_alias_member,
-    STATE(199), 8,
+    STATE(207), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -6286,21 +6410,187 @@ static const uint16_t ts_small_parse_table[] = {
       sym_type_alias_decl,
       sym_const_decl,
       sym_member,
-  [2648] = 26,
+  [2648] = 33,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(7), 1,
+      sym_constant,
+    ACTIONS(9), 1,
+      anon_sym_class,
     ACTIONS(11), 1,
       sym__scope,
-    ACTIONS(35), 1,
-      sym_constant,
-    ACTIONS(37), 1,
-      sym_interface,
-    ACTIONS(41), 1,
-      anon_sym_LPAREN,
-    ACTIONS(45), 1,
-      anon_sym_singleton,
-    ACTIONS(47), 1,
-      anon_sym_LBRACK,
+    ACTIONS(15), 1,
+      anon_sym_PERCENTa_LBRACE,
+    ACTIONS(17), 1,
+      anon_sym_PERCENTa_LPAREN,
+    ACTIONS(19), 1,
+      anon_sym_PERCENTa_LBRACK,
+    ACTIONS(21), 1,
+      anon_sym_PERCENTa_PIPE,
+    ACTIONS(23), 1,
+      anon_sym_PERCENTa_LT,
+    ACTIONS(25), 1,
+      anon_sym_module,
+    ACTIONS(27), 1,
+      anon_sym_interface,
+    ACTIONS(29), 1,
+      anon_sym_type,
+    ACTIONS(77), 1,
+      sym_self,
+    ACTIONS(87), 1,
+      anon_sym_def,
+    ACTIONS(93), 1,
+      anon_sym_include,
+    ACTIONS(95), 1,
+      anon_sym_extend,
+    ACTIONS(97), 1,
+      anon_sym_prepend,
+    ACTIONS(99), 1,
+      anon_sym_alias,
+    ACTIONS(195), 1,
+      anon_sym_end,
+    STATE(15), 1,
+      aux_sym_class_decl_repeat1,
+    STATE(72), 1,
+      sym_attribyte_type,
+    STATE(130), 1,
+      aux_sym_decl_repeat1,
+    STATE(135), 1,
+      sym_annotation,
+    STATE(203), 1,
+      sym_visibility_member,
+    STATE(204), 1,
+      sym_attribute_member,
+    STATE(275), 1,
+      sym_visibility,
+    STATE(427), 1,
+      sym_const_name,
+    STATE(440), 1,
+      sym_namespace,
+    ACTIONS(89), 2,
+      anon_sym_public,
+      anon_sym_private,
+    ACTIONS(101), 2,
+      sym_ivar_name,
+      sym_cvar_name,
+    ACTIONS(91), 3,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+    STATE(206), 6,
+      sym_ivar_member,
+      sym_method_member,
+      sym_include_member,
+      sym_extend_member,
+      sym_prepend_member,
+      sym_alias_member,
+    STATE(207), 8,
+      sym_class_decl,
+      sym_module_decl,
+      sym_class_alias_decl,
+      sym_module_alias_decl,
+      sym_interface_decl,
+      sym_type_alias_decl,
+      sym_const_decl,
+      sym_member,
+  [2764] = 33,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(7), 1,
+      sym_constant,
+    ACTIONS(9), 1,
+      anon_sym_class,
+    ACTIONS(11), 1,
+      sym__scope,
+    ACTIONS(15), 1,
+      anon_sym_PERCENTa_LBRACE,
+    ACTIONS(17), 1,
+      anon_sym_PERCENTa_LPAREN,
+    ACTIONS(19), 1,
+      anon_sym_PERCENTa_LBRACK,
+    ACTIONS(21), 1,
+      anon_sym_PERCENTa_PIPE,
+    ACTIONS(23), 1,
+      anon_sym_PERCENTa_LT,
+    ACTIONS(25), 1,
+      anon_sym_module,
+    ACTIONS(27), 1,
+      anon_sym_interface,
+    ACTIONS(29), 1,
+      anon_sym_type,
+    ACTIONS(77), 1,
+      sym_self,
+    ACTIONS(87), 1,
+      anon_sym_def,
+    ACTIONS(93), 1,
+      anon_sym_include,
+    ACTIONS(95), 1,
+      anon_sym_extend,
+    ACTIONS(97), 1,
+      anon_sym_prepend,
+    ACTIONS(99), 1,
+      anon_sym_alias,
+    ACTIONS(197), 1,
+      anon_sym_end,
+    STATE(13), 1,
+      aux_sym_class_decl_repeat1,
+    STATE(72), 1,
+      sym_attribyte_type,
+    STATE(130), 1,
+      aux_sym_decl_repeat1,
+    STATE(135), 1,
+      sym_annotation,
+    STATE(203), 1,
+      sym_visibility_member,
+    STATE(204), 1,
+      sym_attribute_member,
+    STATE(275), 1,
+      sym_visibility,
+    STATE(427), 1,
+      sym_const_name,
+    STATE(440), 1,
+      sym_namespace,
+    ACTIONS(89), 2,
+      anon_sym_public,
+      anon_sym_private,
+    ACTIONS(101), 2,
+      sym_ivar_name,
+      sym_cvar_name,
+    ACTIONS(91), 3,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+    STATE(206), 6,
+      sym_ivar_member,
+      sym_method_member,
+      sym_include_member,
+      sym_extend_member,
+      sym_prepend_member,
+      sym_alias_member,
+    STATE(207), 8,
+      sym_class_decl,
+      sym_module_decl,
+      sym_class_alias_decl,
+      sym_module_alias_decl,
+      sym_interface_decl,
+      sym_type_alias_decl,
+      sym_const_decl,
+      sym_member,
+  [2880] = 26,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(11), 1,
+      sym__scope,
+    ACTIONS(35), 1,
+      sym_constant,
+    ACTIONS(37), 1,
+      sym_interface,
+    ACTIONS(41), 1,
+      anon_sym_LPAREN,
+    ACTIONS(45), 1,
+      anon_sym_singleton,
+    ACTIONS(47), 1,
+      anon_sym_LBRACK,
     ACTIONS(49), 1,
       anon_sym_LBRACE,
     ACTIONS(53), 1,
@@ -6319,19 +6609,19 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(257), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(264), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
-    STATE(396), 1,
+    STATE(376), 1,
       sym_parameter,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -6346,7 +6636,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -6361,7 +6651,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [2749] = 26,
+  [2981] = 26,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -6394,20 +6684,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
+    ACTIONS(201), 1,
+      anon_sym_RBRACK,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(257), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(271), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
-    STATE(374), 1,
-      sym_parameter,
     ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
@@ -6421,7 +6711,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -6436,7 +6726,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [2850] = 26,
+  [3082] = 26,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -6469,20 +6759,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    ACTIONS(193), 1,
-      anon_sym_RBRACK,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(278), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(264), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
+    STATE(365), 1,
+      sym_parameter,
     ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
@@ -6496,7 +6786,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -6511,7 +6801,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [2951] = 26,
+  [3183] = 26,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -6544,20 +6834,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    ACTIONS(195), 1,
-      anon_sym_RBRACK,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(263), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(264), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
+    STATE(477), 1,
+      sym_parameter,
     ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
@@ -6571,7 +6861,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -6586,7 +6876,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [3052] = 26,
+  [3284] = 26,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -6619,20 +6909,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    ACTIONS(197), 1,
-      anon_sym_RBRACK,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(278), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(264), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
+    STATE(379), 1,
+      sym_parameter,
     ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
@@ -6646,7 +6936,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -6661,7 +6951,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [3153] = 26,
+  [3385] = 26,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -6694,20 +6984,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
+    ACTIONS(203), 1,
+      anon_sym_RBRACK,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(257), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(285), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
-    STATE(358), 1,
-      sym_parameter,
     ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
@@ -6721,7 +7011,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -6736,7 +7026,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [3254] = 26,
+  [3486] = 26,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -6769,20 +7059,20 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
+    ACTIONS(205), 1,
+      anon_sym_RBRACK,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(257), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(285), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
-    STATE(388), 1,
-      sym_parameter,
     ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
@@ -6796,7 +7086,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -6811,7 +7101,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [3355] = 25,
+  [3587] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -6844,17 +7134,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(112), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(142), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -6869,7 +7159,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -6884,7 +7174,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [3453] = 25,
+  [3685] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -6917,17 +7207,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(139), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(131), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -6942,7 +7232,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -6957,7 +7247,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [3551] = 25,
+  [3783] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -6990,17 +7280,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(146), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(144), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7015,7 +7305,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7030,7 +7320,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [3649] = 25,
+  [3881] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7063,17 +7353,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(276), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(103), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7088,7 +7378,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7103,7 +7393,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [3747] = 25,
+  [3979] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7136,17 +7426,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(308), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(286), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7161,7 +7451,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7176,7 +7466,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [3845] = 25,
+  [4077] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7209,17 +7499,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(144), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(274), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7234,7 +7524,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7249,7 +7539,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [3943] = 25,
+  [4175] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7282,17 +7572,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(317), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(308), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7307,7 +7597,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7322,7 +7612,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [4041] = 25,
+  [4273] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7355,17 +7645,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(117), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(145), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7380,7 +7670,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7395,7 +7685,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [4139] = 25,
+  [4371] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7428,17 +7718,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(310), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(280), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7453,7 +7743,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7468,7 +7758,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [4237] = 25,
+  [4469] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7501,17 +7791,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(278), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(146), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7526,7 +7816,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7541,7 +7831,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [4335] = 25,
+  [4567] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7574,17 +7864,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(142), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(233), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7599,7 +7889,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7614,7 +7904,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [4433] = 25,
+  [4665] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7643,23 +7933,23 @@ static const uint16_t ts_small_parse_table[] = {
       aux_sym_symbol_literal_token1,
     ACTIONS(63), 1,
       aux_sym_symbol_literal_token2,
+    ACTIONS(65), 1,
+      sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    ACTIONS(201), 1,
-      sym_integer_literal,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(339), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(125), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
-    ACTIONS(199), 2,
+    ACTIONS(51), 2,
       anon_sym_true,
       anon_sym_false,
     ACTIONS(39), 9,
@@ -7672,7 +7962,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(302), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7687,7 +7977,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [4531] = 25,
+  [4763] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7720,17 +8010,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(228), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(133), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7745,7 +8035,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7760,7 +8050,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [4629] = 25,
+  [4861] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7793,17 +8083,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
+    STATE(86), 1,
+      sym_interface_name,
     STATE(141), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7818,7 +8108,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7833,7 +8123,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [4727] = 25,
+  [4959] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7866,17 +8156,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(129), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(149), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7891,7 +8181,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7906,7 +8196,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [4825] = 25,
+  [5057] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -7939,17 +8229,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(128), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(109), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -7964,7 +8254,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -7979,7 +8269,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [4923] = 25,
+  [5155] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8008,23 +8298,23 @@ static const uint16_t ts_small_parse_table[] = {
       aux_sym_symbol_literal_token1,
     ACTIONS(63), 1,
       aux_sym_symbol_literal_token2,
-    ACTIONS(65), 1,
-      sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
+    ACTIONS(209), 1,
+      sym_integer_literal,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(266), 1,
-      sym_type,
-    STATE(345), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(335), 1,
       sym_namespace,
-    ACTIONS(51), 2,
+    STATE(347), 1,
+      sym_type,
+    ACTIONS(207), 2,
       anon_sym_true,
       anon_sym_false,
     ACTIONS(39), 9,
@@ -8037,7 +8327,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(296), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8052,7 +8342,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [5021] = 25,
+  [5253] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8085,17 +8375,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(286), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(140), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8110,7 +8400,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8125,7 +8415,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [5119] = 25,
+  [5351] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8158,17 +8448,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(136), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(292), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8183,7 +8473,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8198,7 +8488,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [5217] = 25,
+  [5449] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8231,17 +8521,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(140), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(150), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8256,7 +8546,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8271,7 +8561,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [5315] = 25,
+  [5547] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8304,17 +8594,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(147), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(110), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8329,7 +8619,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8344,7 +8634,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [5413] = 25,
+  [5645] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8377,17 +8667,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(120), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(283), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8402,7 +8692,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8417,7 +8707,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [5511] = 25,
+  [5743] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8450,17 +8740,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(132), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(317), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8475,7 +8765,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8490,7 +8780,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [5609] = 25,
+  [5841] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8523,17 +8813,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(102), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(132), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8548,7 +8838,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8563,7 +8853,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [5707] = 25,
+  [5939] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8596,17 +8886,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
+    STATE(86), 1,
+      sym_interface_name,
     STATE(148), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8621,7 +8911,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8636,7 +8926,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [5805] = 25,
+  [6037] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8669,17 +8959,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(273), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(137), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8694,7 +8984,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8709,7 +8999,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [5903] = 25,
+  [6135] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8742,17 +9032,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(138), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(143), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8767,7 +9057,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8782,7 +9072,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [6001] = 25,
+  [6233] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8815,17 +9105,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(277), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(285), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8840,7 +9130,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8855,7 +9145,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [6099] = 25,
+  [6331] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8888,17 +9178,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(122), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(121), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8913,7 +9203,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -8928,7 +9218,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [6197] = 25,
+  [6429] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -8961,17 +9251,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(135), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(112), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -8986,7 +9276,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -9001,7 +9291,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [6295] = 25,
+  [6527] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -9034,17 +9324,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(149), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(147), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -9059,7 +9349,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -9074,7 +9364,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [6393] = 25,
+  [6625] = 25,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
@@ -9107,17 +9397,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_integer_literal,
     ACTIONS(67), 1,
       anon_sym_CARET,
-    ACTIONS(191), 1,
+    ACTIONS(199), 1,
       sym_identifier,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
-      sym_interface_name,
-    STATE(83), 1,
+      sym_class_name,
+    STATE(85), 1,
       sym_alias_name,
-    STATE(121), 1,
+    STATE(86), 1,
+      sym_interface_name,
+    STATE(318), 1,
       sym_type,
-    STATE(345), 1,
+    STATE(335), 1,
       sym_namespace,
     ACTIONS(51), 2,
       anon_sym_true,
@@ -9132,7 +9422,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_top,
       anon_sym_bot,
       anon_sym_void,
-    STATE(111), 14,
+    STATE(116), 14,
       sym_builtin_type,
       sym_class_type,
       sym_interface_type,
@@ -9147,12 +9437,12 @@ static const uint16_t ts_small_parse_table[] = {
       sym_string_literal,
       sym_symbol_literal,
       sym_proc,
-  [6491] = 4,
+  [6723] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(207), 1,
+    ACTIONS(215), 1,
       sym__scope,
-    ACTIONS(203), 20,
+    ACTIONS(211), 20,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -9173,7 +9463,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-    ACTIONS(205), 20,
+    ACTIONS(213), 20,
       sym_self,
       anon_sym_class,
       anon_sym_COLON,
@@ -9194,12 +9484,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-  [6542] = 4,
+  [6774] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(213), 1,
+    ACTIONS(221), 1,
       sym__scope,
-    ACTIONS(209), 20,
+    ACTIONS(217), 20,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -9220,7 +9510,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-    ACTIONS(211), 20,
+    ACTIONS(219), 20,
       sym_self,
       anon_sym_class,
       anon_sym_COLON,
@@ -9241,28 +9531,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-  [6593] = 10,
+  [6825] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(215), 1,
+    ACTIONS(223), 1,
       sym_identifier,
-    ACTIONS(217), 1,
+    ACTIONS(225), 1,
       sym_constant,
-    ACTIONS(219), 1,
+    ACTIONS(227), 1,
       sym_self,
-    ACTIONS(225), 1,
+    ACTIONS(233), 1,
       aux_sym_method_name_token1,
-    STATE(79), 1,
+    STATE(81), 1,
       sym_method_name,
-    STATE(355), 1,
+    STATE(386), 1,
       sym_singleton_method_name,
-    STATE(91), 5,
+    STATE(88), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(223), 11,
+    ACTIONS(231), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9274,7 +9564,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(221), 18,
+    ACTIONS(229), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9293,28 +9583,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [6655] = 10,
+  [6887] = 10,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(215), 1,
+    ACTIONS(223), 1,
       sym_identifier,
-    ACTIONS(217), 1,
+    ACTIONS(225), 1,
       sym_constant,
-    ACTIONS(219), 1,
+    ACTIONS(227), 1,
       sym_self,
-    ACTIONS(225), 1,
+    ACTIONS(233), 1,
       aux_sym_method_name_token1,
-    STATE(78), 1,
+    STATE(79), 1,
       sym_method_name,
-    STATE(360), 1,
+    STATE(363), 1,
       sym_singleton_method_name,
-    STATE(91), 5,
+    STATE(88), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(223), 11,
+    ACTIONS(231), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9326,7 +9616,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(221), 18,
+    ACTIONS(229), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9345,26 +9635,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [6717] = 9,
+  [6949] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(225), 1,
+    ACTIONS(233), 1,
       aux_sym_method_name_token1,
-    ACTIONS(227), 1,
+    ACTIONS(235), 1,
       sym_identifier,
-    ACTIONS(229), 1,
+    ACTIONS(237), 1,
       sym_constant,
-    ACTIONS(231), 1,
+    ACTIONS(239), 1,
       sym_self,
-    STATE(399), 1,
+    STATE(400), 1,
       sym_method_name,
-    STATE(91), 5,
+    STATE(88), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(223), 11,
+    ACTIONS(231), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9376,7 +9666,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(221), 18,
+    ACTIONS(229), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9395,26 +9685,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [6776] = 9,
+  [7008] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(225), 1,
+    ACTIONS(233), 1,
       aux_sym_method_name_token1,
-    ACTIONS(227), 1,
+    ACTIONS(235), 1,
       sym_identifier,
-    ACTIONS(229), 1,
+    ACTIONS(237), 1,
       sym_constant,
-    ACTIONS(233), 1,
+    ACTIONS(241), 1,
       sym_self,
-    STATE(440), 1,
+    STATE(343), 1,
       sym_method_name,
-    STATE(91), 5,
+    STATE(88), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(223), 11,
+    ACTIONS(231), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9426,7 +9716,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(221), 18,
+    ACTIONS(229), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9445,26 +9735,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [6835] = 9,
+  [7067] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(225), 1,
+    ACTIONS(233), 1,
       aux_sym_method_name_token1,
-    ACTIONS(227), 1,
+    ACTIONS(235), 1,
       sym_identifier,
-    ACTIONS(229), 1,
+    ACTIONS(237), 1,
       sym_constant,
-    ACTIONS(235), 1,
+    ACTIONS(243), 1,
       sym_self,
-    STATE(347), 1,
+    STATE(454), 1,
       sym_method_name,
-    STATE(91), 5,
+    STATE(88), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(223), 11,
+    ACTIONS(231), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9476,7 +9766,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(221), 18,
+    ACTIONS(229), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9495,26 +9785,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [6894] = 9,
+  [7126] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(225), 1,
+    ACTIONS(233), 1,
       aux_sym_method_name_token1,
-    ACTIONS(227), 1,
+    ACTIONS(235), 1,
       sym_identifier,
-    ACTIONS(229), 1,
-      sym_constant,
     ACTIONS(237), 1,
+      sym_constant,
+    ACTIONS(245), 1,
       sym_self,
-    STATE(332), 1,
+    STATE(341), 1,
       sym_method_name,
-    STATE(91), 5,
+    STATE(88), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(223), 11,
+    ACTIONS(231), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9526,7 +9816,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(221), 18,
+    ACTIONS(229), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9545,24 +9835,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [6953] = 8,
+  [7185] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(225), 1,
+    ACTIONS(233), 1,
       aux_sym_method_name_token1,
-    ACTIONS(229), 1,
+    ACTIONS(237), 1,
       sym_constant,
-    ACTIONS(239), 1,
+    ACTIONS(247), 1,
       sym_identifier,
-    STATE(192), 1,
+    STATE(339), 1,
       sym_method_name,
-    STATE(91), 5,
+    STATE(88), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(223), 11,
+    ACTIONS(231), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9574,7 +9864,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(221), 18,
+    ACTIONS(229), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9593,24 +9883,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [7009] = 8,
+  [7241] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(225), 1,
+    ACTIONS(233), 1,
       aux_sym_method_name_token1,
-    ACTIONS(229), 1,
+    ACTIONS(237), 1,
       sym_constant,
-    ACTIONS(239), 1,
+    ACTIONS(247), 1,
       sym_identifier,
-    STATE(412), 1,
+    STATE(212), 1,
       sym_method_name,
-    STATE(91), 5,
+    STATE(88), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(223), 11,
+    ACTIONS(231), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9622,7 +9912,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(221), 18,
+    ACTIONS(229), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9641,24 +9931,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [7065] = 8,
+  [7297] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(241), 1,
+    ACTIONS(249), 1,
       sym_identifier,
-    ACTIONS(243), 1,
+    ACTIONS(251), 1,
       sym_constant,
-    ACTIONS(249), 1,
+    ACTIONS(257), 1,
       aux_sym_method_name_token1,
-    STATE(192), 1,
+    STATE(212), 1,
       sym_method_name,
-    STATE(195), 5,
+    STATE(213), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(247), 11,
+    ACTIONS(255), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9670,7 +9960,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(245), 18,
+    ACTIONS(253), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9689,24 +9979,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [7121] = 8,
+  [7353] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(249), 1,
+    ACTIONS(257), 1,
       aux_sym_method_name_token1,
-    ACTIONS(251), 1,
+    ACTIONS(259), 1,
       sym_identifier,
-    ACTIONS(253), 1,
+    ACTIONS(261), 1,
       sym_constant,
-    STATE(192), 1,
+    STATE(212), 1,
       sym_method_name,
-    STATE(195), 5,
+    STATE(213), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(247), 11,
+    ACTIONS(255), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9718,7 +10008,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(245), 18,
+    ACTIONS(253), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9737,24 +10027,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [7177] = 8,
+  [7409] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(225), 1,
+    ACTIONS(233), 1,
       aux_sym_method_name_token1,
-    ACTIONS(229), 1,
+    ACTIONS(237), 1,
       sym_constant,
-    ACTIONS(239), 1,
+    ACTIONS(247), 1,
       sym_identifier,
-    STATE(323), 1,
+    STATE(430), 1,
       sym_method_name,
-    STATE(91), 5,
+    STATE(88), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(223), 11,
+    ACTIONS(231), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9766,7 +10056,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(221), 18,
+    ACTIONS(229), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9785,24 +10075,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [7233] = 8,
+  [7465] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(225), 1,
+    ACTIONS(233), 1,
       aux_sym_method_name_token1,
-    ACTIONS(229), 1,
+    ACTIONS(237), 1,
       sym_constant,
-    ACTIONS(239), 1,
+    ACTIONS(247), 1,
       sym_identifier,
-    STATE(416), 1,
+    STATE(431), 1,
       sym_method_name,
-    STATE(91), 5,
+    STATE(88), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(223), 11,
+    ACTIONS(231), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9814,7 +10104,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(221), 18,
+    ACTIONS(229), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9833,24 +10123,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [7289] = 8,
+  [7521] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(225), 1,
+    ACTIONS(257), 1,
       aux_sym_method_name_token1,
-    ACTIONS(229), 1,
-      sym_constant,
-    ACTIONS(239), 1,
+    ACTIONS(259), 1,
       sym_identifier,
-    STATE(341), 1,
+    ACTIONS(261), 1,
+      sym_constant,
+    STATE(214), 1,
       sym_method_name,
-    STATE(91), 5,
+    STATE(213), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(223), 11,
+    ACTIONS(255), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9862,7 +10152,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(221), 18,
+    ACTIONS(253), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9881,24 +10171,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [7345] = 8,
+  [7577] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(249), 1,
+    ACTIONS(233), 1,
       aux_sym_method_name_token1,
-    ACTIONS(251), 1,
-      sym_identifier,
-    ACTIONS(253), 1,
+    ACTIONS(237), 1,
       sym_constant,
-    STATE(213), 1,
+    ACTIONS(247), 1,
+      sym_identifier,
+    STATE(326), 1,
       sym_method_name,
-    STATE(195), 5,
+    STATE(88), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(247), 11,
+    ACTIONS(231), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9910,7 +10200,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(245), 18,
+    ACTIONS(229), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9929,24 +10219,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [7401] = 8,
+  [7633] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(241), 1,
+    ACTIONS(249), 1,
       sym_identifier,
-    ACTIONS(243), 1,
+    ACTIONS(251), 1,
       sym_constant,
-    ACTIONS(249), 1,
+    ACTIONS(257), 1,
       aux_sym_method_name_token1,
-    STATE(213), 1,
+    STATE(214), 1,
       sym_method_name,
-    STATE(195), 5,
+    STATE(213), 5,
       sym_operator,
       sym_setter,
       sym_constant_setter,
       sym_identifier_suffix,
       sym_constant_suffix,
-    ACTIONS(247), 11,
+    ACTIONS(255), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -9958,7 +10248,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(245), 18,
+    ACTIONS(253), 18,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_CARET,
@@ -9977,14 +10267,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_DASH_AT,
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
-  [7457] = 5,
+  [7689] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(259), 1,
+    ACTIONS(267), 1,
       anon_sym_LBRACK,
-    STATE(97), 1,
+    STATE(100), 1,
       sym_type_arguments,
-    ACTIONS(257), 17,
+    ACTIONS(265), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10002,7 +10292,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(255), 18,
+    ACTIONS(263), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10021,10 +10311,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [7506] = 3,
+  [7738] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(263), 17,
+    ACTIONS(271), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10042,7 +10332,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(261), 20,
+    ACTIONS(269), 20,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10063,14 +10353,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [7551] = 5,
+  [7783] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(259), 1,
-      anon_sym_LBRACK,
-    STATE(99), 1,
-      sym_type_arguments,
-    ACTIONS(267), 17,
+    ACTIONS(275), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10088,13 +10374,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(265), 18,
+    ACTIONS(273), 20,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_QMARK,
+      anon_sym_LBRACK,
       anon_sym_COMMA,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
@@ -10104,17 +10391,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_LBRACK,
       anon_sym_PERCENTa_PIPE,
       anon_sym_PERCENTa_LT,
+      anon_sym_EQ2,
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [7600] = 5,
+  [7828] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(259), 1,
+    ACTIONS(267), 1,
       anon_sym_LBRACK,
     STATE(118), 1,
       sym_type_arguments,
-    ACTIONS(271), 17,
+    ACTIONS(279), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10132,7 +10420,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(269), 18,
+    ACTIONS(277), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10151,10 +10439,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [7649] = 3,
+  [7877] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(275), 17,
+    ACTIONS(267), 1,
+      anon_sym_LBRACK,
+    STATE(96), 1,
+      sym_type_arguments,
+    ACTIONS(283), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10172,14 +10464,13 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(273), 20,
+    ACTIONS(281), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
       anon_sym_PIPE,
       anon_sym_AMP,
       anon_sym_QMARK,
-      anon_sym_LBRACK,
       anon_sym_COMMA,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
@@ -10189,56 +10480,54 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_LBRACK,
       anon_sym_PERCENTa_PIPE,
       anon_sym_PERCENTa_LT,
-      anon_sym_EQ2,
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [7694] = 4,
+  [7926] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(281), 2,
-      anon_sym_QMARK,
-      anon_sym_EQ,
-    ACTIONS(277), 17,
-      ts_builtin_sym_end,
+    ACTIONS(285), 14,
+      sym_self,
+      anon_sym_LPAREN,
+      anon_sym_STAR,
+      anon_sym_GT,
+      anon_sym_LT,
+      anon_sym_EQ_EQ,
+      anon_sym_LT_EQ,
+      anon_sym_PLUS,
+      anon_sym_DASH,
+      anon_sym_BANG,
+      anon_sym_TILDE,
+      anon_sym_LBRACK_RBRACK,
+      anon_sym_BQUOTE,
+      sym_identifier,
+    ACTIONS(287), 22,
       sym_constant,
-      anon_sym_RPAREN,
       anon_sym_PIPE,
       anon_sym_AMP,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      sym__scope,
-      anon_sym_PERCENTa_LBRACE,
-      anon_sym_PERCENTa_LPAREN,
-      anon_sym_PERCENTa_LBRACK,
-      anon_sym_PERCENTa_PIPE,
-      anon_sym_PERCENTa_LT,
-      sym_global_name,
-      sym_ivar_name,
-      sym_cvar_name,
-    ACTIONS(279), 17,
-      sym_self,
-      anon_sym_class,
-      anon_sym_end,
-      anon_sym_module,
-      anon_sym_interface,
-      anon_sym_type,
-      anon_sym_def,
-      anon_sym_public,
-      anon_sym_private,
-      anon_sym_attr_reader,
-      anon_sym_attr_writer,
-      anon_sym_attr_accessor,
-      anon_sym_include,
-      anon_sym_extend,
-      anon_sym_prepend,
-      anon_sym_alias,
-      sym_identifier,
-  [7740] = 3,
+      anon_sym_COLON,
+      anon_sym_CARET,
+      anon_sym_STAR_STAR,
+      anon_sym_LPAREN_RPAREN,
+      anon_sym_DOT_DOT,
+      anon_sym_LT_EQ_GT,
+      anon_sym_EQ_EQ_EQ,
+      anon_sym_EQ_TILDE,
+      anon_sym_GT_EQ,
+      anon_sym_SLASH,
+      anon_sym_PERCENT,
+      anon_sym_BANG_TILDE,
+      anon_sym_LT_LT,
+      anon_sym_GT_GT,
+      anon_sym_PLUS_AT,
+      anon_sym_DASH_AT,
+      anon_sym_TILDE_AT,
+      anon_sym_LBRACK_RBRACK_EQ,
+      aux_sym_method_name_token1,
+  [7970] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(283), 14,
+    ACTIONS(289), 14,
       sym_self,
       anon_sym_LPAREN,
       anon_sym_STAR,
@@ -10253,7 +10542,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
       sym_identifier,
-    ACTIONS(285), 22,
+    ACTIONS(291), 22,
       sym_constant,
       anon_sym_PIPE,
       anon_sym_AMP,
@@ -10276,10 +10565,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
       aux_sym_method_name_token1,
-  [7784] = 3,
+  [8014] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(287), 14,
+    ACTIONS(293), 14,
       sym_self,
       anon_sym_LPAREN,
       anon_sym_STAR,
@@ -10294,7 +10583,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
       sym_identifier,
-    ACTIONS(289), 22,
+    ACTIONS(295), 22,
       sym_constant,
       anon_sym_PIPE,
       anon_sym_AMP,
@@ -10317,10 +10606,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
       aux_sym_method_name_token1,
-  [7828] = 3,
+  [8058] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(293), 17,
+    ACTIONS(299), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10338,7 +10627,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(291), 19,
+    ACTIONS(297), 19,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10358,10 +10647,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [7872] = 3,
+  [8102] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(295), 14,
+    ACTIONS(301), 14,
       sym_self,
       anon_sym_LPAREN,
       anon_sym_STAR,
@@ -10376,7 +10665,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
       sym_identifier,
-    ACTIONS(297), 22,
+    ACTIONS(303), 22,
       sym_constant,
       anon_sym_PIPE,
       anon_sym_AMP,
@@ -10399,10 +10688,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
       aux_sym_method_name_token1,
-  [7916] = 3,
+  [8146] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(299), 14,
+    ACTIONS(305), 14,
       sym_self,
       anon_sym_LPAREN,
       anon_sym_STAR,
@@ -10417,7 +10706,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
       sym_identifier,
-    ACTIONS(301), 22,
+    ACTIONS(307), 22,
       sym_constant,
       anon_sym_PIPE,
       anon_sym_AMP,
@@ -10440,10 +10729,93 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
       aux_sym_method_name_token1,
-  [7960] = 3,
+  [8190] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(313), 2,
+      anon_sym_QMARK,
+      anon_sym_EQ,
+    ACTIONS(309), 17,
+      ts_builtin_sym_end,
+      sym_constant,
+      anon_sym_RPAREN,
+      anon_sym_PIPE,
+      anon_sym_AMP,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      sym__scope,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      sym_global_name,
+      sym_ivar_name,
+      sym_cvar_name,
+    ACTIONS(311), 17,
+      sym_self,
+      anon_sym_class,
+      anon_sym_end,
+      anon_sym_module,
+      anon_sym_interface,
+      anon_sym_type,
+      anon_sym_def,
+      anon_sym_public,
+      anon_sym_private,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+      anon_sym_include,
+      anon_sym_extend,
+      anon_sym_prepend,
+      anon_sym_alias,
+      sym_identifier,
+  [8236] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(317), 17,
+      sym_self,
+      anon_sym_class,
+      anon_sym_end,
+      anon_sym_module,
+      anon_sym_interface,
+      anon_sym_type,
+      anon_sym_def,
+      anon_sym_public,
+      anon_sym_private,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+      anon_sym_include,
+      anon_sym_extend,
+      anon_sym_prepend,
+      anon_sym_alias,
+      sym_identifier,
+    ACTIONS(315), 19,
+      ts_builtin_sym_end,
+      sym_constant,
+      anon_sym_RPAREN,
+      anon_sym_PIPE,
+      anon_sym_AMP,
+      anon_sym_QMARK,
+      anon_sym_LBRACK,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      sym__scope,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      sym_global_name,
+      sym_ivar_name,
+      sym_cvar_name,
+  [8280] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(303), 14,
+    ACTIONS(319), 14,
       sym_self,
       anon_sym_LPAREN,
       anon_sym_STAR,
@@ -10458,7 +10830,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
       sym_identifier,
-    ACTIONS(305), 22,
+    ACTIONS(321), 22,
       sym_constant,
       anon_sym_PIPE,
       anon_sym_AMP,
@@ -10481,132 +10853,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
       aux_sym_method_name_token1,
-  [8004] = 3,
+  [8324] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(307), 14,
-      sym_self,
-      anon_sym_LPAREN,
-      anon_sym_STAR,
-      anon_sym_GT,
-      anon_sym_LT,
-      anon_sym_EQ_EQ,
-      anon_sym_LT_EQ,
-      anon_sym_PLUS,
-      anon_sym_DASH,
-      anon_sym_BANG,
-      anon_sym_TILDE,
-      anon_sym_LBRACK_RBRACK,
-      anon_sym_BQUOTE,
-      sym_identifier,
-    ACTIONS(309), 22,
-      sym_constant,
-      anon_sym_PIPE,
-      anon_sym_AMP,
-      anon_sym_COLON,
-      anon_sym_CARET,
-      anon_sym_STAR_STAR,
-      anon_sym_LPAREN_RPAREN,
-      anon_sym_DOT_DOT,
-      anon_sym_LT_EQ_GT,
-      anon_sym_EQ_EQ_EQ,
-      anon_sym_EQ_TILDE,
-      anon_sym_GT_EQ,
-      anon_sym_SLASH,
-      anon_sym_PERCENT,
-      anon_sym_BANG_TILDE,
-      anon_sym_LT_LT,
-      anon_sym_GT_GT,
-      anon_sym_PLUS_AT,
-      anon_sym_DASH_AT,
-      anon_sym_TILDE_AT,
-      anon_sym_LBRACK_RBRACK_EQ,
-      aux_sym_method_name_token1,
-  [8048] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(313), 17,
-      sym_self,
-      anon_sym_class,
-      anon_sym_end,
-      anon_sym_module,
-      anon_sym_interface,
-      anon_sym_type,
-      anon_sym_def,
-      anon_sym_public,
-      anon_sym_private,
-      anon_sym_attr_reader,
-      anon_sym_attr_writer,
-      anon_sym_attr_accessor,
-      anon_sym_include,
-      anon_sym_extend,
-      anon_sym_prepend,
-      anon_sym_alias,
-      sym_identifier,
-    ACTIONS(311), 19,
-      ts_builtin_sym_end,
-      sym_constant,
-      anon_sym_RPAREN,
-      anon_sym_PIPE,
-      anon_sym_AMP,
-      anon_sym_QMARK,
-      anon_sym_LBRACK,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      sym__scope,
-      anon_sym_PERCENTa_LBRACE,
-      anon_sym_PERCENTa_LPAREN,
-      anon_sym_PERCENTa_LBRACK,
-      anon_sym_PERCENTa_PIPE,
-      anon_sym_PERCENTa_LT,
-      sym_global_name,
-      sym_ivar_name,
-      sym_cvar_name,
-  [8092] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(317), 17,
-      sym_self,
-      anon_sym_class,
-      anon_sym_end,
-      anon_sym_module,
-      anon_sym_interface,
-      anon_sym_type,
-      anon_sym_def,
-      anon_sym_public,
-      anon_sym_private,
-      anon_sym_attr_reader,
-      anon_sym_attr_writer,
-      anon_sym_attr_accessor,
-      anon_sym_include,
-      anon_sym_extend,
-      anon_sym_prepend,
-      anon_sym_alias,
-      sym_identifier,
-    ACTIONS(315), 18,
-      ts_builtin_sym_end,
-      sym_constant,
-      anon_sym_RPAREN,
-      anon_sym_PIPE,
-      anon_sym_AMP,
-      anon_sym_QMARK,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      sym__scope,
-      anon_sym_PERCENTa_LBRACE,
-      anon_sym_PERCENTa_LPAREN,
-      anon_sym_PERCENTa_LBRACK,
-      anon_sym_PERCENTa_PIPE,
-      anon_sym_PERCENTa_LT,
-      sym_global_name,
-      sym_ivar_name,
-      sym_cvar_name,
-  [8135] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(321), 17,
+    ACTIONS(325), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10624,7 +10874,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(319), 18,
+    ACTIONS(323), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10643,10 +10893,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8178] = 3,
+  [8367] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(325), 17,
+    ACTIONS(329), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10664,7 +10914,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(323), 18,
+    ACTIONS(327), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10683,10 +10933,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8221] = 3,
+  [8410] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(329), 17,
+    ACTIONS(333), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10704,7 +10954,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(327), 18,
+    ACTIONS(331), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10723,10 +10973,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8264] = 3,
+  [8453] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(333), 17,
+    ACTIONS(337), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10744,7 +10994,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(331), 18,
+    ACTIONS(335), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10763,10 +11013,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8307] = 3,
+  [8496] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(337), 17,
+    ACTIONS(341), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10784,7 +11034,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(335), 18,
+    ACTIONS(339), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10803,10 +11053,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8350] = 3,
+  [8539] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(341), 17,
+    ACTIONS(345), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10824,7 +11074,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(339), 18,
+    ACTIONS(343), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10843,10 +11093,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8393] = 3,
+  [8582] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(345), 17,
+    ACTIONS(349), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10864,7 +11114,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(343), 18,
+    ACTIONS(347), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10883,14 +11133,14 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8436] = 5,
+  [8625] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(347), 16,
+    ACTIONS(351), 16,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10907,7 +11157,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-    ACTIONS(349), 17,
+    ACTIONS(353), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10925,10 +11175,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-  [8483] = 3,
+  [8672] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(357), 17,
+    ACTIONS(361), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10946,7 +11196,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(355), 18,
+    ACTIONS(359), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -10965,10 +11215,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8526] = 3,
+  [8715] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(361), 17,
+    ACTIONS(365), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -10986,7 +11236,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(359), 18,
+    ACTIONS(363), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -11005,10 +11255,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8569] = 3,
+  [8758] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(365), 17,
+    ACTIONS(369), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -11026,7 +11276,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(363), 18,
+    ACTIONS(367), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -11045,10 +11295,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8612] = 3,
+  [8801] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(369), 17,
+    ACTIONS(373), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -11066,7 +11316,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(367), 18,
+    ACTIONS(371), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -11085,10 +11335,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8655] = 3,
+  [8844] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(373), 17,
+    ACTIONS(377), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -11106,7 +11356,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(371), 18,
+    ACTIONS(375), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -11125,34 +11375,17 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8698] = 3,
+  [8887] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(279), 17,
-      sym_self,
-      anon_sym_class,
-      anon_sym_end,
-      anon_sym_module,
-      anon_sym_interface,
-      anon_sym_type,
-      anon_sym_def,
-      anon_sym_public,
-      anon_sym_private,
-      anon_sym_attr_reader,
-      anon_sym_attr_writer,
-      anon_sym_attr_accessor,
-      anon_sym_include,
-      anon_sym_extend,
-      anon_sym_prepend,
-      anon_sym_alias,
-      sym_identifier,
-    ACTIONS(277), 18,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(379), 17,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
       anon_sym_PIPE,
       anon_sym_AMP,
-      anon_sym_QMARK,
       anon_sym_COMMA,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
@@ -11165,10 +11398,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8741] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(377), 17,
+    ACTIONS(381), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -11186,13 +11416,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(375), 18,
+  [8932] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(383), 16,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
       anon_sym_PIPE,
-      anon_sym_AMP,
-      anon_sym_QMARK,
       anon_sym_COMMA,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
@@ -11205,10 +11440,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8784] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(381), 17,
+    ACTIONS(385), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -11226,29 +11458,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(379), 18,
-      ts_builtin_sym_end,
-      sym_constant,
-      anon_sym_RPAREN,
-      anon_sym_PIPE,
-      anon_sym_AMP,
-      anon_sym_QMARK,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      sym__scope,
-      anon_sym_PERCENTa_LBRACE,
-      anon_sym_PERCENTa_LPAREN,
-      anon_sym_PERCENTa_LBRACK,
-      anon_sym_PERCENTa_PIPE,
-      anon_sym_PERCENTa_LT,
-      sym_global_name,
-      sym_ivar_name,
-      sym_cvar_name,
-  [8827] = 3,
+  [8979] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(385), 17,
+    ACTIONS(389), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -11266,7 +11479,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(383), 18,
+    ACTIONS(387), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -11285,17 +11498,18 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8870] = 4,
+  [9022] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(353), 1,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(387), 17,
+    ACTIONS(391), 16,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
       anon_sym_PIPE,
-      anon_sym_AMP,
       anon_sym_COMMA,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
@@ -11308,7 +11522,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-    ACTIONS(389), 17,
+    ACTIONS(393), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -11326,10 +11540,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-  [8915] = 3,
+  [9069] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(393), 17,
+    ACTIONS(311), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -11347,7 +11561,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(391), 18,
+    ACTIONS(309), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -11366,7 +11580,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [8958] = 3,
+  [9112] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(397), 17,
@@ -11406,7 +11620,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [9001] = 3,
+  [9155] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(401), 17,
@@ -11446,7 +11660,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [9044] = 3,
+  [9198] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(405), 17,
@@ -11486,30 +11700,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [9087] = 5,
+  [9241] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(407), 16,
-      ts_builtin_sym_end,
-      sym_constant,
-      anon_sym_RPAREN,
-      anon_sym_PIPE,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      sym__scope,
-      anon_sym_PERCENTa_LBRACE,
-      anon_sym_PERCENTa_LPAREN,
-      anon_sym_PERCENTa_LBRACK,
-      anon_sym_PERCENTa_PIPE,
-      anon_sym_PERCENTa_LT,
-      sym_global_name,
-      sym_ivar_name,
-      sym_cvar_name,
     ACTIONS(409), 17,
       sym_self,
       anon_sym_class,
@@ -11528,7 +11721,26 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-  [9134] = 3,
+    ACTIONS(407), 18,
+      ts_builtin_sym_end,
+      sym_constant,
+      anon_sym_RPAREN,
+      anon_sym_PIPE,
+      anon_sym_AMP,
+      anon_sym_QMARK,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      sym__scope,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      sym_global_name,
+      sym_ivar_name,
+      sym_cvar_name,
+  [9284] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(413), 17,
@@ -11568,7 +11780,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [9177] = 3,
+  [9327] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(417), 17,
@@ -11608,30 +11820,9 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [9220] = 5,
+  [9370] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(419), 16,
-      ts_builtin_sym_end,
-      sym_constant,
-      anon_sym_RPAREN,
-      anon_sym_PIPE,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_RBRACE,
-      sym__scope,
-      anon_sym_PERCENTa_LBRACE,
-      anon_sym_PERCENTa_LPAREN,
-      anon_sym_PERCENTa_LBRACK,
-      anon_sym_PERCENTa_PIPE,
-      anon_sym_PERCENTa_LT,
-      sym_global_name,
-      sym_ivar_name,
-      sym_cvar_name,
     ACTIONS(421), 17,
       sym_self,
       anon_sym_class,
@@ -11650,12 +11841,31 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-  [9267] = 5,
+    ACTIONS(419), 18,
+      ts_builtin_sym_end,
+      sym_constant,
+      anon_sym_RPAREN,
+      anon_sym_PIPE,
+      anon_sym_AMP,
+      anon_sym_QMARK,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      sym__scope,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      sym_global_name,
+      sym_ivar_name,
+      sym_cvar_name,
+  [9413] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
     ACTIONS(423), 16,
       ts_builtin_sym_end,
@@ -11692,18 +11902,34 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-  [9314] = 5,
+  [9460] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(427), 16,
+    ACTIONS(429), 17,
+      sym_self,
+      anon_sym_class,
+      anon_sym_end,
+      anon_sym_module,
+      anon_sym_interface,
+      anon_sym_type,
+      anon_sym_def,
+      anon_sym_public,
+      anon_sym_private,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+      anon_sym_include,
+      anon_sym_extend,
+      anon_sym_prepend,
+      anon_sym_alias,
+      sym_identifier,
+    ACTIONS(427), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
       anon_sym_PIPE,
+      anon_sym_AMP,
+      anon_sym_QMARK,
       anon_sym_COMMA,
       anon_sym_RBRACK,
       anon_sym_RBRACE,
@@ -11716,7 +11942,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-    ACTIONS(429), 17,
+  [9503] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(433), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -11734,10 +11963,29 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-  [9361] = 3,
+    ACTIONS(431), 18,
+      ts_builtin_sym_end,
+      sym_constant,
+      anon_sym_RPAREN,
+      anon_sym_PIPE,
+      anon_sym_AMP,
+      anon_sym_QMARK,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      sym__scope,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      sym_global_name,
+      sym_ivar_name,
+      sym_cvar_name,
+  [9546] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(433), 17,
+    ACTIONS(437), 17,
       sym_self,
       anon_sym_class,
       anon_sym_end,
@@ -11755,7 +12003,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_prepend,
       anon_sym_alias,
       sym_identifier,
-    ACTIONS(431), 18,
+    ACTIONS(435), 18,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_RPAREN,
@@ -11774,14 +12022,56 @@ static const uint16_t ts_small_parse_table[] = {
       sym_global_name,
       sym_ivar_name,
       sym_cvar_name,
-  [9404] = 5,
+  [9589] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(439), 16,
+      ts_builtin_sym_end,
+      sym_constant,
+      anon_sym_RPAREN,
+      anon_sym_PIPE,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+      anon_sym_RBRACE,
+      sym__scope,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      sym_global_name,
+      sym_ivar_name,
+      sym_cvar_name,
+    ACTIONS(441), 17,
+      sym_self,
+      anon_sym_class,
+      anon_sym_end,
+      anon_sym_module,
+      anon_sym_interface,
+      anon_sym_type,
+      anon_sym_def,
+      anon_sym_public,
+      anon_sym_private,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+      anon_sym_include,
+      anon_sym_extend,
+      anon_sym_prepend,
+      anon_sym_alias,
+      sym_identifier,
+  [9636] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(435), 1,
+    ACTIONS(443), 1,
       anon_sym_QMARK,
-    ACTIONS(437), 1,
+    ACTIONS(445), 1,
       anon_sym_EQ,
-    ACTIONS(303), 11,
+    ACTIONS(289), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -11793,7 +12083,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(305), 21,
+    ACTIONS(291), 21,
       sym_constant,
       anon_sym_PIPE,
       anon_sym_AMP,
@@ -11815,14 +12105,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK_RBRACK_EQ,
       aux_sym_method_name_token1,
       sym_identifier,
-  [9450] = 5,
+  [9682] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(439), 1,
+    ACTIONS(447), 1,
       anon_sym_QMARK,
-    ACTIONS(441), 1,
+    ACTIONS(449), 1,
       anon_sym_EQ,
-    ACTIONS(303), 11,
+    ACTIONS(289), 11,
       anon_sym_STAR,
       anon_sym_GT,
       anon_sym_LT,
@@ -11834,7 +12124,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE,
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
-    ACTIONS(305), 21,
+    ACTIONS(291), 21,
       sym_constant,
       anon_sym_PIPE,
       anon_sym_AMP,
@@ -11856,10 +12146,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK_RBRACK_EQ,
       aux_sym_method_name_token1,
       sym_identifier,
-  [9496] = 3,
+  [9728] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(443), 13,
+    ACTIONS(451), 13,
       sym_self,
       anon_sym_STAR,
       anon_sym_GT,
@@ -11873,7 +12163,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK_RBRACK,
       anon_sym_BQUOTE,
       sym_identifier,
-    ACTIONS(445), 20,
+    ACTIONS(453), 20,
       sym_constant,
       anon_sym_PIPE,
       anon_sym_AMP,
@@ -11894,24 +12184,24 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_TILDE_AT,
       anon_sym_LBRACK_RBRACK_EQ,
       aux_sym_method_name_token1,
-  [9537] = 9,
+  [9769] = 9,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(449), 1,
+    ACTIONS(457), 1,
       anon_sym_PERCENTa_LBRACE,
-    ACTIONS(452), 1,
+    ACTIONS(460), 1,
       anon_sym_PERCENTa_LPAREN,
-    ACTIONS(455), 1,
+    ACTIONS(463), 1,
       anon_sym_PERCENTa_LBRACK,
-    ACTIONS(458), 1,
+    ACTIONS(466), 1,
       anon_sym_PERCENTa_PIPE,
-    ACTIONS(461), 1,
+    ACTIONS(469), 1,
       anon_sym_PERCENTa_LT,
-    STATE(127), 1,
+    STATE(129), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    ACTIONS(447), 24,
+    ACTIONS(455), 24,
       sym_constant,
       sym_self,
       anon_sym_LPAREN,
@@ -11936,16 +12226,70 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [9588] = 5,
+  [9820] = 22,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(15), 1,
+      anon_sym_PERCENTa_LBRACE,
+    ACTIONS(17), 1,
+      anon_sym_PERCENTa_LPAREN,
+    ACTIONS(19), 1,
+      anon_sym_PERCENTa_LBRACK,
+    ACTIONS(21), 1,
+      anon_sym_PERCENTa_PIPE,
+    ACTIONS(23), 1,
+      anon_sym_PERCENTa_LT,
+    ACTIONS(77), 1,
+      sym_self,
+    ACTIONS(87), 1,
+      anon_sym_def,
+    ACTIONS(93), 1,
+      anon_sym_include,
+    ACTIONS(95), 1,
+      anon_sym_extend,
+    ACTIONS(97), 1,
+      anon_sym_prepend,
+    ACTIONS(99), 1,
+      anon_sym_alias,
+    STATE(72), 1,
+      sym_attribyte_type,
+    STATE(129), 1,
+      aux_sym_decl_repeat1,
+    STATE(135), 1,
+      sym_annotation,
+    STATE(192), 1,
+      sym_attribute_member,
+    STATE(210), 1,
+      sym_visibility_member,
+    STATE(275), 1,
+      sym_visibility,
+    ACTIONS(89), 2,
+      anon_sym_public,
+      anon_sym_private,
+    ACTIONS(101), 2,
+      sym_ivar_name,
+      sym_cvar_name,
+    ACTIONS(91), 3,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+    STATE(197), 6,
+      sym_ivar_member,
+      sym_method_member,
+      sym_include_member,
+      sym_extend_member,
+      sym_prepend_member,
+      sym_alias_member,
+  [9896] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(464), 27,
+    ACTIONS(472), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -11973,16 +12317,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [9630] = 5,
+  [9938] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(468), 27,
+    ACTIONS(476), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -12010,61 +12354,44 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [9672] = 22,
+  [9980] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(15), 1,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(474), 1,
+      anon_sym_PIPE,
+    ACTIONS(478), 27,
+      ts_builtin_sym_end,
+      sym_constant,
+      sym_self,
+      anon_sym_class,
+      sym__scope,
       anon_sym_PERCENTa_LBRACE,
-    ACTIONS(17), 1,
       anon_sym_PERCENTa_LPAREN,
-    ACTIONS(19), 1,
       anon_sym_PERCENTa_LBRACK,
-    ACTIONS(21), 1,
       anon_sym_PERCENTa_PIPE,
-    ACTIONS(23), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(77), 1,
-      sym_self,
-    ACTIONS(87), 1,
+      anon_sym_end,
+      anon_sym_module,
+      anon_sym_interface,
+      anon_sym_type,
+      sym_global_name,
       anon_sym_def,
-    ACTIONS(93), 1,
+      anon_sym_public,
+      anon_sym_private,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
       anon_sym_include,
-    ACTIONS(95), 1,
       anon_sym_extend,
-    ACTIONS(97), 1,
       anon_sym_prepend,
-    ACTIONS(99), 1,
       anon_sym_alias,
-    STATE(70), 1,
-      sym_attribyte_type,
-    STATE(127), 1,
-      aux_sym_decl_repeat1,
-    STATE(133), 1,
-      sym_annotation,
-    STATE(205), 1,
-      sym_visibility_member,
-    STATE(207), 1,
-      sym_attribute_member,
-    STATE(270), 1,
-      sym_visibility,
-    ACTIONS(89), 2,
-      anon_sym_public,
-      anon_sym_private,
-    ACTIONS(101), 2,
       sym_ivar_name,
       sym_cvar_name,
-    ACTIONS(91), 3,
-      anon_sym_attr_reader,
-      anon_sym_attr_writer,
-      anon_sym_attr_accessor,
-    STATE(208), 6,
-      sym_ivar_member,
-      sym_method_member,
-      sym_include_member,
-      sym_extend_member,
-      sym_prepend_member,
-      sym_alias_member,
-  [9748] = 22,
+  [10022] = 22,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(7), 1,
@@ -12093,23 +12420,23 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_type,
     ACTIONS(31), 1,
       sym_global_name,
-    ACTIONS(470), 1,
+    ACTIONS(480), 1,
       ts_builtin_sym_end,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(214), 1,
+    STATE(220), 1,
       aux_sym_decl_repeat1,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
-    STATE(151), 2,
+    STATE(178), 2,
       sym_decl,
       aux_sym_program_repeat2,
-    STATE(226), 2,
+    STATE(231), 2,
       sym_use_directive,
       aux_sym_program_repeat1,
-    STATE(241), 8,
+    STATE(245), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -12118,31 +12445,27 @@ static const uint16_t ts_small_parse_table[] = {
       sym_type_alias_decl,
       sym_const_decl,
       sym_global_decl,
-  [9824] = 5,
+  [10098] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(466), 1,
-      anon_sym_PIPE,
-    ACTIONS(472), 27,
-      ts_builtin_sym_end,
+    ACTIONS(482), 29,
       sym_constant,
       sym_self,
+      anon_sym_LPAREN,
       anon_sym_class,
+      anon_sym_LBRACE,
       sym__scope,
+      anon_sym_DASH_GT,
       anon_sym_PERCENTa_LBRACE,
       anon_sym_PERCENTa_LPAREN,
       anon_sym_PERCENTa_LBRACK,
       anon_sym_PERCENTa_PIPE,
       anon_sym_PERCENTa_LT,
-      anon_sym_end,
       anon_sym_module,
       anon_sym_interface,
       anon_sym_type,
       sym_global_name,
+      anon_sym_QMARK2,
       anon_sym_def,
       anon_sym_public,
       anon_sym_private,
@@ -12155,10 +12478,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [9866] = 2,
+  [10133] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(474), 29,
+    ACTIONS(484), 29,
       sym_constant,
       sym_self,
       anon_sym_LPAREN,
@@ -12188,27 +12511,29 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [9901] = 2,
+  [10168] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(476), 29,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(474), 1,
+      anon_sym_PIPE,
+    ACTIONS(486), 25,
       sym_constant,
       sym_self,
-      anon_sym_LPAREN,
       anon_sym_class,
-      anon_sym_LBRACE,
       sym__scope,
-      anon_sym_DASH_GT,
       anon_sym_PERCENTa_LBRACE,
       anon_sym_PERCENTa_LPAREN,
       anon_sym_PERCENTa_LBRACK,
       anon_sym_PERCENTa_PIPE,
       anon_sym_PERCENTa_LT,
+      anon_sym_end,
       anon_sym_module,
       anon_sym_interface,
       anon_sym_type,
-      sym_global_name,
-      anon_sym_QMARK2,
       anon_sym_def,
       anon_sym_public,
       anon_sym_private,
@@ -12221,50 +12546,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [9936] = 4,
+  [10208] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(478), 26,
-      sym_constant,
-      sym_self,
-      anon_sym_class,
-      anon_sym_PIPE,
-      sym__scope,
-      anon_sym_PERCENTa_LBRACE,
-      anon_sym_PERCENTa_LPAREN,
-      anon_sym_PERCENTa_LBRACK,
-      anon_sym_PERCENTa_PIPE,
-      anon_sym_PERCENTa_LT,
-      anon_sym_end,
-      anon_sym_module,
-      anon_sym_interface,
-      anon_sym_type,
-      anon_sym_def,
-      anon_sym_public,
-      anon_sym_private,
-      anon_sym_attr_reader,
-      anon_sym_attr_writer,
-      anon_sym_attr_accessor,
-      anon_sym_include,
-      anon_sym_extend,
-      anon_sym_prepend,
-      anon_sym_alias,
-      sym_ivar_name,
-      sym_cvar_name,
-  [9974] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(466), 1,
-      anon_sym_PIPE,
-    ACTIONS(480), 25,
+    ACTIONS(490), 1,
+      anon_sym_COLON,
+    ACTIONS(488), 27,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12275,7 +12562,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
       anon_sym_PERCENTa_LT,
       anon_sym_end,
+      anon_sym_LT,
       anon_sym_module,
+      anon_sym_EQ2,
       anon_sym_interface,
       anon_sym_type,
       anon_sym_def,
@@ -12290,16 +12579,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10014] = 5,
+  [10244] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(259), 1,
-      anon_sym_LBRACK,
-    ACTIONS(484), 1,
-      anon_sym_COMMA,
-    STATE(181), 1,
-      sym_type_arguments,
-    ACTIONS(482), 25,
+    ACTIONS(494), 1,
+      anon_sym_COLON,
+    ACTIONS(492), 27,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12310,7 +12595,9 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
       anon_sym_PERCENTa_LT,
       anon_sym_end,
+      anon_sym_LT,
       anon_sym_module,
+      anon_sym_EQ2,
       anon_sym_interface,
       anon_sym_type,
       anon_sym_def,
@@ -12325,14 +12612,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10054] = 4,
+  [10280] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(486), 26,
+    ACTIONS(496), 26,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12359,16 +12646,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10092] = 5,
+  [10318] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(488), 25,
+    ACTIONS(498), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12394,19 +12681,18 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10132] = 5,
+  [10358] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
-      anon_sym_PIPE,
-    ACTIONS(490), 25,
+    ACTIONS(500), 26,
       sym_constant,
       sym_self,
       anon_sym_class,
+      anon_sym_PIPE,
       sym__scope,
       anon_sym_PERCENTa_LBRACE,
       anon_sym_PERCENTa_LPAREN,
@@ -12429,16 +12715,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10172] = 5,
+  [10396] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(492), 25,
+    ACTIONS(502), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12464,14 +12750,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10212] = 4,
+  [10436] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(494), 26,
+    ACTIONS(504), 26,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12498,12 +12784,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10250] = 3,
+  [10474] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(498), 1,
-      anon_sym_COLON,
-    ACTIONS(496), 27,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(474), 1,
+      anon_sym_PIPE,
+    ACTIONS(506), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12514,9 +12804,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
       anon_sym_PERCENTa_LT,
       anon_sym_end,
-      anon_sym_LT,
       anon_sym_module,
-      anon_sym_EQ2,
       anon_sym_interface,
       anon_sym_type,
       anon_sym_def,
@@ -12531,16 +12819,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10286] = 5,
+  [10514] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(500), 25,
+    ACTIONS(508), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12566,12 +12854,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10326] = 3,
+  [10554] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(504), 1,
-      anon_sym_COLON,
-    ACTIONS(502), 27,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(474), 1,
+      anon_sym_PIPE,
+    ACTIONS(510), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12582,9 +12874,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
       anon_sym_PERCENTa_LT,
       anon_sym_end,
-      anon_sym_LT,
       anon_sym_module,
-      anon_sym_EQ2,
       anon_sym_interface,
       anon_sym_type,
       anon_sym_def,
@@ -12599,16 +12889,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10362] = 5,
+  [10594] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(506), 25,
+    ACTIONS(512), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12634,16 +12924,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10402] = 5,
+  [10634] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(508), 25,
+    ACTIONS(514), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12669,16 +12959,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10442] = 5,
+  [10674] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(510), 25,
+    ACTIONS(516), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12704,16 +12994,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10482] = 5,
+  [10714] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(466), 1,
-      anon_sym_PIPE,
-    ACTIONS(512), 25,
+    ACTIONS(267), 1,
+      anon_sym_LBRACK,
+    ACTIONS(520), 1,
+      anon_sym_COMMA,
+    STATE(190), 1,
+      sym_type_arguments,
+    ACTIONS(518), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12739,14 +13029,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10522] = 4,
+  [10754] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(516), 1,
+    ACTIONS(524), 1,
       anon_sym_PIPE,
-    STATE(150), 1,
+    STATE(152), 1,
       aux_sym_method_types_repeat1,
-    ACTIONS(514), 25,
+    ACTIONS(522), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12772,63 +13062,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10559] = 20,
+  [10791] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(7), 1,
-      sym_constant,
-    ACTIONS(9), 1,
-      anon_sym_class,
-    ACTIONS(11), 1,
-      sym__scope,
-    ACTIONS(15), 1,
-      anon_sym_PERCENTa_LBRACE,
-    ACTIONS(17), 1,
-      anon_sym_PERCENTa_LPAREN,
-    ACTIONS(19), 1,
-      anon_sym_PERCENTa_LBRACK,
-    ACTIONS(21), 1,
-      anon_sym_PERCENTa_PIPE,
-    ACTIONS(23), 1,
-      anon_sym_PERCENTa_LT,
-    ACTIONS(25), 1,
-      anon_sym_module,
-    ACTIONS(27), 1,
-      anon_sym_interface,
-    ACTIONS(29), 1,
-      anon_sym_type,
-    ACTIONS(31), 1,
-      sym_global_name,
-    ACTIONS(519), 1,
+    ACTIONS(527), 27,
       ts_builtin_sym_end,
-    STATE(133), 1,
-      sym_annotation,
-    STATE(214), 1,
-      aux_sym_decl_repeat1,
-    STATE(443), 1,
-      sym_const_name,
-    STATE(453), 1,
-      sym_namespace,
-    STATE(169), 2,
-      sym_decl,
-      aux_sym_program_repeat2,
-    STATE(241), 8,
-      sym_class_decl,
-      sym_module_decl,
-      sym_class_alias_decl,
-      sym_module_alias_decl,
-      sym_interface_decl,
-      sym_type_alias_decl,
-      sym_const_decl,
-      sym_global_decl,
-  [10628] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(521), 1,
-      anon_sym_QMARK,
-    ACTIONS(523), 1,
-      anon_sym_EQ,
-    ACTIONS(305), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12842,6 +13080,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_module,
       anon_sym_interface,
       anon_sym_type,
+      sym_global_name,
       anon_sym_def,
       anon_sym_public,
       anon_sym_private,
@@ -12854,14 +13093,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10665] = 4,
+  [10824] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(525), 1,
-      anon_sym_QMARK,
-    ACTIONS(527), 1,
-      anon_sym_EQ,
-    ACTIONS(305), 25,
+    ACTIONS(529), 27,
+      ts_builtin_sym_end,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12875,6 +13111,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_module,
       anon_sym_interface,
       anon_sym_type,
+      sym_global_name,
       anon_sym_def,
       anon_sym_public,
       anon_sym_private,
@@ -12887,14 +13124,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10702] = 4,
+  [10857] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(259), 1,
-      anon_sym_LBRACK,
-    STATE(209), 1,
-      sym_type_arguments,
-    ACTIONS(529), 25,
+    ACTIONS(531), 27,
+      ts_builtin_sym_end,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -12908,6 +13142,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_module,
       anon_sym_interface,
       anon_sym_type,
+      sym_global_name,
       anon_sym_def,
       anon_sym_public,
       anon_sym_private,
@@ -12920,7 +13155,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10739] = 20,
+  [10890] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(7), 1,
@@ -12947,20 +13182,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_type,
     ACTIONS(31), 1,
       sym_global_name,
-    ACTIONS(470), 1,
+    ACTIONS(480), 1,
       ts_builtin_sym_end,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(214), 1,
+    STATE(220), 1,
       aux_sym_decl_repeat1,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
-    STATE(169), 2,
+    STATE(179), 2,
       sym_decl,
       aux_sym_program_repeat2,
-    STATE(241), 8,
+    STATE(245), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -12969,10 +13204,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_type_alias_decl,
       sym_const_decl,
       sym_global_decl,
-  [10808] = 2,
+  [10959] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(531), 27,
+    ACTIONS(533), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -13000,14 +13235,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10841] = 4,
+  [10992] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(259), 1,
-      anon_sym_LBRACK,
-    STATE(203), 1,
-      sym_type_arguments,
-    ACTIONS(533), 25,
+    ACTIONS(535), 27,
+      ts_builtin_sym_end,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13021,6 +13253,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_module,
       anon_sym_interface,
       anon_sym_type,
+      sym_global_name,
       anon_sym_def,
       anon_sym_public,
       anon_sym_private,
@@ -13033,10 +13266,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10878] = 2,
+  [11025] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(535), 27,
+    ACTIONS(537), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -13064,10 +13297,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10911] = 2,
+  [11058] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(537), 27,
+    ACTIONS(539), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -13095,14 +13328,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10944] = 4,
+  [11091] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(259), 1,
-      anon_sym_LBRACK,
-    STATE(210), 1,
-      sym_type_arguments,
-    ACTIONS(539), 25,
+    ACTIONS(541), 27,
+      ts_builtin_sym_end,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13116,6 +13346,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_module,
       anon_sym_interface,
       anon_sym_type,
+      sym_global_name,
       anon_sym_def,
       anon_sym_public,
       anon_sym_private,
@@ -13128,10 +13359,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [10981] = 2,
+  [11124] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(541), 27,
+    ACTIONS(543), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -13159,10 +13390,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11014] = 2,
+  [11157] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(543), 27,
+    ACTIONS(545), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -13190,14 +13421,11 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11047] = 4,
+  [11190] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(259), 1,
-      anon_sym_LBRACK,
-    STATE(211), 1,
-      sym_type_arguments,
-    ACTIONS(545), 25,
+    ACTIONS(547), 27,
+      ts_builtin_sym_end,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13211,6 +13439,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_module,
       anon_sym_interface,
       anon_sym_type,
+      sym_global_name,
       anon_sym_def,
       anon_sym_public,
       anon_sym_private,
@@ -13223,14 +13452,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11084] = 4,
+  [11223] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(549), 1,
-      anon_sym_PIPE,
-    STATE(150), 1,
-      aux_sym_method_types_repeat1,
-    ACTIONS(547), 25,
+    ACTIONS(267), 1,
+      anon_sym_LBRACK,
+    STATE(217), 1,
+      sym_type_arguments,
+    ACTIONS(549), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13256,11 +13485,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11121] = 2,
+  [11260] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(551), 27,
-      ts_builtin_sym_end,
+    ACTIONS(267), 1,
+      anon_sym_LBRACK,
+    STATE(218), 1,
+      sym_type_arguments,
+    ACTIONS(551), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13274,7 +13506,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_module,
       anon_sym_interface,
       anon_sym_type,
-      sym_global_name,
       anon_sym_def,
       anon_sym_public,
       anon_sym_private,
@@ -13287,7 +13518,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11154] = 2,
+  [11297] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(553), 27,
@@ -13318,7 +13549,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11187] = 2,
+  [11330] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(555), 27,
@@ -13349,7 +13580,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11220] = 2,
+  [11363] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(557), 27,
@@ -13380,60 +13611,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11253] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(559), 1,
-      ts_builtin_sym_end,
-    ACTIONS(561), 1,
-      sym_constant,
-    ACTIONS(564), 1,
-      anon_sym_class,
-    ACTIONS(567), 1,
-      sym__scope,
-    ACTIONS(570), 1,
-      anon_sym_PERCENTa_LBRACE,
-    ACTIONS(573), 1,
-      anon_sym_PERCENTa_LPAREN,
-    ACTIONS(576), 1,
-      anon_sym_PERCENTa_LBRACK,
-    ACTIONS(579), 1,
-      anon_sym_PERCENTa_PIPE,
-    ACTIONS(582), 1,
-      anon_sym_PERCENTa_LT,
-    ACTIONS(585), 1,
-      anon_sym_module,
-    ACTIONS(588), 1,
-      anon_sym_interface,
-    ACTIONS(591), 1,
-      anon_sym_type,
-    ACTIONS(594), 1,
-      sym_global_name,
-    STATE(133), 1,
-      sym_annotation,
-    STATE(214), 1,
-      aux_sym_decl_repeat1,
-    STATE(443), 1,
-      sym_const_name,
-    STATE(453), 1,
-      sym_namespace,
-    STATE(169), 2,
-      sym_decl,
-      aux_sym_program_repeat2,
-    STATE(241), 8,
-      sym_class_decl,
-      sym_module_decl,
-      sym_class_alias_decl,
-      sym_module_alias_decl,
-      sym_interface_decl,
-      sym_type_alias_decl,
-      sym_const_decl,
-      sym_global_decl,
-  [11322] = 2,
+  [11396] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(597), 27,
-      ts_builtin_sym_end,
+    ACTIONS(267), 1,
+      anon_sym_LBRACK,
+    STATE(219), 1,
+      sym_type_arguments,
+    ACTIONS(559), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13447,7 +13632,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_module,
       anon_sym_interface,
       anon_sym_type,
-      sym_global_name,
       anon_sym_def,
       anon_sym_public,
       anon_sym_private,
@@ -13460,10 +13644,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11355] = 2,
+  [11433] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(599), 27,
+    ACTIONS(561), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -13491,10 +13675,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11388] = 2,
+  [11466] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(601), 27,
+    ACTIONS(563), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -13522,10 +13706,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11421] = 2,
+  [11499] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(603), 27,
+    ACTIONS(565), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -13553,10 +13737,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11454] = 2,
+  [11532] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(605), 27,
+    ACTIONS(567), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -13584,10 +13768,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11487] = 2,
+  [11565] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(607), 27,
+    ACTIONS(569), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -13615,10 +13799,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11520] = 2,
+  [11598] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(609), 27,
+    ACTIONS(571), 27,
       ts_builtin_sym_end,
       sym_constant,
       sym_self,
@@ -13646,11 +13830,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11553] = 2,
+  [11631] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(611), 27,
-      ts_builtin_sym_end,
+    ACTIONS(267), 1,
+      anon_sym_LBRACK,
+    STATE(216), 1,
+      sym_type_arguments,
+    ACTIONS(573), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13664,7 +13851,6 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_module,
       anon_sym_interface,
       anon_sym_type,
-      sym_global_name,
       anon_sym_def,
       anon_sym_public,
       anon_sym_private,
@@ -13677,43 +13863,110 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11586] = 2,
+  [11668] = 20,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(613), 27,
-      ts_builtin_sym_end,
+    ACTIONS(7), 1,
       sym_constant,
-      sym_self,
+    ACTIONS(9), 1,
       anon_sym_class,
+    ACTIONS(11), 1,
       sym__scope,
+    ACTIONS(15), 1,
       anon_sym_PERCENTa_LBRACE,
+    ACTIONS(17), 1,
       anon_sym_PERCENTa_LPAREN,
+    ACTIONS(19), 1,
       anon_sym_PERCENTa_LBRACK,
+    ACTIONS(21), 1,
       anon_sym_PERCENTa_PIPE,
+    ACTIONS(23), 1,
       anon_sym_PERCENTa_LT,
-      anon_sym_end,
+    ACTIONS(25), 1,
       anon_sym_module,
+    ACTIONS(27), 1,
       anon_sym_interface,
+    ACTIONS(29), 1,
       anon_sym_type,
+    ACTIONS(31), 1,
       sym_global_name,
-      anon_sym_def,
-      anon_sym_public,
-      anon_sym_private,
-      anon_sym_attr_reader,
-      anon_sym_attr_writer,
-      anon_sym_attr_accessor,
-      anon_sym_include,
-      anon_sym_extend,
-      anon_sym_prepend,
-      anon_sym_alias,
-      sym_ivar_name,
-      sym_cvar_name,
-  [11619] = 4,
-    ACTIONS(3), 1,
+    ACTIONS(575), 1,
+      ts_builtin_sym_end,
+    STATE(135), 1,
+      sym_annotation,
+    STATE(220), 1,
+      aux_sym_decl_repeat1,
+    STATE(427), 1,
+      sym_const_name,
+    STATE(440), 1,
+      sym_namespace,
+    STATE(179), 2,
+      sym_decl,
+      aux_sym_program_repeat2,
+    STATE(245), 8,
+      sym_class_decl,
+      sym_module_decl,
+      sym_class_alias_decl,
+      sym_module_alias_decl,
+      sym_interface_decl,
+      sym_type_alias_decl,
+      sym_const_decl,
+      sym_global_decl,
+  [11737] = 20,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(577), 1,
+      ts_builtin_sym_end,
+    ACTIONS(579), 1,
+      sym_constant,
+    ACTIONS(582), 1,
+      anon_sym_class,
+    ACTIONS(585), 1,
+      sym__scope,
+    ACTIONS(588), 1,
+      anon_sym_PERCENTa_LBRACE,
+    ACTIONS(591), 1,
+      anon_sym_PERCENTa_LPAREN,
+    ACTIONS(594), 1,
+      anon_sym_PERCENTa_LBRACK,
+    ACTIONS(597), 1,
+      anon_sym_PERCENTa_PIPE,
+    ACTIONS(600), 1,
+      anon_sym_PERCENTa_LT,
+    ACTIONS(603), 1,
+      anon_sym_module,
+    ACTIONS(606), 1,
+      anon_sym_interface,
+    ACTIONS(609), 1,
+      anon_sym_type,
+    ACTIONS(612), 1,
+      sym_global_name,
+    STATE(135), 1,
+      sym_annotation,
+    STATE(220), 1,
+      aux_sym_decl_repeat1,
+    STATE(427), 1,
+      sym_const_name,
+    STATE(440), 1,
+      sym_namespace,
+    STATE(179), 2,
+      sym_decl,
+      aux_sym_program_repeat2,
+    STATE(245), 8,
+      sym_class_decl,
+      sym_module_decl,
+      sym_class_alias_decl,
+      sym_module_alias_decl,
+      sym_interface_decl,
+      sym_type_alias_decl,
+      sym_const_decl,
+      sym_global_decl,
+  [11806] = 4,
+    ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(549), 1,
+    ACTIONS(617), 1,
       anon_sym_PIPE,
-    STATE(164), 1,
+    STATE(152), 1,
       aux_sym_method_types_repeat1,
     ACTIONS(615), 25,
       sym_constant,
@@ -13741,14 +13994,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11656] = 2,
+  [11843] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(514), 26,
+    ACTIONS(617), 1,
+      anon_sym_PIPE,
+    STATE(180), 1,
+      aux_sym_method_types_repeat1,
+    ACTIONS(619), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
-      anon_sym_PIPE,
       sym__scope,
       anon_sym_PERCENTa_LBRACE,
       anon_sym_PERCENTa_LPAREN,
@@ -13771,12 +14027,109 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11688] = 3,
+  [11880] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(619), 1,
-      anon_sym_COMMA,
-    ACTIONS(617), 25,
+    ACTIONS(621), 1,
+      anon_sym_QMARK,
+    ACTIONS(623), 1,
+      anon_sym_EQ,
+    ACTIONS(291), 25,
+      sym_constant,
+      sym_self,
+      anon_sym_class,
+      sym__scope,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      anon_sym_end,
+      anon_sym_module,
+      anon_sym_interface,
+      anon_sym_type,
+      anon_sym_def,
+      anon_sym_public,
+      anon_sym_private,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+      anon_sym_include,
+      anon_sym_extend,
+      anon_sym_prepend,
+      anon_sym_alias,
+      sym_ivar_name,
+      sym_cvar_name,
+  [11917] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(625), 27,
+      ts_builtin_sym_end,
+      sym_constant,
+      sym_self,
+      anon_sym_class,
+      sym__scope,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      anon_sym_end,
+      anon_sym_module,
+      anon_sym_interface,
+      anon_sym_type,
+      sym_global_name,
+      anon_sym_def,
+      anon_sym_public,
+      anon_sym_private,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+      anon_sym_include,
+      anon_sym_extend,
+      anon_sym_prepend,
+      anon_sym_alias,
+      sym_ivar_name,
+      sym_cvar_name,
+  [11950] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(627), 27,
+      ts_builtin_sym_end,
+      sym_constant,
+      sym_self,
+      anon_sym_class,
+      sym__scope,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      anon_sym_end,
+      anon_sym_module,
+      anon_sym_interface,
+      anon_sym_type,
+      sym_global_name,
+      anon_sym_def,
+      anon_sym_public,
+      anon_sym_private,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+      anon_sym_include,
+      anon_sym_extend,
+      anon_sym_prepend,
+      anon_sym_alias,
+      sym_ivar_name,
+      sym_cvar_name,
+  [11983] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(629), 1,
+      anon_sym_QMARK,
+    ACTIONS(631), 1,
+      anon_sym_EQ,
+    ACTIONS(291), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13802,10 +14155,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11722] = 2,
+  [12020] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(621), 26,
+    ACTIONS(633), 26,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13832,10 +14185,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11754] = 2,
+  [12052] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(623), 26,
+    ACTIONS(635), 26,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13862,10 +14215,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11786] = 2,
+  [12084] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(625), 26,
+    ACTIONS(522), 26,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13892,10 +14245,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11818] = 2,
+  [12116] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(627), 26,
+    ACTIONS(637), 26,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13922,10 +14275,12 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11850] = 2,
+  [12148] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(285), 25,
+    ACTIONS(641), 1,
+      anon_sym_COMMA,
+    ACTIONS(639), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -13951,13 +14306,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11881] = 2,
+  [12182] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(629), 25,
+    ACTIONS(643), 26,
       sym_constant,
       sym_self,
       anon_sym_class,
+      anon_sym_PIPE,
       sym__scope,
       anon_sym_PERCENTa_LBRACE,
       anon_sym_PERCENTa_LPAREN,
@@ -13980,10 +14336,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11912] = 2,
+  [12214] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(631), 25,
+    ACTIONS(645), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14009,10 +14365,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11943] = 2,
+  [12245] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(633), 25,
+    ACTIONS(647), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14038,10 +14394,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [11974] = 2,
+  [12276] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(635), 25,
+    ACTIONS(649), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14067,10 +14423,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12005] = 2,
+  [12307] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(637), 25,
+    ACTIONS(651), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14096,10 +14452,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12036] = 2,
+  [12338] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(639), 25,
+    ACTIONS(653), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14125,10 +14481,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12067] = 2,
+  [12369] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(637), 25,
+    ACTIONS(645), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14154,10 +14510,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12098] = 2,
+  [12400] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(309), 25,
+    ACTIONS(655), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14183,10 +14539,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12129] = 2,
+  [12431] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(305), 25,
+    ACTIONS(619), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14212,10 +14568,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12160] = 2,
+  [12462] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(641), 25,
+    ACTIONS(657), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14241,10 +14597,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12191] = 2,
+  [12493] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(615), 25,
+    ACTIONS(659), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14270,10 +14626,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12222] = 2,
+  [12524] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(643), 25,
+    ACTIONS(661), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14299,10 +14655,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12253] = 2,
+  [12555] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(645), 25,
+    ACTIONS(663), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14328,10 +14684,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12284] = 2,
+  [12586] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(289), 25,
+    ACTIONS(663), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14357,10 +14713,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12315] = 2,
+  [12617] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(637), 25,
+    ACTIONS(287), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14386,10 +14742,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12346] = 2,
+  [12648] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(647), 25,
+    ACTIONS(663), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14415,10 +14771,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12377] = 2,
+  [12679] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(649), 25,
+    ACTIONS(665), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14444,10 +14800,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12408] = 2,
+  [12710] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(297), 25,
+    ACTIONS(321), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14473,10 +14829,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12439] = 2,
+  [12741] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(651), 25,
+    ACTIONS(307), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14502,10 +14858,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12470] = 2,
+  [12772] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(301), 25,
+    ACTIONS(645), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14531,10 +14887,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12501] = 2,
+  [12803] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(651), 25,
+    ACTIONS(303), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14560,10 +14916,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12532] = 2,
+  [12834] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(651), 25,
+    ACTIONS(667), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14589,10 +14945,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12563] = 2,
+  [12865] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(653), 25,
+    ACTIONS(291), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14618,10 +14974,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12594] = 2,
+  [12896] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(655), 25,
+    ACTIONS(669), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14647,10 +15003,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12625] = 2,
+  [12927] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(657), 25,
+    ACTIONS(295), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14676,10 +15032,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12656] = 2,
+  [12958] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(659), 25,
+    ACTIONS(671), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14705,10 +15061,68 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12687] = 2,
+  [12989] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(661), 25,
+    ACTIONS(673), 25,
+      sym_constant,
+      sym_self,
+      anon_sym_class,
+      sym__scope,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      anon_sym_end,
+      anon_sym_module,
+      anon_sym_interface,
+      anon_sym_type,
+      anon_sym_def,
+      anon_sym_public,
+      anon_sym_private,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+      anon_sym_include,
+      anon_sym_extend,
+      anon_sym_prepend,
+      anon_sym_alias,
+      sym_ivar_name,
+      sym_cvar_name,
+  [13020] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(675), 25,
+      sym_constant,
+      sym_self,
+      anon_sym_class,
+      sym__scope,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      anon_sym_end,
+      anon_sym_module,
+      anon_sym_interface,
+      anon_sym_type,
+      anon_sym_def,
+      anon_sym_public,
+      anon_sym_private,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+      anon_sym_include,
+      anon_sym_extend,
+      anon_sym_prepend,
+      anon_sym_alias,
+      sym_ivar_name,
+      sym_cvar_name,
+  [13051] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(677), 25,
       sym_constant,
       sym_self,
       anon_sym_class,
@@ -14734,7 +15148,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_alias,
       sym_ivar_name,
       sym_cvar_name,
-  [12718] = 18,
+  [13082] = 18,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(7), 1,
@@ -14761,15 +15175,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_type,
     ACTIONS(31), 1,
       sym_global_name,
-    STATE(127), 1,
+    STATE(129), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(443), 1,
+    STATE(427), 1,
       sym_const_name,
-    STATE(453), 1,
+    STATE(440), 1,
       sym_namespace,
-    STATE(238), 8,
+    STATE(244), 8,
       sym_class_decl,
       sym_module_decl,
       sym_class_alias_decl,
@@ -14778,7 +15192,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_type_alias_decl,
       sym_const_decl,
       sym_global_decl,
-  [12780] = 19,
+  [13144] = 19,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(15), 1,
@@ -14797,30 +15211,30 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_def,
     ACTIONS(93), 1,
       anon_sym_include,
-    ACTIONS(663), 1,
+    ACTIONS(679), 1,
       anon_sym_end,
-    ACTIONS(667), 1,
+    ACTIONS(683), 1,
       anon_sym_alias,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(221), 1,
-      sym_module_type_parameters,
-    STATE(222), 1,
+    STATE(223), 1,
       aux_sym_interface_decl_repeat1,
-    STATE(231), 1,
+    STATE(228), 1,
+      sym_module_type_parameters,
+    STATE(236), 1,
       aux_sym_decl_repeat1,
-    STATE(244), 1,
+    STATE(251), 1,
       sym_interface_member,
-    STATE(456), 1,
+    STATE(460), 1,
       sym_visibility,
-    ACTIONS(665), 2,
+    ACTIONS(681), 2,
       anon_sym_public,
       anon_sym_private,
-    STATE(243), 3,
+    STATE(249), 3,
       sym_method_member,
       sym_include_member,
       sym_alias_member,
-  [12841] = 20,
+  [13205] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(15), 1,
@@ -14833,35 +15247,73 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
     ACTIONS(23), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(669), 1,
+    ACTIONS(685), 1,
       anon_sym_LPAREN,
-    ACTIONS(671), 1,
+    ACTIONS(687), 1,
       anon_sym_LBRACK,
-    ACTIONS(673), 1,
+    ACTIONS(689), 1,
       anon_sym_LBRACE,
-    ACTIONS(675), 1,
+    ACTIONS(691), 1,
       anon_sym_DASH_GT,
-    ACTIONS(677), 1,
+    ACTIONS(693), 1,
       anon_sym_QMARK2,
-    ACTIONS(679), 1,
+    ACTIONS(695), 1,
       anon_sym_DOT_DOT_DOT,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(179), 1,
+    STATE(181), 1,
       sym_method_type,
-    STATE(183), 1,
+    STATE(191), 1,
       sym_method_type_body,
-    STATE(187), 1,
+    STATE(202), 1,
       sym_method_types,
-    STATE(236), 1,
+    STATE(241), 1,
       aux_sym_decl_repeat1,
-    STATE(237), 1,
+    STATE(242), 1,
       sym_method_type_parameters,
-    STATE(293), 1,
+    STATE(295), 1,
       sym_parameters,
-    STATE(410), 1,
+    STATE(435), 1,
       sym_block,
-  [12902] = 20,
+  [13266] = 17,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(15), 1,
+      anon_sym_PERCENTa_LBRACE,
+    ACTIONS(17), 1,
+      anon_sym_PERCENTa_LPAREN,
+    ACTIONS(19), 1,
+      anon_sym_PERCENTa_LBRACK,
+    ACTIONS(21), 1,
+      anon_sym_PERCENTa_PIPE,
+    ACTIONS(23), 1,
+      anon_sym_PERCENTa_LT,
+    ACTIONS(87), 1,
+      anon_sym_def,
+    ACTIONS(93), 1,
+      anon_sym_include,
+    ACTIONS(683), 1,
+      anon_sym_alias,
+    ACTIONS(697), 1,
+      anon_sym_end,
+    STATE(135), 1,
+      sym_annotation,
+    STATE(229), 1,
+      aux_sym_interface_decl_repeat1,
+    STATE(236), 1,
+      aux_sym_decl_repeat1,
+    STATE(251), 1,
+      sym_interface_member,
+    STATE(460), 1,
+      sym_visibility,
+    ACTIONS(681), 2,
+      anon_sym_public,
+      anon_sym_private,
+    STATE(249), 3,
+      sym_method_member,
+      sym_include_member,
+      sym_alias_member,
+  [13321] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(15), 1,
@@ -14874,35 +15326,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
     ACTIONS(23), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(669), 1,
+    ACTIONS(685), 1,
       anon_sym_LPAREN,
-    ACTIONS(671), 1,
+    ACTIONS(687), 1,
       anon_sym_LBRACK,
-    ACTIONS(673), 1,
+    ACTIONS(689), 1,
       anon_sym_LBRACE,
-    ACTIONS(675), 1,
+    ACTIONS(691), 1,
       anon_sym_DASH_GT,
-    ACTIONS(677), 1,
+    ACTIONS(693), 1,
       anon_sym_QMARK2,
-    ACTIONS(679), 1,
+    ACTIONS(695), 1,
       anon_sym_DOT_DOT_DOT,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(179), 1,
+    STATE(181), 1,
       sym_method_type,
-    STATE(183), 1,
+    STATE(191), 1,
       sym_method_type_body,
-    STATE(196), 1,
+    STATE(193), 1,
       sym_method_types,
-    STATE(236), 1,
+    STATE(241), 1,
       aux_sym_decl_repeat1,
-    STATE(237), 1,
+    STATE(242), 1,
       sym_method_type_parameters,
-    STATE(293), 1,
+    STATE(295), 1,
       sym_parameters,
-    STATE(410), 1,
+    STATE(435), 1,
       sym_block,
-  [12963] = 20,
+  [13382] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(15), 1,
@@ -14915,73 +15367,73 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
     ACTIONS(23), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(669), 1,
+    ACTIONS(685), 1,
       anon_sym_LPAREN,
-    ACTIONS(671), 1,
+    ACTIONS(687), 1,
       anon_sym_LBRACK,
-    ACTIONS(673), 1,
+    ACTIONS(689), 1,
       anon_sym_LBRACE,
-    ACTIONS(675), 1,
+    ACTIONS(691), 1,
       anon_sym_DASH_GT,
-    ACTIONS(677), 1,
+    ACTIONS(693), 1,
       anon_sym_QMARK2,
-    ACTIONS(679), 1,
+    ACTIONS(695), 1,
       anon_sym_DOT_DOT_DOT,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(179), 1,
+    STATE(181), 1,
       sym_method_type,
-    STATE(183), 1,
+    STATE(191), 1,
       sym_method_type_body,
-    STATE(190), 1,
+    STATE(198), 1,
       sym_method_types,
-    STATE(236), 1,
+    STATE(241), 1,
       aux_sym_decl_repeat1,
-    STATE(237), 1,
+    STATE(242), 1,
       sym_method_type_parameters,
-    STATE(293), 1,
+    STATE(295), 1,
       sym_parameters,
-    STATE(410), 1,
+    STATE(435), 1,
       sym_block,
-  [13024] = 17,
+  [13443] = 17,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(681), 1,
+    ACTIONS(15), 1,
       anon_sym_PERCENTa_LBRACE,
-    ACTIONS(684), 1,
+    ACTIONS(17), 1,
       anon_sym_PERCENTa_LPAREN,
-    ACTIONS(687), 1,
+    ACTIONS(19), 1,
       anon_sym_PERCENTa_LBRACK,
-    ACTIONS(690), 1,
+    ACTIONS(21), 1,
       anon_sym_PERCENTa_PIPE,
-    ACTIONS(693), 1,
+    ACTIONS(23), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(696), 1,
-      anon_sym_end,
-    ACTIONS(698), 1,
+    ACTIONS(87), 1,
       anon_sym_def,
-    ACTIONS(704), 1,
+    ACTIONS(93), 1,
       anon_sym_include,
-    ACTIONS(707), 1,
+    ACTIONS(683), 1,
       anon_sym_alias,
-    STATE(133), 1,
+    ACTIONS(699), 1,
+      anon_sym_end,
+    STATE(135), 1,
       sym_annotation,
-    STATE(219), 1,
+    STATE(229), 1,
       aux_sym_interface_decl_repeat1,
-    STATE(231), 1,
+    STATE(236), 1,
       aux_sym_decl_repeat1,
-    STATE(244), 1,
+    STATE(251), 1,
       sym_interface_member,
-    STATE(456), 1,
+    STATE(460), 1,
       sym_visibility,
-    ACTIONS(701), 2,
+    ACTIONS(681), 2,
       anon_sym_public,
       anon_sym_private,
-    STATE(243), 3,
+    STATE(249), 3,
       sym_method_member,
       sym_include_member,
       sym_alias_member,
-  [13079] = 17,
+  [13498] = 20,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(15), 1,
@@ -14994,32 +15446,35 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
     ACTIONS(23), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(87), 1,
-      anon_sym_def,
-    ACTIONS(93), 1,
-      anon_sym_include,
-    ACTIONS(667), 1,
-      anon_sym_alias,
-    ACTIONS(710), 1,
-      anon_sym_end,
-    STATE(133), 1,
+    ACTIONS(685), 1,
+      anon_sym_LPAREN,
+    ACTIONS(687), 1,
+      anon_sym_LBRACK,
+    ACTIONS(689), 1,
+      anon_sym_LBRACE,
+    ACTIONS(691), 1,
+      anon_sym_DASH_GT,
+    ACTIONS(693), 1,
+      anon_sym_QMARK2,
+    ACTIONS(695), 1,
+      anon_sym_DOT_DOT_DOT,
+    STATE(135), 1,
       sym_annotation,
-    STATE(219), 1,
-      aux_sym_interface_decl_repeat1,
-    STATE(231), 1,
+    STATE(181), 1,
+      sym_method_type,
+    STATE(191), 1,
+      sym_method_type_body,
+    STATE(195), 1,
+      sym_method_types,
+    STATE(241), 1,
       aux_sym_decl_repeat1,
-    STATE(244), 1,
-      sym_interface_member,
-    STATE(456), 1,
-      sym_visibility,
-    ACTIONS(665), 2,
-      anon_sym_public,
-      anon_sym_private,
-    STATE(243), 3,
-      sym_method_member,
-      sym_include_member,
-      sym_alias_member,
-  [13134] = 17,
+    STATE(242), 1,
+      sym_method_type_parameters,
+    STATE(295), 1,
+      sym_parameters,
+    STATE(435), 1,
+      sym_block,
+  [13559] = 17,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(15), 1,
@@ -15036,107 +15491,66 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_def,
     ACTIONS(93), 1,
       anon_sym_include,
-    ACTIONS(667), 1,
+    ACTIONS(683), 1,
       anon_sym_alias,
-    ACTIONS(712), 1,
+    ACTIONS(701), 1,
       anon_sym_end,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(220), 1,
+    STATE(226), 1,
       aux_sym_interface_decl_repeat1,
-    STATE(231), 1,
+    STATE(236), 1,
       aux_sym_decl_repeat1,
-    STATE(244), 1,
+    STATE(251), 1,
       sym_interface_member,
-    STATE(456), 1,
+    STATE(460), 1,
       sym_visibility,
-    ACTIONS(665), 2,
+    ACTIONS(681), 2,
       anon_sym_public,
       anon_sym_private,
-    STATE(243), 3,
+    STATE(249), 3,
       sym_method_member,
       sym_include_member,
       sym_alias_member,
-  [13189] = 17,
+  [13614] = 17,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(15), 1,
+    ACTIONS(703), 1,
       anon_sym_PERCENTa_LBRACE,
-    ACTIONS(17), 1,
+    ACTIONS(706), 1,
       anon_sym_PERCENTa_LPAREN,
-    ACTIONS(19), 1,
+    ACTIONS(709), 1,
       anon_sym_PERCENTa_LBRACK,
-    ACTIONS(21), 1,
+    ACTIONS(712), 1,
       anon_sym_PERCENTa_PIPE,
-    ACTIONS(23), 1,
+    ACTIONS(715), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(87), 1,
+    ACTIONS(718), 1,
+      anon_sym_end,
+    ACTIONS(720), 1,
       anon_sym_def,
-    ACTIONS(93), 1,
+    ACTIONS(726), 1,
       anon_sym_include,
-    ACTIONS(667), 1,
+    ACTIONS(729), 1,
       anon_sym_alias,
-    ACTIONS(714), 1,
-      anon_sym_end,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(219), 1,
+    STATE(229), 1,
       aux_sym_interface_decl_repeat1,
-    STATE(231), 1,
+    STATE(236), 1,
       aux_sym_decl_repeat1,
-    STATE(244), 1,
+    STATE(251), 1,
       sym_interface_member,
-    STATE(456), 1,
+    STATE(460), 1,
       sym_visibility,
-    ACTIONS(665), 2,
+    ACTIONS(723), 2,
       anon_sym_public,
       anon_sym_private,
-    STATE(243), 3,
+    STATE(249), 3,
       sym_method_member,
       sym_include_member,
       sym_alias_member,
-  [13244] = 20,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(15), 1,
-      anon_sym_PERCENTa_LBRACE,
-    ACTIONS(17), 1,
-      anon_sym_PERCENTa_LPAREN,
-    ACTIONS(19), 1,
-      anon_sym_PERCENTa_LBRACK,
-    ACTIONS(21), 1,
-      anon_sym_PERCENTa_PIPE,
-    ACTIONS(23), 1,
-      anon_sym_PERCENTa_LT,
-    ACTIONS(669), 1,
-      anon_sym_LPAREN,
-    ACTIONS(671), 1,
-      anon_sym_LBRACK,
-    ACTIONS(673), 1,
-      anon_sym_LBRACE,
-    ACTIONS(675), 1,
-      anon_sym_DASH_GT,
-    ACTIONS(677), 1,
-      anon_sym_QMARK2,
-    ACTIONS(679), 1,
-      anon_sym_DOT_DOT_DOT,
-    STATE(133), 1,
-      sym_annotation,
-    STATE(179), 1,
-      sym_method_type,
-    STATE(183), 1,
-      sym_method_type_body,
-    STATE(189), 1,
-      sym_method_types,
-    STATE(236), 1,
-      aux_sym_decl_repeat1,
-    STATE(237), 1,
-      sym_method_type_parameters,
-    STATE(293), 1,
-      sym_parameters,
-    STATE(410), 1,
-      sym_block,
-  [13305] = 18,
+  [13669] = 18,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(15), 1,
@@ -15149,61 +15563,39 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
     ACTIONS(23), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(669), 1,
+    ACTIONS(685), 1,
       anon_sym_LPAREN,
-    ACTIONS(671), 1,
+    ACTIONS(687), 1,
       anon_sym_LBRACK,
-    ACTIONS(673), 1,
+    ACTIONS(689), 1,
       anon_sym_LBRACE,
-    ACTIONS(675), 1,
+    ACTIONS(691), 1,
       anon_sym_DASH_GT,
-    ACTIONS(677), 1,
+    ACTIONS(693), 1,
       anon_sym_QMARK2,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(180), 1,
+    STATE(188), 1,
       sym_method_type,
-    STATE(183), 1,
+    STATE(191), 1,
       sym_method_type_body,
-    STATE(236), 1,
+    STATE(241), 1,
       aux_sym_decl_repeat1,
-    STATE(237), 1,
+    STATE(242), 1,
       sym_method_type_parameters,
-    STATE(293), 1,
+    STATE(295), 1,
       sym_parameters,
-    STATE(410), 1,
+    STATE(435), 1,
       sym_block,
-  [13360] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(718), 1,
-      anon_sym_COMMA,
-    STATE(229), 1,
-      aux_sym_use_directive_repeat1,
-    ACTIONS(716), 14,
-      ts_builtin_sym_end,
-      sym_constant,
-      anon_sym_class,
-      sym__scope,
-      anon_sym_use,
-      anon_sym_PERCENTa_LBRACE,
-      anon_sym_PERCENTa_LPAREN,
-      anon_sym_PERCENTa_LBRACK,
-      anon_sym_PERCENTa_PIPE,
-      anon_sym_PERCENTa_LT,
-      anon_sym_module,
-      anon_sym_interface,
-      anon_sym_type,
-      sym_global_name,
-  [13386] = 4,
+  [13724] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(722), 1,
+    ACTIONS(734), 1,
       anon_sym_use,
-    STATE(226), 2,
+    STATE(231), 2,
       sym_use_directive,
       aux_sym_program_repeat1,
-    ACTIONS(720), 13,
+    ACTIONS(732), 13,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_class,
@@ -15217,16 +15609,17 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_interface,
       anon_sym_type,
       sym_global_name,
-  [13412] = 3,
+  [13750] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(727), 1,
-      anon_sym_as,
-    ACTIONS(725), 15,
+    ACTIONS(739), 1,
+      anon_sym_COMMA,
+    STATE(237), 1,
+      aux_sym_use_directive_repeat1,
+    ACTIONS(737), 14,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_class,
-      anon_sym_COMMA,
       sym__scope,
       anon_sym_use,
       anon_sym_PERCENTa_LBRACE,
@@ -15238,16 +15631,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_interface,
       anon_sym_type,
       sym_global_name,
-  [13436] = 5,
+  [13776] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(729), 13,
+    ACTIONS(741), 13,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_class,
@@ -15261,14 +15654,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_interface,
       anon_sym_type,
       sym_global_name,
-  [13464] = 4,
+  [13804] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(718), 1,
+    ACTIONS(745), 1,
       anon_sym_COMMA,
-    STATE(230), 1,
+    STATE(234), 1,
       aux_sym_use_directive_repeat1,
-    ACTIONS(731), 14,
+    ACTIONS(743), 14,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_class,
@@ -15283,17 +15676,16 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_interface,
       anon_sym_type,
       sym_global_name,
-  [13490] = 4,
+  [13830] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(735), 1,
-      anon_sym_COMMA,
-    STATE(230), 1,
-      aux_sym_use_directive_repeat1,
-    ACTIONS(733), 14,
+    ACTIONS(750), 1,
+      anon_sym_as,
+    ACTIONS(748), 15,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_class,
+      anon_sym_COMMA,
       sym__scope,
       anon_sym_use,
       anon_sym_PERCENTa_LBRACE,
@@ -15305,7 +15697,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_interface,
       anon_sym_type,
       sym_global_name,
-  [13516] = 14,
+  [13854] = 14,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(15), 1,
@@ -15322,25 +15714,47 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_def,
     ACTIONS(93), 1,
       anon_sym_include,
-    ACTIONS(667), 1,
+    ACTIONS(683), 1,
       anon_sym_alias,
-    STATE(127), 1,
+    STATE(129), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(456), 1,
+    STATE(460), 1,
       sym_visibility,
-    ACTIONS(665), 2,
+    ACTIONS(681), 2,
       anon_sym_public,
       anon_sym_private,
-    STATE(246), 3,
+    STATE(248), 3,
       sym_method_member,
       sym_include_member,
       sym_alias_member,
-  [13562] = 2,
+  [13900] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(739), 1,
+      anon_sym_COMMA,
+    STATE(234), 1,
+      aux_sym_use_directive_repeat1,
+    ACTIONS(752), 14,
+      ts_builtin_sym_end,
+      sym_constant,
+      anon_sym_class,
+      sym__scope,
+      anon_sym_use,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      anon_sym_module,
+      anon_sym_interface,
+      anon_sym_type,
+      sym_global_name,
+  [13926] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(738), 15,
+    ACTIONS(754), 15,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_class,
@@ -15356,10 +15770,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_interface,
       anon_sym_type,
       sym_global_name,
-  [13583] = 2,
+  [13947] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(733), 15,
+    ACTIONS(743), 15,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_class,
@@ -15375,10 +15789,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_interface,
       anon_sym_type,
       sym_global_name,
-  [13604] = 2,
+  [13968] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(740), 15,
+    ACTIONS(756), 15,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_class,
@@ -15394,7 +15808,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_interface,
       anon_sym_type,
       sym_global_name,
-  [13625] = 15,
+  [13989] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(15), 1,
@@ -15407,25 +15821,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
     ACTIONS(23), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(669), 1,
+    ACTIONS(685), 1,
       anon_sym_LPAREN,
-    ACTIONS(673), 1,
+    ACTIONS(689), 1,
       anon_sym_LBRACE,
-    ACTIONS(675), 1,
+    ACTIONS(691), 1,
       anon_sym_DASH_GT,
-    ACTIONS(677), 1,
+    ACTIONS(693), 1,
       anon_sym_QMARK2,
-    STATE(127), 1,
+    STATE(129), 1,
       aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(184), 1,
+    STATE(189), 1,
       sym_method_type_body,
-    STATE(293), 1,
+    STATE(295), 1,
       sym_parameters,
-    STATE(410), 1,
+    STATE(435), 1,
       sym_block,
-  [13671] = 15,
+  [14035] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(15), 1,
@@ -15438,25 +15852,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
     ACTIONS(23), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(669), 1,
+    ACTIONS(685), 1,
       anon_sym_LPAREN,
-    ACTIONS(673), 1,
+    ACTIONS(689), 1,
       anon_sym_LBRACE,
-    ACTIONS(675), 1,
+    ACTIONS(691), 1,
       anon_sym_DASH_GT,
-    ACTIONS(677), 1,
+    ACTIONS(693), 1,
       anon_sym_QMARK2,
-    STATE(127), 1,
-      aux_sym_decl_repeat1,
-    STATE(133), 1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(185), 1,
+    STATE(186), 1,
       sym_method_type_body,
-    STATE(293), 1,
+    STATE(243), 1,
+      aux_sym_decl_repeat1,
+    STATE(295), 1,
       sym_parameters,
-    STATE(410), 1,
+    STATE(435), 1,
       sym_block,
-  [13717] = 15,
+  [14081] = 15,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(15), 1,
@@ -15469,28 +15883,28 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
     ACTIONS(23), 1,
       anon_sym_PERCENTa_LT,
-    ACTIONS(669), 1,
+    ACTIONS(685), 1,
       anon_sym_LPAREN,
-    ACTIONS(673), 1,
+    ACTIONS(689), 1,
       anon_sym_LBRACE,
-    ACTIONS(675), 1,
+    ACTIONS(691), 1,
       anon_sym_DASH_GT,
-    ACTIONS(677), 1,
+    ACTIONS(693), 1,
       anon_sym_QMARK2,
-    STATE(133), 1,
+    STATE(129), 1,
+      aux_sym_decl_repeat1,
+    STATE(135), 1,
       sym_annotation,
-    STATE(182), 1,
+    STATE(187), 1,
       sym_method_type_body,
-    STATE(235), 1,
-      aux_sym_decl_repeat1,
-    STATE(293), 1,
+    STATE(295), 1,
       sym_parameters,
-    STATE(410), 1,
+    STATE(435), 1,
       sym_block,
-  [13763] = 2,
+  [14127] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(742), 13,
+    ACTIONS(758), 13,
       ts_builtin_sym_end,
       sym_constant,
       anon_sym_class,
@@ -15504,15 +15918,32 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_interface,
       anon_sym_type,
       sym_global_name,
-  [13782] = 4,
+  [14146] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(521), 1,
-      anon_sym_QMARK,
-    ACTIONS(523), 1,
-      anon_sym_EQ,
-    ACTIONS(305), 11,
-      anon_sym_PERCENTa_LBRACE,
+    ACTIONS(760), 13,
+      ts_builtin_sym_end,
+      sym_constant,
+      anon_sym_class,
+      sym__scope,
+      anon_sym_PERCENTa_LBRACE,
+      anon_sym_PERCENTa_LPAREN,
+      anon_sym_PERCENTa_LBRACK,
+      anon_sym_PERCENTa_PIPE,
+      anon_sym_PERCENTa_LT,
+      anon_sym_module,
+      anon_sym_interface,
+      anon_sym_type,
+      sym_global_name,
+  [14165] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(629), 1,
+      anon_sym_QMARK,
+    ACTIONS(631), 1,
+      anon_sym_EQ,
+    ACTIONS(291), 11,
+      anon_sym_PERCENTa_LBRACE,
       anon_sym_PERCENTa_LPAREN,
       anon_sym_PERCENTa_LBRACK,
       anon_sym_PERCENTa_PIPE,
@@ -15523,14 +15954,14 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_private,
       anon_sym_include,
       anon_sym_alias,
-  [13805] = 4,
+  [14188] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(525), 1,
+    ACTIONS(621), 1,
       anon_sym_QMARK,
-    ACTIONS(527), 1,
+    ACTIONS(623), 1,
       anon_sym_EQ,
-    ACTIONS(305), 11,
+    ACTIONS(291), 11,
       anon_sym_PERCENTa_LBRACE,
       anon_sym_PERCENTa_LPAREN,
       anon_sym_PERCENTa_LBRACK,
@@ -15542,51 +15973,25 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_private,
       anon_sym_include,
       anon_sym_alias,
-  [13828] = 2,
+  [14211] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(744), 13,
-      ts_builtin_sym_end,
-      sym_constant,
-      anon_sym_class,
-      sym__scope,
+    ACTIONS(762), 11,
       anon_sym_PERCENTa_LBRACE,
       anon_sym_PERCENTa_LPAREN,
       anon_sym_PERCENTa_LBRACK,
       anon_sym_PERCENTa_PIPE,
       anon_sym_PERCENTa_LT,
-      anon_sym_module,
-      anon_sym_interface,
-      anon_sym_type,
-      sym_global_name,
-  [13847] = 11,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(69), 1,
-      anon_sym_STAR,
-    ACTIONS(71), 1,
-      anon_sym_QMARK2,
-    ACTIONS(73), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(746), 1,
-      sym_identifier,
-    STATE(359), 1,
-      sym_optional_positionals,
-    STATE(373), 1,
-      sym_rest_positional,
-    STATE(425), 1,
-      sym_keywords,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
-      sym_splat_keyword,
-    STATE(447), 2,
-      sym_required_keywords,
-      sym_optional_keywords,
-  [13882] = 2,
+      anon_sym_end,
+      anon_sym_def,
+      anon_sym_public,
+      anon_sym_private,
+      anon_sym_include,
+      anon_sym_alias,
+  [14228] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(748), 11,
+    ACTIONS(764), 11,
       anon_sym_PERCENTa_LBRACE,
       anon_sym_PERCENTa_LPAREN,
       anon_sym_PERCENTa_LBRACK,
@@ -15598,10 +16003,34 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_private,
       anon_sym_include,
       anon_sym_alias,
-  [13899] = 2,
+  [14245] = 11,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(69), 1,
+      anon_sym_STAR,
+    ACTIONS(71), 1,
+      anon_sym_QMARK2,
+    ACTIONS(73), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(766), 1,
+      sym_identifier,
+    STATE(361), 1,
+      sym_rest_positional,
+    STATE(378), 1,
+      sym_optional_positionals,
+    STATE(409), 1,
+      sym_splat_keyword,
+    STATE(413), 1,
+      sym_var_name,
+    STATE(416), 1,
+      sym_keywords,
+    STATE(410), 2,
+      sym_required_keywords,
+      sym_optional_keywords,
+  [14280] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(750), 11,
+    ACTIONS(768), 11,
       anon_sym_PERCENTa_LBRACE,
       anon_sym_PERCENTa_LPAREN,
       anon_sym_PERCENTa_LBRACK,
@@ -15613,48 +16042,33 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_private,
       anon_sym_include,
       anon_sym_alias,
-  [13916] = 10,
+  [14297] = 10,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
       sym__scope,
     ACTIONS(35), 1,
       sym_constant,
-    ACTIONS(752), 1,
+    ACTIONS(770), 1,
       sym_interface,
-    ACTIONS(754), 1,
+    ACTIONS(772), 1,
       anon_sym_singleton,
-    STATE(80), 1,
-      sym_class_name,
     STATE(82), 1,
+      sym_class_name,
+    STATE(86), 1,
       sym_interface_name,
-    STATE(378), 1,
+    STATE(362), 1,
       sym_bound_type,
-    STATE(391), 1,
+    STATE(382), 1,
       sym_namespace,
-    STATE(376), 3,
+    STATE(366), 3,
       sym_class_type,
       sym_interface_type,
       sym_singleton_type,
-  [13949] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(756), 11,
-      anon_sym_PERCENTa_LBRACE,
-      anon_sym_PERCENTa_LPAREN,
-      anon_sym_PERCENTa_LBRACK,
-      anon_sym_PERCENTa_PIPE,
-      anon_sym_PERCENTa_LT,
-      anon_sym_end,
-      anon_sym_def,
-      anon_sym_public,
-      anon_sym_private,
-      anon_sym_include,
-      anon_sym_alias,
-  [13966] = 2,
+  [14330] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(758), 9,
+    ACTIONS(774), 9,
       anon_sym_LPAREN,
       anon_sym_LBRACE,
       anon_sym_DASH_GT,
@@ -15664,30 +16078,10 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
       anon_sym_PERCENTa_LT,
       anon_sym_QMARK2,
-  [13981] = 9,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(73), 1,
-      anon_sym_STAR_STAR,
-    ACTIONS(75), 1,
-      anon_sym_QMARK2,
-    ACTIONS(746), 1,
-      sym_identifier,
-    ACTIONS(760), 1,
-      anon_sym_RPAREN,
-    STATE(445), 1,
-      sym_keywords,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
-      sym_splat_keyword,
-    STATE(447), 2,
-      sym_required_keywords,
-      sym_optional_keywords,
-  [14010] = 2,
+  [14345] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(762), 9,
+    ACTIONS(776), 9,
       anon_sym_LPAREN,
       anon_sym_LBRACE,
       anon_sym_DASH_GT,
@@ -15697,121 +16091,123 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_PERCENTa_PIPE,
       anon_sym_PERCENTa_LT,
       anon_sym_QMARK2,
-  [14025] = 8,
+  [14360] = 9,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(73), 1,
       anon_sym_STAR_STAR,
     ACTIONS(75), 1,
       anon_sym_QMARK2,
-    ACTIONS(746), 1,
+    ACTIONS(766), 1,
       sym_identifier,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
+    ACTIONS(778), 1,
+      anon_sym_RPAREN,
+    STATE(409), 1,
       sym_splat_keyword,
-    STATE(450), 1,
+    STATE(413), 1,
+      sym_var_name,
+    STATE(451), 1,
       sym_keywords,
-    STATE(447), 2,
+    STATE(410), 2,
       sym_required_keywords,
       sym_optional_keywords,
-  [14051] = 8,
+  [14389] = 8,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(73), 1,
       anon_sym_STAR_STAR,
     ACTIONS(75), 1,
       anon_sym_QMARK2,
-    ACTIONS(746), 1,
+    ACTIONS(766), 1,
       sym_identifier,
-    STATE(428), 1,
-      sym_keywords,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
+    STATE(409), 1,
       sym_splat_keyword,
-    STATE(447), 2,
+    STATE(413), 1,
+      sym_var_name,
+    STATE(436), 1,
+      sym_keywords,
+    STATE(410), 2,
       sym_required_keywords,
       sym_optional_keywords,
-  [14077] = 8,
+  [14415] = 9,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(685), 1,
+      anon_sym_LPAREN,
+    ACTIONS(689), 1,
+      anon_sym_LBRACE,
+    ACTIONS(693), 1,
+      anon_sym_QMARK2,
+    ACTIONS(780), 1,
+      anon_sym_LBRACK,
+    ACTIONS(782), 1,
+      anon_sym_DASH_GT,
+    STATE(277), 1,
+      sym_parameters,
+    STATE(289), 1,
+      sym_self_type_binding,
+    STATE(467), 1,
+      sym_block,
+  [14443] = 8,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(73), 1,
       anon_sym_STAR_STAR,
     ACTIONS(75), 1,
       anon_sym_QMARK2,
-    ACTIONS(746), 1,
+    ACTIONS(766), 1,
       sym_identifier,
-    STATE(430), 1,
-      sym_keywords,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
+    STATE(409), 1,
       sym_splat_keyword,
-    STATE(447), 2,
+    STATE(413), 1,
+      sym_var_name,
+    STATE(434), 1,
+      sym_keywords,
+    STATE(410), 2,
       sym_required_keywords,
       sym_optional_keywords,
-  [14103] = 8,
+  [14469] = 8,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(73), 1,
       anon_sym_STAR_STAR,
     ACTIONS(75), 1,
       anon_sym_QMARK2,
-    ACTIONS(746), 1,
+    ACTIONS(766), 1,
       sym_identifier,
-    STATE(445), 1,
-      sym_keywords,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
+    STATE(409), 1,
       sym_splat_keyword,
-    STATE(447), 2,
+    STATE(413), 1,
+      sym_var_name,
+    STATE(456), 1,
+      sym_keywords,
+    STATE(410), 2,
       sym_required_keywords,
       sym_optional_keywords,
-  [14129] = 9,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(669), 1,
-      anon_sym_LPAREN,
-    ACTIONS(673), 1,
-      anon_sym_LBRACE,
-    ACTIONS(677), 1,
-      anon_sym_QMARK2,
-    ACTIONS(764), 1,
-      anon_sym_LBRACK,
-    ACTIONS(766), 1,
-      anon_sym_DASH_GT,
-    STATE(267), 1,
-      sym_parameters,
-    STATE(316), 1,
-      sym_self_type_binding,
-    STATE(394), 1,
-      sym_block,
-  [14157] = 8,
+  [14495] = 8,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(73), 1,
       anon_sym_STAR_STAR,
     ACTIONS(75), 1,
       anon_sym_QMARK2,
-    ACTIONS(746), 1,
+    ACTIONS(766), 1,
       sym_identifier,
-    STATE(436), 1,
-      sym_keywords,
-    STATE(446), 1,
-      sym_var_name,
-    STATE(448), 1,
+    STATE(409), 1,
       sym_splat_keyword,
-    STATE(447), 2,
+    STATE(413), 1,
+      sym_var_name,
+    STATE(442), 1,
+      sym_keywords,
+    STATE(410), 2,
       sym_required_keywords,
       sym_optional_keywords,
-  [14183] = 3,
+  [14521] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(768), 1,
+    ACTIONS(784), 1,
       anon_sym_COLON,
-    ACTIONS(261), 7,
+    ACTIONS(273), 7,
       anon_sym_RPAREN,
       anon_sym_PIPE,
       anon_sym_AMP,
@@ -15819,1681 +16215,1699 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_LBRACK,
       anon_sym_COMMA,
       sym_identifier,
-  [14199] = 7,
+  [14537] = 8,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(466), 1,
-      anon_sym_PIPE,
-    ACTIONS(746), 1,
+    ACTIONS(73), 1,
+      anon_sym_STAR_STAR,
+    ACTIONS(75), 1,
+      anon_sym_QMARK2,
+    ACTIONS(766), 1,
       sym_identifier,
-    STATE(381), 1,
+    STATE(409), 1,
+      sym_splat_keyword,
+    STATE(413), 1,
       sym_var_name,
-    ACTIONS(770), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [14222] = 7,
+    STATE(451), 1,
+      sym_keywords,
+    STATE(410), 2,
+      sym_required_keywords,
+      sym_optional_keywords,
+  [14563] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(772), 1,
+    ACTIONS(786), 1,
       sym_constant,
-    ACTIONS(774), 1,
+    ACTIONS(788), 1,
       sym_generics_unchecked,
-    STATE(305), 1,
+    STATE(307), 1,
       sym_type_variable,
-    STATE(333), 1,
+    STATE(357), 1,
       sym_module_type_parameter,
-    STATE(379), 1,
+    STATE(360), 1,
       sym_generics_variance,
-    ACTIONS(776), 2,
+    ACTIONS(790), 2,
       anon_sym_out,
       anon_sym_in,
-  [14245] = 7,
+  [14586] = 7,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(474), 1,
+      anon_sym_PIPE,
+    ACTIONS(766), 1,
+      sym_identifier,
+    STATE(395), 1,
+      sym_var_name,
+    ACTIONS(792), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [14609] = 7,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
       sym__scope,
     ACTIONS(35), 1,
       sym_constant,
-    ACTIONS(752), 1,
+    ACTIONS(770), 1,
       sym_interface,
-    STATE(212), 1,
+    STATE(201), 1,
       sym_module_self_types,
-    STATE(391), 1,
+    STATE(382), 1,
       sym_namespace,
-    STATE(137), 2,
+    STATE(151), 2,
       sym_class_name,
       sym_interface_name,
-  [14268] = 7,
+  [14632] = 7,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
       sym__scope,
     ACTIONS(35), 1,
       sym_constant,
-    ACTIONS(752), 1,
+    ACTIONS(770), 1,
       sym_interface,
-    STATE(202), 1,
+    STATE(194), 1,
       sym_module_self_types,
-    STATE(391), 1,
+    STATE(382), 1,
       sym_namespace,
-    STATE(137), 2,
+    STATE(151), 2,
       sym_class_name,
       sym_interface_name,
-  [14291] = 7,
+  [14655] = 7,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
       sym__scope,
     ACTIONS(35), 1,
       sym_constant,
-    ACTIONS(752), 1,
+    ACTIONS(770), 1,
       sym_interface,
-    STATE(198), 1,
+    STATE(196), 1,
       sym_module_self_types,
-    STATE(391), 1,
+    STATE(382), 1,
       sym_namespace,
-    STATE(137), 2,
+    STATE(151), 2,
       sym_class_name,
       sym_interface_name,
-  [14314] = 7,
+  [14678] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(772), 1,
+    ACTIONS(786), 1,
       sym_constant,
-    ACTIONS(774), 1,
+    ACTIONS(788), 1,
       sym_generics_unchecked,
-    STATE(305), 1,
+    STATE(307), 1,
       sym_type_variable,
-    STATE(379), 1,
+    STATE(360), 1,
       sym_generics_variance,
-    STATE(384), 1,
+    STATE(364), 1,
       sym_module_type_parameter,
-    ACTIONS(776), 2,
+    ACTIONS(790), 2,
       anon_sym_out,
       anon_sym_in,
-  [14337] = 7,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(466), 1,
-      anon_sym_PIPE,
-    ACTIONS(778), 1,
-      anon_sym_COMMA,
-    ACTIONS(780), 1,
-      anon_sym_RBRACK,
-    STATE(344), 1,
-      aux_sym_tuple_type_repeat1,
-  [14359] = 5,
+  [14701] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(303), 1,
+    ACTIONS(289), 1,
       anon_sym_LPAREN,
-    ACTIONS(435), 1,
+    ACTIONS(443), 1,
       anon_sym_QMARK,
-    ACTIONS(782), 1,
+    ACTIONS(794), 1,
       anon_sym_EQ,
-    ACTIONS(305), 3,
+    ACTIONS(291), 3,
       sym_self,
       anon_sym_COLON,
       anon_sym_LPAREN_RPAREN,
-  [14377] = 6,
+  [14719] = 6,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
       sym__scope,
     ACTIONS(35), 1,
       sym_constant,
-    ACTIONS(752), 1,
+    ACTIONS(770), 1,
       sym_interface,
-    STATE(391), 1,
+    STATE(382), 1,
       sym_namespace,
-    STATE(154), 2,
+    STATE(165), 2,
       sym_class_name,
       sym_interface_name,
-  [14397] = 7,
+  [14739] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(784), 1,
+    ACTIONS(796), 1,
       anon_sym_COMMA,
-    ACTIONS(786), 1,
+    ACTIONS(798), 1,
       anon_sym_RBRACK,
-    STATE(342), 1,
+    STATE(355), 1,
       aux_sym_tuple_type_repeat1,
-  [14419] = 7,
+  [14761] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(673), 1,
-      anon_sym_LBRACE,
-    ACTIONS(677), 1,
-      anon_sym_QMARK2,
-    ACTIONS(764), 1,
-      anon_sym_LBRACK,
-    ACTIONS(788), 1,
-      anon_sym_DASH_GT,
-    STATE(311), 1,
-      sym_self_type_binding,
-    STATE(437), 1,
-      sym_block,
-  [14441] = 6,
+    ACTIONS(289), 1,
+      anon_sym_LPAREN,
+    ACTIONS(447), 1,
+      anon_sym_QMARK,
+    ACTIONS(800), 1,
+      anon_sym_EQ,
+    ACTIONS(291), 3,
+      sym_self,
+      anon_sym_COLON,
+      anon_sym_LPAREN_RPAREN,
+  [14779] = 6,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
       sym__scope,
     ACTIONS(35), 1,
       sym_constant,
-    ACTIONS(752), 1,
+    ACTIONS(770), 1,
       sym_interface,
-    STATE(391), 1,
+    STATE(382), 1,
       sym_namespace,
-    STATE(160), 2,
+    STATE(170), 2,
       sym_class_name,
       sym_interface_name,
-  [14461] = 6,
+  [14799] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(11), 1,
-      sym__scope,
-    ACTIONS(35), 1,
-      sym_constant,
-    ACTIONS(752), 1,
-      sym_interface,
-    STATE(391), 1,
-      sym_namespace,
-    STATE(163), 2,
-      sym_class_name,
-      sym_interface_name,
-  [14481] = 5,
-    ACTIONS(790), 1,
-      sym_comment,
-    ACTIONS(792), 1,
-      anon_sym_def,
-    ACTIONS(794), 1,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(474), 1,
+      anon_sym_PIPE,
+    ACTIONS(802), 1,
+      anon_sym_COMMA,
+    ACTIONS(804), 1,
+      anon_sym_RBRACK,
+    STATE(348), 1,
+      aux_sym_tuple_type_repeat1,
+  [14821] = 5,
+    ACTIONS(806), 1,
+      sym_comment,
+    ACTIONS(808), 1,
+      anon_sym_def,
+    ACTIONS(810), 1,
       aux_sym_visibility_member_token1,
-    STATE(69), 1,
+    STATE(70), 1,
       sym_attribyte_type,
-    ACTIONS(796), 3,
+    ACTIONS(812), 3,
       anon_sym_attr_reader,
       anon_sym_attr_writer,
       anon_sym_attr_accessor,
-  [14499] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(303), 1,
-      anon_sym_LPAREN,
-    ACTIONS(439), 1,
-      anon_sym_QMARK,
-    ACTIONS(798), 1,
-      anon_sym_EQ,
-    ACTIONS(305), 3,
-      sym_self,
-      anon_sym_COLON,
-      anon_sym_LPAREN_RPAREN,
-  [14517] = 6,
+  [14839] = 6,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
       sym__scope,
     ACTIONS(35), 1,
       sym_constant,
-    STATE(227), 1,
-      sym_class_name,
-    STATE(233), 1,
-      sym_use_clause,
-    STATE(368), 1,
+    ACTIONS(770), 1,
+      sym_interface,
+    STATE(382), 1,
       sym_namespace,
-  [14536] = 6,
+    STATE(166), 2,
+      sym_class_name,
+      sym_interface_name,
+  [14859] = 7,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(466), 1,
-      anon_sym_PIPE,
-    ACTIONS(800), 1,
-      anon_sym_RPAREN,
-    ACTIONS(802), 1,
-      anon_sym_COMMA,
-  [14555] = 6,
+    ACTIONS(689), 1,
+      anon_sym_LBRACE,
+    ACTIONS(693), 1,
+      anon_sym_QMARK2,
+    ACTIONS(780), 1,
+      anon_sym_LBRACK,
+    ACTIONS(814), 1,
+      anon_sym_DASH_GT,
+    STATE(309), 1,
+      sym_self_type_binding,
+    STATE(421), 1,
+      sym_block,
+  [14881] = 6,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
       sym__scope,
     ACTIONS(35), 1,
       sym_constant,
-    STATE(225), 1,
+    STATE(232), 1,
       sym_use_clause,
-    STATE(227), 1,
+    STATE(235), 1,
       sym_class_name,
-    STATE(368), 1,
+    STATE(390), 1,
       sym_namespace,
-  [14574] = 5,
+  [14900] = 3,
+    ACTIONS(806), 1,
+      sym_comment,
+    ACTIONS(818), 1,
+      aux_sym_visibility_member_token1,
+    ACTIONS(816), 4,
+      anon_sym_def,
+      anon_sym_attr_reader,
+      anon_sym_attr_writer,
+      anon_sym_attr_accessor,
+  [14913] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(772), 1,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(474), 1,
+      anon_sym_PIPE,
+    ACTIONS(820), 1,
+      anon_sym_RPAREN,
+    ACTIONS(822), 1,
+      anon_sym_COMMA,
+  [14932] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(786), 1,
       sym_constant,
     STATE(306), 1,
       sym_type_variable,
-    STATE(362), 1,
+    STATE(391), 1,
       sym_generics_variance,
-    ACTIONS(776), 2,
+    ACTIONS(790), 2,
       anon_sym_out,
       anon_sym_in,
-  [14591] = 6,
+  [14949] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(11), 1,
+      sym__scope,
+    ACTIONS(770), 1,
+      sym_interface,
+    ACTIONS(824), 1,
+      sym_constant,
+    STATE(221), 1,
+      sym_interface_name,
+    STATE(389), 1,
+      sym_namespace,
+  [14968] = 6,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(804), 1,
+    ACTIONS(826), 1,
       anon_sym_RPAREN,
-    ACTIONS(806), 1,
+    ACTIONS(828), 1,
       anon_sym_COMMA,
-  [14610] = 5,
+  [14987] = 6,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(11), 1,
+      sym__scope,
+    ACTIONS(824), 1,
+      sym_constant,
+    ACTIONS(830), 1,
+      sym_identifier,
+    STATE(338), 1,
+      sym_alias_name,
+    STATE(375), 1,
+      sym_namespace,
+  [15006] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(808), 2,
+    ACTIONS(832), 2,
       anon_sym_COMMA,
-      anon_sym_RBRACE,
-  [14627] = 5,
+      anon_sym_RBRACK,
+  [15023] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(810), 2,
+    ACTIONS(834), 2,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [14644] = 3,
-    ACTIONS(790), 1,
-      sym_comment,
-    ACTIONS(814), 1,
-      aux_sym_visibility_member_token1,
-    ACTIONS(812), 4,
-      anon_sym_def,
-      anon_sym_attr_reader,
-      anon_sym_attr_writer,
-      anon_sym_attr_accessor,
-  [14657] = 6,
+      anon_sym_RBRACE,
+  [15040] = 6,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
       sym__scope,
-    ACTIONS(752), 1,
-      sym_interface,
-    ACTIONS(816), 1,
+    ACTIONS(35), 1,
       sym_constant,
-    STATE(215), 1,
-      sym_interface_name,
-    STATE(354), 1,
+    STATE(235), 1,
+      sym_class_name,
+    STATE(239), 1,
+      sym_use_clause,
+    STATE(390), 1,
       sym_namespace,
-  [14676] = 6,
+  [15059] = 4,
+    ACTIONS(806), 1,
+      sym_comment,
+    ACTIONS(836), 1,
+      anon_sym_DQUOTE,
+    STATE(314), 1,
+      aux_sym_string_literal_repeat1,
+    ACTIONS(838), 2,
+      sym_double_quote_string_body,
+      sym_escape_sequence,
+  [15073] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(689), 1,
+      anon_sym_LBRACE,
+    ACTIONS(693), 1,
+      anon_sym_QMARK2,
+    ACTIONS(814), 1,
+      anon_sym_DASH_GT,
+    STATE(421), 1,
+      sym_block,
+  [15089] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(840), 4,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_DASH_GT,
+      anon_sym_QMARK2,
+  [15099] = 5,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
       sym__scope,
-    ACTIONS(816), 1,
+    ACTIONS(35), 1,
       sym_constant,
-    ACTIONS(818), 1,
-      sym_identifier,
-    STATE(319), 1,
-      sym_alias_name,
-    STATE(386), 1,
+    STATE(177), 1,
+      sym_class_name,
+    STATE(419), 1,
       sym_namespace,
-  [14695] = 5,
+  [15115] = 5,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(474), 1,
+      anon_sym_PIPE,
+    ACTIONS(842), 1,
+      anon_sym_RBRACE,
+  [15131] = 5,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
       sym__scope,
     ACTIONS(35), 1,
       sym_constant,
-    STATE(8), 1,
+    STATE(176), 1,
       sym_class_name,
-    STATE(438), 1,
+    STATE(419), 1,
       sym_namespace,
-  [14711] = 2,
+  [15147] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(820), 4,
+    ACTIONS(844), 4,
       anon_sym_LBRACK,
       anon_sym_LBRACE,
       anon_sym_DASH_GT,
       anon_sym_QMARK2,
-  [14721] = 4,
-    ACTIONS(790), 1,
-      sym_comment,
-    ACTIONS(822), 1,
-      anon_sym_DQUOTE,
-    STATE(296), 1,
-      aux_sym_string_literal_repeat1,
-    ACTIONS(824), 2,
-      sym_double_quote_string_body,
-      sym_escape_sequence,
-  [14735] = 4,
+  [15157] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(828), 1,
-      anon_sym_LT,
-    STATE(385), 1,
-      sym_generics_bound,
-    ACTIONS(826), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [14749] = 5,
+    ACTIONS(689), 1,
+      anon_sym_LBRACE,
+    ACTIONS(693), 1,
+      anon_sym_QMARK2,
+    ACTIONS(846), 1,
+      anon_sym_DASH_GT,
+    STATE(432), 1,
+      sym_block,
+  [15173] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(848), 1,
+      anon_sym_RPAREN,
+    ACTIONS(403), 3,
+      anon_sym_PIPE,
       anon_sym_AMP,
-    ACTIONS(353), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
-      anon_sym_PIPE,
-    ACTIONS(830), 1,
-      anon_sym_RBRACE,
-  [14765] = 4,
-    ACTIONS(790), 1,
-      sym_comment,
-    ACTIONS(822), 1,
-      anon_sym_SQUOTE,
-    STATE(295), 1,
-      aux_sym_string_literal_repeat2,
-    ACTIONS(832), 2,
-      sym_single_quote_string_body,
-      sym_escape_sequence,
-  [14779] = 4,
-    ACTIONS(790), 1,
+  [15185] = 4,
+    ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(834), 1,
-      anon_sym_DQUOTE,
-    STATE(294), 1,
-      aux_sym_string_literal_repeat1,
-    ACTIONS(836), 2,
-      sym_double_quote_string_body,
-      sym_escape_sequence,
-  [14793] = 3,
+    ACTIONS(852), 1,
+      anon_sym_LT,
+    STATE(380), 1,
+      sym_generics_bound,
+    ACTIONS(850), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [15199] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(838), 2,
+    ACTIONS(854), 2,
       sym_interface,
       sym_identifier,
-    ACTIONS(840), 2,
+    ACTIONS(856), 2,
       sym_constant,
       anon_sym_STAR,
-  [14805] = 4,
-    ACTIONS(790), 1,
-      sym_comment,
-    ACTIONS(834), 1,
-      anon_sym_SQUOTE,
-    STATE(292), 1,
-      aux_sym_string_literal_repeat2,
-    ACTIONS(842), 2,
-      sym_single_quote_string_body,
-      sym_escape_sequence,
-  [14819] = 2,
+  [15211] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(844), 4,
+    ACTIONS(858), 4,
       anon_sym_LBRACK,
       anon_sym_LBRACE,
       anon_sym_DASH_GT,
       anon_sym_QMARK2,
-  [14829] = 4,
-    ACTIONS(790), 1,
+  [15221] = 5,
+    ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(846), 1,
-      anon_sym_SQUOTE,
-    STATE(307), 1,
-      aux_sym_string_literal_repeat2,
-    ACTIONS(848), 2,
-      sym_single_quote_string_body,
-      sym_escape_sequence,
-  [14843] = 5,
+    ACTIONS(11), 1,
+      sym__scope,
+    ACTIONS(35), 1,
+      sym_constant,
+    STATE(8), 1,
+      sym_class_name,
+    STATE(419), 1,
+      sym_namespace,
+  [15237] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(673), 1,
+    ACTIONS(860), 4,
+      anon_sym_LBRACK,
       anon_sym_LBRACE,
-    ACTIONS(677), 1,
-      anon_sym_QMARK2,
-    ACTIONS(850), 1,
       anon_sym_DASH_GT,
-    STATE(435), 1,
-      sym_block,
-  [14859] = 4,
-    ACTIONS(790), 1,
+      anon_sym_QMARK2,
+  [15247] = 4,
+    ACTIONS(806), 1,
       sym_comment,
-    ACTIONS(846), 1,
+    ACTIONS(862), 1,
       anon_sym_DQUOTE,
-    STATE(301), 1,
+    STATE(319), 1,
       aux_sym_string_literal_repeat1,
-    ACTIONS(852), 2,
+    ACTIONS(864), 2,
       sym_double_quote_string_body,
       sym_escape_sequence,
-  [14873] = 4,
-    ACTIONS(790), 1,
+  [15261] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(866), 4,
+      anon_sym_LBRACK,
+      anon_sym_LBRACE,
+      anon_sym_DASH_GT,
+      anon_sym_QMARK2,
+  [15271] = 4,
+    ACTIONS(806), 1,
       sym_comment,
-    ACTIONS(854), 1,
+    ACTIONS(862), 1,
       anon_sym_SQUOTE,
-    STATE(307), 1,
+    STATE(315), 1,
       aux_sym_string_literal_repeat2,
-    ACTIONS(848), 2,
+    ACTIONS(868), 2,
       sym_single_quote_string_body,
       sym_escape_sequence,
-  [14887] = 4,
-    ACTIONS(790), 1,
-      sym_comment,
-    ACTIONS(854), 1,
-      anon_sym_DQUOTE,
-    STATE(301), 1,
-      aux_sym_string_literal_repeat1,
-    ACTIONS(852), 2,
-      sym_double_quote_string_body,
-      sym_escape_sequence,
-  [14901] = 3,
+  [15285] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(856), 2,
+    ACTIONS(870), 2,
       sym_interface,
       sym_identifier,
-    ACTIONS(858), 2,
+    ACTIONS(872), 2,
       sym_constant,
       anon_sym_STAR,
-  [14913] = 5,
+  [15297] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(11), 1,
-      sym__scope,
-    ACTIONS(35), 1,
-      sym_constant,
-    STATE(161), 1,
-      sym_class_name,
-    STATE(438), 1,
-      sym_namespace,
-  [14929] = 5,
+    ACTIONS(852), 1,
+      anon_sym_LT,
+    STATE(369), 1,
+      sym_generics_bound,
+    ACTIONS(874), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [15311] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(11), 1,
-      sym__scope,
-    ACTIONS(35), 1,
-      sym_constant,
-    STATE(9), 1,
-      sym_class_name,
-    STATE(438), 1,
-      sym_namespace,
-  [14945] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(11), 1,
-      sym__scope,
-    ACTIONS(35), 1,
-      sym_constant,
-    STATE(438), 1,
-      sym_namespace,
-    STATE(467), 1,
-      sym_class_name,
-  [14961] = 4,
-    ACTIONS(790), 1,
-      sym_comment,
-    ACTIONS(860), 1,
-      anon_sym_DQUOTE,
-    STATE(301), 1,
-      aux_sym_string_literal_repeat1,
-    ACTIONS(862), 2,
-      sym_double_quote_string_body,
-      sym_escape_sequence,
-  [14975] = 3,
+    ACTIONS(852), 1,
+      anon_sym_LT,
+    STATE(388), 1,
+      sym_generics_bound,
+    ACTIONS(876), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [15325] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(865), 1,
-      anon_sym_RPAREN,
-    ACTIONS(383), 3,
-      anon_sym_PIPE,
+    ACTIONS(355), 1,
       anon_sym_AMP,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-  [14987] = 3,
+    ACTIONS(474), 1,
+      anon_sym_PIPE,
+    ACTIONS(878), 1,
+      anon_sym_RBRACE,
+  [15341] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(867), 2,
+    ACTIONS(689), 1,
+      anon_sym_LBRACE,
+    ACTIONS(693), 1,
+      anon_sym_QMARK2,
+    ACTIONS(880), 1,
+      anon_sym_DASH_GT,
+    STATE(450), 1,
+      sym_block,
+  [15357] = 4,
+    ACTIONS(806), 1,
+      sym_comment,
+    ACTIONS(836), 1,
+      anon_sym_SQUOTE,
+    STATE(312), 1,
+      aux_sym_string_literal_repeat2,
+    ACTIONS(882), 2,
+      sym_single_quote_string_body,
+      sym_escape_sequence,
+  [15371] = 3,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(884), 2,
       sym_interface,
       sym_identifier,
-    ACTIONS(869), 2,
+    ACTIONS(886), 2,
       sym_constant,
       anon_sym_STAR,
-  [14999] = 5,
-    ACTIONS(3), 1,
+  [15383] = 4,
+    ACTIONS(806), 1,
       sym_comment,
-    ACTIONS(11), 1,
-      sym__scope,
-    ACTIONS(35), 1,
-      sym_constant,
-    STATE(157), 1,
-      sym_class_name,
-    STATE(438), 1,
-      sym_namespace,
-  [15015] = 4,
-    ACTIONS(3), 1,
+    ACTIONS(888), 1,
+      anon_sym_SQUOTE,
+    STATE(320), 1,
+      aux_sym_string_literal_repeat2,
+    ACTIONS(890), 2,
+      sym_single_quote_string_body,
+      sym_escape_sequence,
+  [15397] = 4,
+    ACTIONS(806), 1,
       sym_comment,
-    ACTIONS(828), 1,
-      anon_sym_LT,
-    STATE(361), 1,
-      sym_generics_bound,
-    ACTIONS(871), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [15029] = 4,
-    ACTIONS(3), 1,
+    ACTIONS(892), 1,
+      anon_sym_DQUOTE,
+    STATE(313), 1,
+      aux_sym_string_literal_repeat1,
+    ACTIONS(894), 2,
+      sym_double_quote_string_body,
+      sym_escape_sequence,
+  [15411] = 4,
+    ACTIONS(806), 1,
       sym_comment,
-    ACTIONS(828), 1,
-      anon_sym_LT,
-    STATE(372), 1,
-      sym_generics_bound,
-    ACTIONS(873), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [15043] = 4,
-    ACTIONS(790), 1,
+    ACTIONS(888), 1,
+      anon_sym_DQUOTE,
+    STATE(313), 1,
+      aux_sym_string_literal_repeat1,
+    ACTIONS(897), 2,
+      sym_double_quote_string_body,
+      sym_escape_sequence,
+  [15425] = 4,
+    ACTIONS(806), 1,
       sym_comment,
-    ACTIONS(875), 1,
+    ACTIONS(899), 1,
       anon_sym_SQUOTE,
-    STATE(307), 1,
+    STATE(320), 1,
       aux_sym_string_literal_repeat2,
-    ACTIONS(877), 2,
+    ACTIONS(890), 2,
       sym_single_quote_string_body,
       sym_escape_sequence,
-  [15057] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(466), 1,
-      anon_sym_PIPE,
-    ACTIONS(880), 1,
-      anon_sym_RBRACK,
-  [15073] = 5,
+  [15439] = 5,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(11), 1,
       sym__scope,
     ACTIONS(35), 1,
       sym_constant,
-    STATE(172), 1,
+    STATE(161), 1,
       sym_class_name,
-    STATE(438), 1,
+    STATE(419), 1,
       sym_namespace,
-  [15089] = 5,
+  [15455] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
+    ACTIONS(355), 1,
       anon_sym_AMP,
-    ACTIONS(353), 1,
+    ACTIONS(357), 1,
       anon_sym_QMARK,
-    ACTIONS(466), 1,
+    ACTIONS(474), 1,
       anon_sym_PIPE,
-    ACTIONS(882), 1,
-      anon_sym_RBRACE,
-  [15105] = 5,
+    ACTIONS(901), 1,
+      anon_sym_RBRACK,
+  [15471] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(673), 1,
-      anon_sym_LBRACE,
-    ACTIONS(677), 1,
-      anon_sym_QMARK2,
-    ACTIONS(884), 1,
-      anon_sym_DASH_GT,
-    STATE(426), 1,
-      sym_block,
-  [15121] = 2,
-    ACTIONS(3), 1,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(474), 1,
+      anon_sym_PIPE,
+    ACTIONS(903), 1,
+      anon_sym_RBRACE,
+  [15487] = 4,
+    ACTIONS(806), 1,
       sym_comment,
-    ACTIONS(886), 4,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_DASH_GT,
-      anon_sym_QMARK2,
-  [15131] = 2,
-    ACTIONS(3), 1,
+    ACTIONS(899), 1,
+      anon_sym_DQUOTE,
+    STATE(313), 1,
+      aux_sym_string_literal_repeat1,
+    ACTIONS(897), 2,
+      sym_double_quote_string_body,
+      sym_escape_sequence,
+  [15501] = 4,
+    ACTIONS(806), 1,
       sym_comment,
-    ACTIONS(888), 4,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_DASH_GT,
-      anon_sym_QMARK2,
-  [15141] = 2,
+    ACTIONS(905), 1,
+      anon_sym_SQUOTE,
+    STATE(320), 1,
+      aux_sym_string_literal_repeat2,
+    ACTIONS(907), 2,
+      sym_single_quote_string_body,
+      sym_escape_sequence,
+  [15515] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(890), 4,
-      anon_sym_LBRACK,
-      anon_sym_LBRACE,
-      anon_sym_DASH_GT,
-      anon_sym_QMARK2,
-  [15151] = 2,
+    ACTIONS(11), 1,
+      sym__scope,
+    ACTIONS(35), 1,
+      sym_constant,
+    STATE(9), 1,
+      sym_class_name,
+    STATE(419), 1,
+      sym_namespace,
+  [15531] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(892), 4,
+    ACTIONS(910), 4,
       anon_sym_LBRACK,
       anon_sym_LBRACE,
       anon_sym_DASH_GT,
       anon_sym_QMARK2,
-  [15161] = 5,
+  [15541] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(673), 1,
-      anon_sym_LBRACE,
-    ACTIONS(677), 1,
-      anon_sym_QMARK2,
-    ACTIONS(788), 1,
-      anon_sym_DASH_GT,
-    STATE(437), 1,
-      sym_block,
-  [15177] = 5,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(466), 1,
-      anon_sym_PIPE,
-    ACTIONS(894), 1,
-      anon_sym_RBRACE,
-  [15193] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(896), 4,
+    ACTIONS(912), 4,
       anon_sym_LBRACK,
       anon_sym_LBRACE,
       anon_sym_DASH_GT,
       anon_sym_QMARK2,
-  [15203] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(79), 1,
-      anon_sym_LBRACK,
-    ACTIONS(898), 1,
-      anon_sym_EQ2,
-    STATE(471), 1,
-      sym_module_type_parameters,
-  [15216] = 4,
+  [15551] = 5,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(900), 1,
-      sym_identifier,
-    ACTIONS(902), 1,
-      anon_sym_RBRACE,
-    STATE(390), 1,
-      sym__record_type_single,
-  [15229] = 4,
+    ACTIONS(11), 1,
+      sym__scope,
+    ACTIONS(35), 1,
+      sym_constant,
+    STATE(419), 1,
+      sym_namespace,
+    STATE(425), 1,
+      sym_class_name,
+  [15567] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(904), 1,
+    ACTIONS(784), 3,
       anon_sym_RPAREN,
-    ACTIONS(906), 1,
       anon_sym_COMMA,
-    STATE(340), 1,
-      aux_sym_optional_positionals_repeat1,
-  [15242] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(909), 1,
-      anon_sym_COMMA,
-    ACTIONS(911), 1,
-      anon_sym_RBRACK,
-    STATE(351), 1,
-      aux_sym_module_type_parameters_repeat1,
-  [15255] = 4,
+      anon_sym_COLON,
+  [15576] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(913), 1,
+    ACTIONS(914), 1,
       anon_sym_LPAREN,
-    ACTIONS(915), 1,
+    ACTIONS(916), 1,
       anon_sym_COLON,
-    ACTIONS(917), 1,
+    ACTIONS(918), 1,
       anon_sym_LPAREN_RPAREN,
-  [15268] = 2,
+  [15589] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(768), 3,
+    ACTIONS(920), 1,
       anon_sym_RPAREN,
+    ACTIONS(922), 1,
       anon_sym_COMMA,
-      anon_sym_COLON,
-  [15277] = 4,
+    STATE(351), 1,
+      aux_sym_optional_positionals_repeat1,
+  [15602] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(919), 1,
+    ACTIONS(925), 1,
       anon_sym_COMMA,
-    ACTIONS(922), 1,
+    ACTIONS(927), 1,
       anon_sym_RBRACK,
-    STATE(325), 1,
+    STATE(356), 1,
       aux_sym_method_type_parameters_repeat1,
-  [15290] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(924), 3,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-      anon_sym_LT,
-  [15299] = 4,
+  [15615] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(926), 1,
-      anon_sym_RPAREN,
-    ACTIONS(928), 1,
+    ACTIONS(929), 1,
       anon_sym_COMMA,
-    STATE(337), 1,
-      aux_sym_required_positionals_repeat1,
-  [15312] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
     ACTIONS(931), 1,
-      anon_sym_COMMA,
-    ACTIONS(934), 1,
       anon_sym_RBRACE,
-    STATE(328), 1,
+    STATE(349), 1,
       aux_sym_record_type_repeat1,
-  [15325] = 4,
+  [15628] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(936), 1,
-      anon_sym_COMMA,
-    ACTIONS(938), 1,
+    ACTIONS(933), 1,
+      sym_identifier,
+    ACTIONS(935), 1,
       anon_sym_RBRACE,
-    STATE(328), 1,
-      aux_sym_record_type_repeat1,
-  [15338] = 4,
+    STATE(394), 1,
+      sym__record_type_single,
+  [15641] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(810), 1,
-      anon_sym_RBRACK,
-    ACTIONS(940), 1,
+    ACTIONS(937), 1,
+      anon_sym_RPAREN,
+    ACTIONS(939), 1,
       anon_sym_COMMA,
-    STATE(330), 1,
-      aux_sym_tuple_type_repeat1,
-  [15351] = 4,
+    STATE(331), 1,
+      aux_sym_optional_positionals_repeat1,
+  [15654] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(900), 1,
-      sym_identifier,
-    ACTIONS(943), 1,
-      anon_sym_RBRACE,
-    STATE(390), 1,
-      sym__record_type_single,
-  [15364] = 4,
+    ACTIONS(942), 1,
+      anon_sym_RPAREN,
+    ACTIONS(944), 1,
+      anon_sym_COMMA,
+    STATE(333), 1,
+      aux_sym_required_positionals_repeat1,
+  [15667] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(945), 1,
-      anon_sym_LPAREN,
     ACTIONS(947), 1,
-      anon_sym_COLON,
+      anon_sym_RPAREN,
     ACTIONS(949), 1,
-      anon_sym_LPAREN_RPAREN,
-  [15377] = 4,
+      anon_sym_COMMA,
+    STATE(350), 1,
+      aux_sym_required_positionals_repeat1,
+  [15680] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(909), 1,
+    ACTIONS(952), 1,
       anon_sym_COMMA,
-    ACTIONS(951), 1,
-      anon_sym_RBRACK,
-    STATE(322), 1,
-      aux_sym_module_type_parameters_repeat1,
-  [15390] = 4,
+    ACTIONS(955), 1,
+      anon_sym_RBRACE,
+    STATE(334), 1,
+      aux_sym_record_type_repeat1,
+  [15693] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(953), 1,
-      anon_sym_RPAREN,
-    ACTIONS(955), 1,
-      anon_sym_COMMA,
-    STATE(327), 1,
-      aux_sym_required_positionals_repeat1,
-  [15403] = 4,
+    ACTIONS(957), 1,
+      sym_identifier,
+    ACTIONS(959), 1,
+      sym_constant,
+    ACTIONS(961), 1,
+      sym_interface,
+  [15706] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(958), 1,
+    ACTIONS(963), 1,
       anon_sym_RPAREN,
-    ACTIONS(960), 1,
+    ACTIONS(965), 1,
       anon_sym_COMMA,
     STATE(350), 1,
       aux_sym_required_positionals_repeat1,
-  [15416] = 4,
+  [15719] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(764), 1,
-      anon_sym_LBRACK,
-    ACTIONS(963), 1,
-      anon_sym_DASH_GT,
-    STATE(432), 1,
-      sym_self_type_binding,
-  [15429] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(965), 1,
-      anon_sym_RPAREN,
-    ACTIONS(967), 1,
+    ACTIONS(832), 1,
+      anon_sym_RBRACK,
+    ACTIONS(968), 1,
       anon_sym_COMMA,
     STATE(337), 1,
-      aux_sym_required_positionals_repeat1,
-  [15442] = 4,
+      aux_sym_tuple_type_repeat1,
+  [15732] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(764), 1,
+    ACTIONS(79), 1,
       anon_sym_LBRACK,
-    ACTIONS(970), 1,
-      anon_sym_DASH_GT,
-    STATE(417), 1,
-      sym_self_type_binding,
-  [15455] = 4,
+    ACTIONS(971), 1,
+      anon_sym_EQ2,
+    STATE(443), 1,
+      sym_module_type_parameters,
+  [15745] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(351), 1,
-      anon_sym_AMP,
-    ACTIONS(353), 1,
-      anon_sym_QMARK,
-    ACTIONS(466), 1,
-      anon_sym_PIPE,
-  [15468] = 4,
+    ACTIONS(973), 1,
+      anon_sym_LPAREN,
+    ACTIONS(975), 1,
+      anon_sym_COLON,
+    ACTIONS(977), 1,
+      anon_sym_LPAREN_RPAREN,
+  [15758] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(972), 1,
-      anon_sym_RPAREN,
-    ACTIONS(974), 1,
+    ACTIONS(979), 1,
       anon_sym_COMMA,
-    STATE(343), 1,
-      aux_sym_optional_positionals_repeat1,
-  [15481] = 4,
+    ACTIONS(981), 1,
+      anon_sym_RBRACK,
+    STATE(358), 1,
+      aux_sym_module_type_parameters_repeat1,
+  [15771] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(977), 1,
+    ACTIONS(983), 1,
       anon_sym_LPAREN,
-    ACTIONS(979), 1,
+    ACTIONS(985), 1,
       anon_sym_COLON,
-    ACTIONS(981), 1,
+    ACTIONS(987), 1,
       anon_sym_LPAREN_RPAREN,
-  [15494] = 4,
+  [15784] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(784), 1,
-      anon_sym_COMMA,
-    ACTIONS(983), 1,
-      anon_sym_RBRACK,
-    STATE(330), 1,
-      aux_sym_tuple_type_repeat1,
-  [15507] = 4,
+    ACTIONS(780), 1,
+      anon_sym_LBRACK,
+    ACTIONS(989), 1,
+      anon_sym_DASH_GT,
+    STATE(414), 1,
+      sym_self_type_binding,
+  [15797] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(985), 1,
-      anon_sym_RPAREN,
-    ACTIONS(987), 1,
-      anon_sym_COMMA,
-    STATE(343), 1,
-      aux_sym_optional_positionals_repeat1,
-  [15520] = 4,
+    ACTIONS(991), 1,
+      anon_sym_LPAREN,
+    ACTIONS(993), 1,
+      anon_sym_COLON,
+    ACTIONS(995), 1,
+      anon_sym_LPAREN_RPAREN,
+  [15810] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(197), 1,
-      anon_sym_RBRACK,
-    ACTIONS(990), 1,
+    ACTIONS(997), 3,
       anon_sym_COMMA,
-    STATE(330), 1,
-      aux_sym_tuple_type_repeat1,
-  [15533] = 4,
+      anon_sym_RBRACK,
+      anon_sym_LT,
+  [15819] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(780), 1,
+      anon_sym_LBRACK,
+    ACTIONS(999), 1,
+      anon_sym_DASH_GT,
+    STATE(461), 1,
+      sym_self_type_binding,
+  [15832] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(992), 1,
-      sym_identifier,
-    ACTIONS(994), 1,
-      sym_constant,
-    ACTIONS(996), 1,
-      sym_interface,
-  [15546] = 4,
+    ACTIONS(1001), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1003), 1,
+      anon_sym_COMMA,
+    STATE(336), 1,
+      aux_sym_required_positionals_repeat1,
+  [15845] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(998), 1,
-      anon_sym_COMMA,
-    ACTIONS(1000), 1,
-      anon_sym_RBRACK,
-    STATE(349), 1,
-      aux_sym_method_type_parameters_repeat1,
-  [15559] = 4,
+    ACTIONS(355), 1,
+      anon_sym_AMP,
+    ACTIONS(357), 1,
+      anon_sym_QMARK,
+    ACTIONS(474), 1,
+      anon_sym_PIPE,
+  [15858] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1002), 1,
-      anon_sym_LPAREN,
-    ACTIONS(1004), 1,
-      anon_sym_COLON,
+    ACTIONS(802), 1,
+      anon_sym_COMMA,
     ACTIONS(1006), 1,
-      anon_sym_LPAREN_RPAREN,
-  [15572] = 4,
+      anon_sym_RBRACK,
+    STATE(337), 1,
+      aux_sym_tuple_type_repeat1,
+  [15871] = 4,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1008), 1,
       anon_sym_COMMA,
     ACTIONS(1010), 1,
       anon_sym_RBRACE,
-    STATE(329), 1,
+    STATE(334), 1,
       aux_sym_record_type_repeat1,
-  [15585] = 4,
+  [15884] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(998), 1,
-      anon_sym_COMMA,
     ACTIONS(1012), 1,
-      anon_sym_RBRACK,
-    STATE(325), 1,
-      aux_sym_method_type_parameters_repeat1,
-  [15598] = 4,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1014), 1,
       anon_sym_RPAREN,
-    ACTIONS(1016), 1,
+    ACTIONS(1014), 1,
       anon_sym_COMMA,
-    STATE(337), 1,
+    STATE(350), 1,
       aux_sym_required_positionals_repeat1,
-  [15611] = 4,
+  [15897] = 4,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(1017), 1,
+      anon_sym_RPAREN,
     ACTIONS(1019), 1,
       anon_sym_COMMA,
+    STATE(331), 1,
+      aux_sym_optional_positionals_repeat1,
+  [15910] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(925), 1,
+      anon_sym_COMMA,
     ACTIONS(1022), 1,
       anon_sym_RBRACK,
-    STATE(351), 1,
-      aux_sym_module_type_parameters_repeat1,
-  [15624] = 2,
+    STATE(328), 1,
+      aux_sym_method_type_parameters_repeat1,
+  [15923] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1024), 3,
       anon_sym_LBRACE,
       anon_sym_DASH_GT,
       anon_sym_QMARK2,
-  [15633] = 4,
+  [15932] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(900), 1,
+    ACTIONS(933), 1,
       sym_identifier,
     ACTIONS(1026), 1,
       anon_sym_RBRACE,
-    STATE(348), 1,
+    STATE(394), 1,
       sym__record_type_single,
-  [15646] = 3,
+  [15945] = 4,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(203), 1,
+      anon_sym_RBRACK,
     ACTIONS(1028), 1,
-      sym_constant,
+      anon_sym_COMMA,
+    STATE(337), 1,
+      aux_sym_tuple_type_repeat1,
+  [15958] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
     ACTIONS(1030), 1,
-      sym_interface,
-  [15656] = 3,
+      anon_sym_COMMA,
+    ACTIONS(1033), 1,
+      anon_sym_RBRACK,
+    STATE(356), 1,
+      aux_sym_method_type_parameters_repeat1,
+  [15971] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1032), 1,
-      sym_self,
-    STATE(213), 1,
-      sym_singleton_method_name,
-  [15666] = 3,
+    ACTIONS(979), 1,
+      anon_sym_COMMA,
+    ACTIONS(1035), 1,
+      anon_sym_RBRACK,
+    STATE(340), 1,
+      aux_sym_module_type_parameters_repeat1,
+  [15984] = 4,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1037), 1,
+      anon_sym_COMMA,
+    ACTIONS(1040), 1,
+      anon_sym_RBRACK,
+    STATE(358), 1,
+      aux_sym_module_type_parameters_repeat1,
+  [15997] = 4,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(900), 1,
+    ACTIONS(933), 1,
       sym_identifier,
-    STATE(390), 1,
+    ACTIONS(1042), 1,
+      anon_sym_RBRACE,
+    STATE(329), 1,
       sym__record_type_single,
-  [15676] = 3,
+  [16010] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(207), 1,
-      sym__scope,
-    ACTIONS(1034), 1,
-      anon_sym_COLON,
-  [15686] = 2,
+    ACTIONS(786), 1,
+      sym_constant,
+    STATE(306), 1,
+      sym_type_variable,
+  [16020] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(965), 2,
+    ACTIONS(1044), 1,
       anon_sym_RPAREN,
+    ACTIONS(1046), 1,
       anon_sym_COMMA,
-  [15694] = 3,
+  [16030] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1036), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1038), 1,
+    ACTIONS(1048), 2,
       anon_sym_COMMA,
-  [15704] = 3,
+      anon_sym_RBRACK,
+  [16038] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1040), 1,
+    ACTIONS(1050), 1,
       sym_self,
-    STATE(213), 1,
+    STATE(214), 1,
       sym_singleton_method_name,
-  [15714] = 2,
+  [16048] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(873), 2,
+    ACTIONS(1040), 2,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-  [15722] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(772), 1,
-      sym_constant,
-    STATE(285), 1,
-      sym_type_variable,
-  [15732] = 3,
+  [16056] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1042), 1,
+    ACTIONS(1052), 2,
       anon_sym_RPAREN,
-    ACTIONS(1044), 1,
       anon_sym_COMMA,
-  [15742] = 3,
+  [16064] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1042), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1046), 1,
+    ACTIONS(1054), 2,
       anon_sym_COMMA,
-  [15752] = 3,
+      anon_sym_RBRACK,
+  [16072] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1042), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1048), 1,
-      anon_sym_COMMA,
-  [15762] = 3,
+    ACTIONS(786), 1,
+      sym_constant,
+    STATE(352), 1,
+      sym_type_variable,
+  [16082] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1050), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1052), 1,
+    ACTIONS(1033), 2,
       anon_sym_COMMA,
-  [15772] = 3,
+      anon_sym_RBRACK,
+  [16090] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(669), 1,
-      anon_sym_LPAREN,
-    STATE(336), 1,
-      sym_parameters,
-  [15782] = 3,
+    ACTIONS(850), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACK,
+  [16098] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(994), 1,
-      sym_constant,
-    ACTIONS(1054), 1,
-      anon_sym_STAR,
-  [15792] = 3,
+    ACTIONS(1056), 2,
+      anon_sym_DOT,
+      anon_sym_QMARK_DOT,
+  [16106] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1056), 1,
-      anon_sym_RPAREN,
+    ACTIONS(215), 1,
+      sym__scope,
     ACTIONS(1058), 1,
-      anon_sym_COMMA,
-  [15802] = 3,
+      anon_sym_COLON,
+  [16116] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1056), 1,
-      anon_sym_RPAREN,
-    ACTIONS(1060), 1,
-      anon_sym_COMMA,
-  [15812] = 3,
+    ACTIONS(933), 1,
+      sym_identifier,
+    STATE(394), 1,
+      sym__record_type_single,
+  [16126] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1056), 1,
+    ACTIONS(1060), 1,
       anon_sym_RPAREN,
     ACTIONS(1062), 1,
       anon_sym_COMMA,
-  [15822] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(826), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [15830] = 3,
+  [16136] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1036), 1,
+    ACTIONS(1060), 1,
       anon_sym_RPAREN,
     ACTIONS(1064), 1,
       anon_sym_COMMA,
-  [15840] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1066), 2,
-      anon_sym_RPAREN,
-      anon_sym_COMMA,
-  [15848] = 3,
+  [16146] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(746), 1,
+    ACTIONS(1066), 1,
       sym_identifier,
-    STATE(398), 1,
-      sym_var_name,
-  [15858] = 2,
+    ACTIONS(1068), 1,
+      sym_constant,
+  [16156] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1068), 2,
+    ACTIONS(1012), 2,
+      anon_sym_RPAREN,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [15866] = 3,
+  [16164] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1036), 1,
+    ACTIONS(1060), 1,
       anon_sym_RPAREN,
     ACTIONS(1070), 1,
       anon_sym_COMMA,
-  [15876] = 2,
+  [16174] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1072), 2,
+    ACTIONS(1044), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1072), 1,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [15884] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(772), 1,
-      sym_constant,
-    STATE(306), 1,
-      sym_type_variable,
-  [15894] = 2,
+  [16184] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1074), 2,
-      anon_sym_DOT,
-      anon_sym_QMARK_DOT,
-  [15902] = 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [16192] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1076), 2,
-      anon_sym_RPAREN,
       anon_sym_COMMA,
-  [15910] = 3,
+      anon_sym_RBRACK,
+  [16200] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(213), 1,
-      sym__scope,
-    ACTIONS(1078), 1,
-      anon_sym_COLON,
-  [15920] = 3,
+    ACTIONS(766), 1,
+      sym_identifier,
+    STATE(407), 1,
+      sym_var_name,
+  [16210] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(772), 1,
+    ACTIONS(959), 1,
       sym_constant,
-    STATE(346), 1,
-      sym_type_variable,
-  [15930] = 2,
+    ACTIONS(1078), 1,
+      sym_interface,
+  [16220] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1022), 2,
+    ACTIONS(1044), 1,
+      anon_sym_RPAREN,
+    ACTIONS(1080), 1,
       anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [15938] = 2,
+  [16230] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1080), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACK,
-  [15946] = 3,
+    ACTIONS(685), 1,
+      anon_sym_LPAREN,
+    STATE(342), 1,
+      sym_parameters,
+  [16240] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1028), 1,
-      sym_constant,
+    ACTIONS(221), 1,
+      sym__scope,
     ACTIONS(1082), 1,
-      sym_identifier,
-  [15956] = 3,
+      anon_sym_COLON,
+  [16250] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(772), 1,
-      sym_constant,
-    STATE(389), 1,
-      sym_type_variable,
-  [15966] = 2,
+    ACTIONS(1084), 1,
+      sym_self,
+    STATE(214), 1,
+      sym_singleton_method_name,
+  [16260] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1084), 2,
+    ACTIONS(1086), 1,
       anon_sym_RPAREN,
+    ACTIONS(1088), 1,
       anon_sym_COMMA,
-  [15974] = 2,
+  [16270] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(922), 2,
+    ACTIONS(874), 2,
       anon_sym_COMMA,
       anon_sym_RBRACK,
-  [15982] = 2,
+  [16278] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1086), 2,
-      anon_sym_COMMA,
-      anon_sym_RBRACE,
-  [15990] = 3,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(994), 1,
+    ACTIONS(1068), 1,
       sym_constant,
-    ACTIONS(1030), 1,
+    ACTIONS(1078), 1,
       sym_interface,
-  [16000] = 3,
+  [16288] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(669), 1,
-      anon_sym_LPAREN,
-    STATE(338), 1,
-      sym_parameters,
-  [16010] = 2,
+    ACTIONS(959), 1,
+      sym_constant,
+    ACTIONS(1090), 1,
+      anon_sym_STAR,
+  [16298] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1088), 1,
-      sym_ivar_name,
-  [16017] = 2,
+    ACTIONS(786), 1,
+      sym_constant,
+    STATE(297), 1,
+      sym_type_variable,
+  [16308] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(788), 1,
-      anon_sym_DASH_GT,
-  [16024] = 2,
+    ACTIONS(685), 1,
+      anon_sym_LPAREN,
+    STATE(345), 1,
+      sym_parameters,
+  [16318] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1090), 1,
+    ACTIONS(786), 1,
       sym_constant,
-  [16031] = 2,
+    STATE(368), 1,
+      sym_type_variable,
+  [16328] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1092), 1,
-      anon_sym_RPAREN,
-  [16038] = 2,
+    ACTIONS(1092), 2,
+      anon_sym_COMMA,
+      anon_sym_RBRACE,
+  [16336] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1094), 1,
-      anon_sym_COLON,
-  [16045] = 2,
+    ACTIONS(1094), 2,
+      anon_sym_RPAREN,
+      anon_sym_COMMA,
+  [16344] = 3,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1096), 1,
-      anon_sym_COLON,
-  [16052] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
+      anon_sym_RPAREN,
     ACTIONS(1098), 1,
-      anon_sym_COLON,
-  [16059] = 2,
+      anon_sym_COMMA,
+  [16354] = 3,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(1096), 1,
+      anon_sym_RPAREN,
     ACTIONS(1100), 1,
-      anon_sym_DOT,
-  [16066] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1102), 1,
-      anon_sym_DOT,
-  [16073] = 2,
+      anon_sym_COMMA,
+  [16364] = 3,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(981), 1,
+    ACTIONS(1096), 1,
       anon_sym_RPAREN,
-  [16080] = 2,
+    ACTIONS(1102), 1,
+      anon_sym_COMMA,
+  [16374] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1104), 1,
       sym_ivar_name,
-  [16087] = 2,
+  [16381] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1106), 1,
-      anon_sym_DOT,
-  [16094] = 2,
+      anon_sym_COLON,
+  [16388] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1096), 1,
+      anon_sym_RPAREN,
+  [16395] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1108), 1,
+      anon_sym_RBRACK,
+  [16402] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1108), 1,
-      anon_sym_COLON,
-  [16101] = 2,
+      anon_sym_RPAREN,
+  [16409] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(979), 1,
+    ACTIONS(1110), 1,
       anon_sym_COLON,
-  [16108] = 2,
+  [16416] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1110), 1,
-      anon_sym_RPAREN,
-  [16115] = 2,
+    ACTIONS(1108), 1,
+      anon_sym_RBRACE,
+  [16423] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1112), 1,
-      sym_ivar_name,
-  [16122] = 2,
+      anon_sym_RPAREN,
+  [16430] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1114), 1,
       anon_sym_COLON,
-  [16129] = 2,
+  [16437] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(850), 1,
-      anon_sym_DASH_GT,
-  [16136] = 2,
+    ACTIONS(1108), 1,
+      anon_sym_GT,
+  [16444] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1116), 1,
-      sym_self,
-  [16143] = 2,
+      anon_sym_RPAREN,
+  [16451] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1116), 1,
+      anon_sym_RPAREN,
+  [16458] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(221), 1,
+      sym__scope,
+  [16465] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1118), 1,
-      anon_sym_COLON,
-  [16150] = 2,
+      sym_ivar_name,
+  [16472] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1120), 1,
-      anon_sym_LBRACE,
-  [16157] = 2,
+      anon_sym_COLON,
+  [16479] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1122), 1,
       anon_sym_DASH_GT,
-  [16164] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(207), 1,
-      sym__scope,
-  [16171] = 2,
+  [16486] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1124), 1,
       anon_sym_COLON,
-  [16178] = 2,
+  [16493] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(963), 1,
-      anon_sym_DASH_GT,
-  [16185] = 2,
+    ACTIONS(1044), 1,
+      anon_sym_RPAREN,
+  [16500] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1126), 1,
-      anon_sym_GT,
-  [16192] = 2,
+      anon_sym_DASH_GT,
+  [16507] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1126), 1,
-      anon_sym_PIPE,
-  [16199] = 2,
+    ACTIONS(1128), 1,
+      anon_sym_QMARK2,
+  [16514] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1128), 1,
-      anon_sym_RPAREN,
-  [16206] = 2,
+    ACTIONS(959), 1,
+      sym_constant,
+  [16521] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1126), 1,
-      anon_sym_RBRACK,
-  [16213] = 2,
+    ACTIONS(1130), 1,
+      sym_constant,
+  [16528] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1126), 1,
-      anon_sym_RPAREN,
-  [16220] = 2,
+    ACTIONS(880), 1,
+      anon_sym_DASH_GT,
+  [16535] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1130), 1,
+    ACTIONS(916), 1,
       anon_sym_COLON,
-  [16227] = 2,
+  [16542] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1132), 1,
-      sym_constant,
-  [16234] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1036), 1,
-      anon_sym_RPAREN,
-  [16241] = 2,
+      sym_ivar_name,
+  [16549] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1134), 1,
-      anon_sym_DASH_GT,
-  [16248] = 2,
+      anon_sym_DOT,
+  [16556] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1136), 1,
-      sym_ivar_name,
-  [16255] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1056), 1,
       anon_sym_RPAREN,
-  [16262] = 2,
+  [16563] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1138), 1,
-      anon_sym_QMARK2,
-  [16269] = 2,
+      anon_sym_RPAREN,
+  [16570] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1140), 1,
+      anon_sym_COLON,
+  [16577] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(918), 1,
       anon_sym_RPAREN,
-  [16276] = 2,
+  [16584] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1142), 1,
-      anon_sym_DASH_GT,
-  [16283] = 2,
+      anon_sym_COLON,
+  [16591] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1144), 1,
-      anon_sym_DASH_GT,
-  [16290] = 2,
+      anon_sym_COLON,
+  [16598] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1146), 1,
       anon_sym_COLON,
-  [16297] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1126), 1,
-      anon_sym_RBRACE,
-  [16304] = 2,
+  [16605] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1148), 1,
       anon_sym_DASH_GT,
-  [16311] = 2,
+  [16612] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1150), 1,
-      anon_sym_RPAREN,
-  [16318] = 2,
+      anon_sym_LPAREN,
+  [16619] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(884), 1,
-      anon_sym_DASH_GT,
-  [16325] = 2,
+    ACTIONS(1060), 1,
+      anon_sym_RPAREN,
+  [16626] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(994), 1,
-      sym_constant,
-  [16332] = 2,
+    ACTIONS(846), 1,
+      anon_sym_DASH_GT,
+  [16633] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1152), 1,
-      anon_sym_COLON,
-  [16339] = 2,
+      anon_sym_RPAREN,
+  [16640] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1154), 1,
-      anon_sym_COLON,
-  [16346] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1156), 1,
       anon_sym_DASH_GT,
-  [16353] = 2,
+  [16647] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1158), 1,
-      anon_sym_COLON,
-  [16360] = 2,
+    ACTIONS(1108), 1,
+      anon_sym_PIPE,
+  [16654] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1160), 1,
+    ACTIONS(1156), 1,
       anon_sym_COLON,
-  [16367] = 2,
+  [16661] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(915), 1,
-      anon_sym_COLON,
-  [16374] = 2,
+    ACTIONS(1158), 1,
+      sym_constant,
+  [16668] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1050), 1,
-      anon_sym_RPAREN,
-  [16381] = 2,
+    ACTIONS(1160), 1,
+      ts_builtin_sym_end,
+  [16675] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1162), 1,
-      anon_sym_COLON,
-  [16388] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1164), 1,
       anon_sym_RPAREN,
-  [16395] = 2,
+  [16682] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1164), 1,
-      anon_sym_RPAREN,
-  [16402] = 2,
-    ACTIONS(3), 1,
-      sym_comment,
-    ACTIONS(1042), 1,
-      anon_sym_RPAREN,
-  [16409] = 2,
+      anon_sym_EQ2,
+  [16689] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1166), 1,
-      anon_sym_RPAREN,
-  [16416] = 2,
+      anon_sym_COLON,
+  [16696] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1168), 1,
-      sym_ivar_name,
-  [16423] = 2,
+      anon_sym_DOT,
+  [16703] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(814), 1,
-      anon_sym_def,
-  [16430] = 2,
+    ACTIONS(993), 1,
+      anon_sym_COLON,
+  [16710] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1170), 1,
-      sym_constant,
-  [16437] = 2,
+      anon_sym_DASH_GT,
+  [16717] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(215), 1,
+      sym__scope,
+  [16724] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1172), 1,
-      ts_builtin_sym_end,
-  [16444] = 2,
+      sym_ivar_name,
+  [16731] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1174), 1,
-      anon_sym_COLON,
-  [16451] = 2,
+      anon_sym_DASH_GT,
+  [16738] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1176), 1,
-      anon_sym_def,
-  [16458] = 2,
+    ACTIONS(1086), 1,
+      anon_sym_RPAREN,
+  [16745] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(213), 1,
-      sym__scope,
-  [16465] = 2,
+    ACTIONS(1176), 1,
+      anon_sym_COLON,
+  [16752] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(917), 1,
-      anon_sym_RPAREN,
-  [16472] = 2,
-    ACTIONS(790), 1,
-      sym_comment,
     ACTIONS(1178), 1,
-      sym__annotation_text_without_angle_bracket,
-  [16479] = 2,
-    ACTIONS(790), 1,
+      anon_sym_DOT,
+  [16759] = 2,
+    ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1180), 1,
-      sym__annotation_text_without_bar,
-  [16486] = 2,
-    ACTIONS(790), 1,
+      anon_sym_COLON,
+  [16766] = 2,
+    ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1182), 1,
-      sym__annotation_text_without_bracket,
-  [16493] = 2,
-    ACTIONS(790), 1,
+      anon_sym_DOT,
+  [16773] = 2,
+    ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1184), 1,
-      sym__annotation_text_without_parenthesis,
-  [16500] = 2,
-    ACTIONS(790), 1,
+      anon_sym_RPAREN,
+  [16780] = 2,
+    ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1186), 1,
-      sym__annotation_text_without_brace,
-  [16507] = 2,
+      anon_sym_DOT,
+  [16787] = 2,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(818), 1,
+      anon_sym_def,
+  [16794] = 2,
+    ACTIONS(806), 1,
+      sym_comment,
     ACTIONS(1188), 1,
-      anon_sym_LPAREN,
-  [16514] = 2,
+      sym__annotation_text_without_angle_bracket,
+  [16801] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1190), 1,
-      anon_sym_DOT,
-  [16521] = 2,
+      anon_sym_def,
+  [16808] = 2,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(989), 1,
+      anon_sym_DASH_GT,
+  [16815] = 2,
+    ACTIONS(806), 1,
+      sym_comment,
     ACTIONS(1192), 1,
-      anon_sym_DOT,
-  [16528] = 2,
-    ACTIONS(3), 1,
+      sym__annotation_text_without_bar,
+  [16822] = 2,
+    ACTIONS(806), 1,
       sym_comment,
     ACTIONS(1194), 1,
-      anon_sym_RPAREN,
-  [16535] = 2,
+      sym__annotation_text_without_bracket,
+  [16829] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1004), 1,
+    ACTIONS(975), 1,
       anon_sym_COLON,
-  [16542] = 2,
+  [16836] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(977), 1,
+      anon_sym_RPAREN,
+  [16843] = 2,
     ACTIONS(3), 1,
       sym_comment,
     ACTIONS(1196), 1,
-      anon_sym_DOT,
-  [16549] = 2,
+      anon_sym_COLON,
+  [16850] = 2,
     ACTIONS(3), 1,
       sym_comment,
+    ACTIONS(814), 1,
+      anon_sym_DASH_GT,
+  [16857] = 2,
+    ACTIONS(806), 1,
+      sym_comment,
     ACTIONS(1198), 1,
+      sym__annotation_text_without_parenthesis,
+  [16864] = 2,
+    ACTIONS(806), 1,
+      sym_comment,
+    ACTIONS(1200), 1,
+      sym__annotation_text_without_brace,
+  [16871] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1202), 1,
+      anon_sym_LBRACE,
+  [16878] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1204), 1,
+      sym_constant,
+  [16885] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1206), 1,
+      sym_self,
+  [16892] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1208), 1,
+      sym_ivar_name,
+  [16899] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1210), 1,
+      anon_sym_COLON,
+  [16906] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1212), 1,
       anon_sym_DOT,
-  [16556] = 2,
+  [16913] = 2,
     ACTIONS(3), 1,
       sym_comment,
-    ACTIONS(1200), 1,
-      anon_sym_EQ2,
+    ACTIONS(1214), 1,
+      anon_sym_DOT,
+  [16920] = 2,
+    ACTIONS(3), 1,
+      sym_comment,
+    ACTIONS(1216), 1,
+      anon_sym_RPAREN,
 };
 
 static const uint32_t ts_small_parse_table_map[] = {
@@ -17515,458 +17929,464 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(17)] = 1848,
   [SMALL_STATE(18)] = 1964,
   [SMALL_STATE(19)] = 2080,
-  [SMALL_STATE(20)] = 2196,
-  [SMALL_STATE(21)] = 2312,
+  [SMALL_STATE(20)] = 2184,
+  [SMALL_STATE(21)] = 2300,
   [SMALL_STATE(22)] = 2416,
   [SMALL_STATE(23)] = 2532,
   [SMALL_STATE(24)] = 2648,
-  [SMALL_STATE(25)] = 2749,
-  [SMALL_STATE(26)] = 2850,
-  [SMALL_STATE(27)] = 2951,
-  [SMALL_STATE(28)] = 3052,
-  [SMALL_STATE(29)] = 3153,
-  [SMALL_STATE(30)] = 3254,
-  [SMALL_STATE(31)] = 3355,
-  [SMALL_STATE(32)] = 3453,
-  [SMALL_STATE(33)] = 3551,
-  [SMALL_STATE(34)] = 3649,
-  [SMALL_STATE(35)] = 3747,
-  [SMALL_STATE(36)] = 3845,
-  [SMALL_STATE(37)] = 3943,
-  [SMALL_STATE(38)] = 4041,
-  [SMALL_STATE(39)] = 4139,
-  [SMALL_STATE(40)] = 4237,
-  [SMALL_STATE(41)] = 4335,
-  [SMALL_STATE(42)] = 4433,
-  [SMALL_STATE(43)] = 4531,
-  [SMALL_STATE(44)] = 4629,
-  [SMALL_STATE(45)] = 4727,
-  [SMALL_STATE(46)] = 4825,
-  [SMALL_STATE(47)] = 4923,
-  [SMALL_STATE(48)] = 5021,
-  [SMALL_STATE(49)] = 5119,
-  [SMALL_STATE(50)] = 5217,
-  [SMALL_STATE(51)] = 5315,
-  [SMALL_STATE(52)] = 5413,
-  [SMALL_STATE(53)] = 5511,
-  [SMALL_STATE(54)] = 5609,
-  [SMALL_STATE(55)] = 5707,
-  [SMALL_STATE(56)] = 5805,
-  [SMALL_STATE(57)] = 5903,
-  [SMALL_STATE(58)] = 6001,
-  [SMALL_STATE(59)] = 6099,
-  [SMALL_STATE(60)] = 6197,
-  [SMALL_STATE(61)] = 6295,
-  [SMALL_STATE(62)] = 6393,
-  [SMALL_STATE(63)] = 6491,
-  [SMALL_STATE(64)] = 6542,
-  [SMALL_STATE(65)] = 6593,
-  [SMALL_STATE(66)] = 6655,
-  [SMALL_STATE(67)] = 6717,
-  [SMALL_STATE(68)] = 6776,
-  [SMALL_STATE(69)] = 6835,
-  [SMALL_STATE(70)] = 6894,
-  [SMALL_STATE(71)] = 6953,
-  [SMALL_STATE(72)] = 7009,
-  [SMALL_STATE(73)] = 7065,
-  [SMALL_STATE(74)] = 7121,
-  [SMALL_STATE(75)] = 7177,
-  [SMALL_STATE(76)] = 7233,
-  [SMALL_STATE(77)] = 7289,
-  [SMALL_STATE(78)] = 7345,
-  [SMALL_STATE(79)] = 7401,
-  [SMALL_STATE(80)] = 7457,
-  [SMALL_STATE(81)] = 7506,
-  [SMALL_STATE(82)] = 7551,
-  [SMALL_STATE(83)] = 7600,
-  [SMALL_STATE(84)] = 7649,
-  [SMALL_STATE(85)] = 7694,
-  [SMALL_STATE(86)] = 7740,
-  [SMALL_STATE(87)] = 7784,
-  [SMALL_STATE(88)] = 7828,
-  [SMALL_STATE(89)] = 7872,
-  [SMALL_STATE(90)] = 7916,
-  [SMALL_STATE(91)] = 7960,
-  [SMALL_STATE(92)] = 8004,
-  [SMALL_STATE(93)] = 8048,
-  [SMALL_STATE(94)] = 8092,
-  [SMALL_STATE(95)] = 8135,
-  [SMALL_STATE(96)] = 8178,
-  [SMALL_STATE(97)] = 8221,
-  [SMALL_STATE(98)] = 8264,
-  [SMALL_STATE(99)] = 8307,
-  [SMALL_STATE(100)] = 8350,
-  [SMALL_STATE(101)] = 8393,
-  [SMALL_STATE(102)] = 8436,
-  [SMALL_STATE(103)] = 8483,
-  [SMALL_STATE(104)] = 8526,
-  [SMALL_STATE(105)] = 8569,
-  [SMALL_STATE(106)] = 8612,
-  [SMALL_STATE(107)] = 8655,
-  [SMALL_STATE(108)] = 8698,
-  [SMALL_STATE(109)] = 8741,
-  [SMALL_STATE(110)] = 8784,
-  [SMALL_STATE(111)] = 8827,
-  [SMALL_STATE(112)] = 8870,
-  [SMALL_STATE(113)] = 8915,
-  [SMALL_STATE(114)] = 8958,
-  [SMALL_STATE(115)] = 9001,
-  [SMALL_STATE(116)] = 9044,
-  [SMALL_STATE(117)] = 9087,
-  [SMALL_STATE(118)] = 9134,
-  [SMALL_STATE(119)] = 9177,
-  [SMALL_STATE(120)] = 9220,
-  [SMALL_STATE(121)] = 9267,
-  [SMALL_STATE(122)] = 9314,
-  [SMALL_STATE(123)] = 9361,
-  [SMALL_STATE(124)] = 9404,
-  [SMALL_STATE(125)] = 9450,
-  [SMALL_STATE(126)] = 9496,
-  [SMALL_STATE(127)] = 9537,
-  [SMALL_STATE(128)] = 9588,
-  [SMALL_STATE(129)] = 9630,
-  [SMALL_STATE(130)] = 9672,
-  [SMALL_STATE(131)] = 9748,
-  [SMALL_STATE(132)] = 9824,
-  [SMALL_STATE(133)] = 9866,
-  [SMALL_STATE(134)] = 9901,
-  [SMALL_STATE(135)] = 9936,
-  [SMALL_STATE(136)] = 9974,
-  [SMALL_STATE(137)] = 10014,
-  [SMALL_STATE(138)] = 10054,
-  [SMALL_STATE(139)] = 10092,
-  [SMALL_STATE(140)] = 10132,
-  [SMALL_STATE(141)] = 10172,
-  [SMALL_STATE(142)] = 10212,
-  [SMALL_STATE(143)] = 10250,
-  [SMALL_STATE(144)] = 10286,
-  [SMALL_STATE(145)] = 10326,
-  [SMALL_STATE(146)] = 10362,
-  [SMALL_STATE(147)] = 10402,
-  [SMALL_STATE(148)] = 10442,
-  [SMALL_STATE(149)] = 10482,
-  [SMALL_STATE(150)] = 10522,
-  [SMALL_STATE(151)] = 10559,
-  [SMALL_STATE(152)] = 10628,
-  [SMALL_STATE(153)] = 10665,
-  [SMALL_STATE(154)] = 10702,
-  [SMALL_STATE(155)] = 10739,
-  [SMALL_STATE(156)] = 10808,
-  [SMALL_STATE(157)] = 10841,
-  [SMALL_STATE(158)] = 10878,
-  [SMALL_STATE(159)] = 10911,
-  [SMALL_STATE(160)] = 10944,
-  [SMALL_STATE(161)] = 10981,
-  [SMALL_STATE(162)] = 11014,
-  [SMALL_STATE(163)] = 11047,
-  [SMALL_STATE(164)] = 11084,
-  [SMALL_STATE(165)] = 11121,
-  [SMALL_STATE(166)] = 11154,
-  [SMALL_STATE(167)] = 11187,
-  [SMALL_STATE(168)] = 11220,
-  [SMALL_STATE(169)] = 11253,
-  [SMALL_STATE(170)] = 11322,
-  [SMALL_STATE(171)] = 11355,
-  [SMALL_STATE(172)] = 11388,
-  [SMALL_STATE(173)] = 11421,
-  [SMALL_STATE(174)] = 11454,
-  [SMALL_STATE(175)] = 11487,
-  [SMALL_STATE(176)] = 11520,
-  [SMALL_STATE(177)] = 11553,
-  [SMALL_STATE(178)] = 11586,
-  [SMALL_STATE(179)] = 11619,
-  [SMALL_STATE(180)] = 11656,
-  [SMALL_STATE(181)] = 11688,
-  [SMALL_STATE(182)] = 11722,
-  [SMALL_STATE(183)] = 11754,
-  [SMALL_STATE(184)] = 11786,
-  [SMALL_STATE(185)] = 11818,
-  [SMALL_STATE(186)] = 11850,
-  [SMALL_STATE(187)] = 11881,
-  [SMALL_STATE(188)] = 11912,
-  [SMALL_STATE(189)] = 11943,
-  [SMALL_STATE(190)] = 11974,
-  [SMALL_STATE(191)] = 12005,
-  [SMALL_STATE(192)] = 12036,
-  [SMALL_STATE(193)] = 12067,
-  [SMALL_STATE(194)] = 12098,
-  [SMALL_STATE(195)] = 12129,
-  [SMALL_STATE(196)] = 12160,
-  [SMALL_STATE(197)] = 12191,
-  [SMALL_STATE(198)] = 12222,
-  [SMALL_STATE(199)] = 12253,
-  [SMALL_STATE(200)] = 12284,
-  [SMALL_STATE(201)] = 12315,
-  [SMALL_STATE(202)] = 12346,
-  [SMALL_STATE(203)] = 12377,
-  [SMALL_STATE(204)] = 12408,
-  [SMALL_STATE(205)] = 12439,
-  [SMALL_STATE(206)] = 12470,
-  [SMALL_STATE(207)] = 12501,
-  [SMALL_STATE(208)] = 12532,
-  [SMALL_STATE(209)] = 12563,
-  [SMALL_STATE(210)] = 12594,
-  [SMALL_STATE(211)] = 12625,
-  [SMALL_STATE(212)] = 12656,
-  [SMALL_STATE(213)] = 12687,
-  [SMALL_STATE(214)] = 12718,
-  [SMALL_STATE(215)] = 12780,
-  [SMALL_STATE(216)] = 12841,
-  [SMALL_STATE(217)] = 12902,
-  [SMALL_STATE(218)] = 12963,
-  [SMALL_STATE(219)] = 13024,
-  [SMALL_STATE(220)] = 13079,
-  [SMALL_STATE(221)] = 13134,
-  [SMALL_STATE(222)] = 13189,
-  [SMALL_STATE(223)] = 13244,
-  [SMALL_STATE(224)] = 13305,
-  [SMALL_STATE(225)] = 13360,
-  [SMALL_STATE(226)] = 13386,
-  [SMALL_STATE(227)] = 13412,
-  [SMALL_STATE(228)] = 13436,
-  [SMALL_STATE(229)] = 13464,
-  [SMALL_STATE(230)] = 13490,
-  [SMALL_STATE(231)] = 13516,
-  [SMALL_STATE(232)] = 13562,
-  [SMALL_STATE(233)] = 13583,
-  [SMALL_STATE(234)] = 13604,
-  [SMALL_STATE(235)] = 13625,
-  [SMALL_STATE(236)] = 13671,
-  [SMALL_STATE(237)] = 13717,
-  [SMALL_STATE(238)] = 13763,
-  [SMALL_STATE(239)] = 13782,
-  [SMALL_STATE(240)] = 13805,
-  [SMALL_STATE(241)] = 13828,
-  [SMALL_STATE(242)] = 13847,
-  [SMALL_STATE(243)] = 13882,
-  [SMALL_STATE(244)] = 13899,
-  [SMALL_STATE(245)] = 13916,
-  [SMALL_STATE(246)] = 13949,
-  [SMALL_STATE(247)] = 13966,
-  [SMALL_STATE(248)] = 13981,
-  [SMALL_STATE(249)] = 14010,
-  [SMALL_STATE(250)] = 14025,
-  [SMALL_STATE(251)] = 14051,
-  [SMALL_STATE(252)] = 14077,
-  [SMALL_STATE(253)] = 14103,
-  [SMALL_STATE(254)] = 14129,
-  [SMALL_STATE(255)] = 14157,
-  [SMALL_STATE(256)] = 14183,
-  [SMALL_STATE(257)] = 14199,
-  [SMALL_STATE(258)] = 14222,
-  [SMALL_STATE(259)] = 14245,
-  [SMALL_STATE(260)] = 14268,
-  [SMALL_STATE(261)] = 14291,
-  [SMALL_STATE(262)] = 14314,
-  [SMALL_STATE(263)] = 14337,
-  [SMALL_STATE(264)] = 14359,
-  [SMALL_STATE(265)] = 14377,
-  [SMALL_STATE(266)] = 14397,
-  [SMALL_STATE(267)] = 14419,
-  [SMALL_STATE(268)] = 14441,
-  [SMALL_STATE(269)] = 14461,
-  [SMALL_STATE(270)] = 14481,
-  [SMALL_STATE(271)] = 14499,
-  [SMALL_STATE(272)] = 14517,
-  [SMALL_STATE(273)] = 14536,
-  [SMALL_STATE(274)] = 14555,
-  [SMALL_STATE(275)] = 14574,
-  [SMALL_STATE(276)] = 14591,
-  [SMALL_STATE(277)] = 14610,
-  [SMALL_STATE(278)] = 14627,
-  [SMALL_STATE(279)] = 14644,
-  [SMALL_STATE(280)] = 14657,
-  [SMALL_STATE(281)] = 14676,
-  [SMALL_STATE(282)] = 14695,
-  [SMALL_STATE(283)] = 14711,
-  [SMALL_STATE(284)] = 14721,
-  [SMALL_STATE(285)] = 14735,
-  [SMALL_STATE(286)] = 14749,
-  [SMALL_STATE(287)] = 14765,
-  [SMALL_STATE(288)] = 14779,
-  [SMALL_STATE(289)] = 14793,
-  [SMALL_STATE(290)] = 14805,
-  [SMALL_STATE(291)] = 14819,
-  [SMALL_STATE(292)] = 14829,
-  [SMALL_STATE(293)] = 14843,
-  [SMALL_STATE(294)] = 14859,
-  [SMALL_STATE(295)] = 14873,
-  [SMALL_STATE(296)] = 14887,
-  [SMALL_STATE(297)] = 14901,
-  [SMALL_STATE(298)] = 14913,
-  [SMALL_STATE(299)] = 14929,
-  [SMALL_STATE(300)] = 14945,
-  [SMALL_STATE(301)] = 14961,
-  [SMALL_STATE(302)] = 14975,
-  [SMALL_STATE(303)] = 14987,
-  [SMALL_STATE(304)] = 14999,
-  [SMALL_STATE(305)] = 15015,
-  [SMALL_STATE(306)] = 15029,
-  [SMALL_STATE(307)] = 15043,
-  [SMALL_STATE(308)] = 15057,
-  [SMALL_STATE(309)] = 15073,
-  [SMALL_STATE(310)] = 15089,
-  [SMALL_STATE(311)] = 15105,
-  [SMALL_STATE(312)] = 15121,
-  [SMALL_STATE(313)] = 15131,
-  [SMALL_STATE(314)] = 15141,
-  [SMALL_STATE(315)] = 15151,
-  [SMALL_STATE(316)] = 15161,
-  [SMALL_STATE(317)] = 15177,
-  [SMALL_STATE(318)] = 15193,
-  [SMALL_STATE(319)] = 15203,
-  [SMALL_STATE(320)] = 15216,
-  [SMALL_STATE(321)] = 15229,
-  [SMALL_STATE(322)] = 15242,
-  [SMALL_STATE(323)] = 15255,
-  [SMALL_STATE(324)] = 15268,
-  [SMALL_STATE(325)] = 15277,
-  [SMALL_STATE(326)] = 15290,
-  [SMALL_STATE(327)] = 15299,
-  [SMALL_STATE(328)] = 15312,
-  [SMALL_STATE(329)] = 15325,
-  [SMALL_STATE(330)] = 15338,
-  [SMALL_STATE(331)] = 15351,
-  [SMALL_STATE(332)] = 15364,
-  [SMALL_STATE(333)] = 15377,
-  [SMALL_STATE(334)] = 15390,
-  [SMALL_STATE(335)] = 15403,
-  [SMALL_STATE(336)] = 15416,
-  [SMALL_STATE(337)] = 15429,
-  [SMALL_STATE(338)] = 15442,
-  [SMALL_STATE(339)] = 15455,
-  [SMALL_STATE(340)] = 15468,
-  [SMALL_STATE(341)] = 15481,
-  [SMALL_STATE(342)] = 15494,
-  [SMALL_STATE(343)] = 15507,
-  [SMALL_STATE(344)] = 15520,
-  [SMALL_STATE(345)] = 15533,
-  [SMALL_STATE(346)] = 15546,
-  [SMALL_STATE(347)] = 15559,
-  [SMALL_STATE(348)] = 15572,
-  [SMALL_STATE(349)] = 15585,
-  [SMALL_STATE(350)] = 15598,
-  [SMALL_STATE(351)] = 15611,
-  [SMALL_STATE(352)] = 15624,
-  [SMALL_STATE(353)] = 15633,
-  [SMALL_STATE(354)] = 15646,
-  [SMALL_STATE(355)] = 15656,
-  [SMALL_STATE(356)] = 15666,
-  [SMALL_STATE(357)] = 15676,
-  [SMALL_STATE(358)] = 15686,
-  [SMALL_STATE(359)] = 15694,
-  [SMALL_STATE(360)] = 15704,
-  [SMALL_STATE(361)] = 15714,
-  [SMALL_STATE(362)] = 15722,
-  [SMALL_STATE(363)] = 15732,
-  [SMALL_STATE(364)] = 15742,
-  [SMALL_STATE(365)] = 15752,
-  [SMALL_STATE(366)] = 15762,
-  [SMALL_STATE(367)] = 15772,
-  [SMALL_STATE(368)] = 15782,
-  [SMALL_STATE(369)] = 15792,
-  [SMALL_STATE(370)] = 15802,
-  [SMALL_STATE(371)] = 15812,
-  [SMALL_STATE(372)] = 15822,
-  [SMALL_STATE(373)] = 15830,
-  [SMALL_STATE(374)] = 15840,
-  [SMALL_STATE(375)] = 15848,
-  [SMALL_STATE(376)] = 15858,
-  [SMALL_STATE(377)] = 15866,
-  [SMALL_STATE(378)] = 15876,
-  [SMALL_STATE(379)] = 15884,
-  [SMALL_STATE(380)] = 15894,
-  [SMALL_STATE(381)] = 15902,
-  [SMALL_STATE(382)] = 15910,
-  [SMALL_STATE(383)] = 15920,
-  [SMALL_STATE(384)] = 15930,
-  [SMALL_STATE(385)] = 15938,
-  [SMALL_STATE(386)] = 15946,
-  [SMALL_STATE(387)] = 15956,
-  [SMALL_STATE(388)] = 15966,
-  [SMALL_STATE(389)] = 15974,
-  [SMALL_STATE(390)] = 15982,
-  [SMALL_STATE(391)] = 15990,
-  [SMALL_STATE(392)] = 16000,
-  [SMALL_STATE(393)] = 16010,
-  [SMALL_STATE(394)] = 16017,
-  [SMALL_STATE(395)] = 16024,
-  [SMALL_STATE(396)] = 16031,
-  [SMALL_STATE(397)] = 16038,
-  [SMALL_STATE(398)] = 16045,
-  [SMALL_STATE(399)] = 16052,
-  [SMALL_STATE(400)] = 16059,
-  [SMALL_STATE(401)] = 16066,
-  [SMALL_STATE(402)] = 16073,
-  [SMALL_STATE(403)] = 16080,
-  [SMALL_STATE(404)] = 16087,
-  [SMALL_STATE(405)] = 16094,
-  [SMALL_STATE(406)] = 16101,
-  [SMALL_STATE(407)] = 16108,
-  [SMALL_STATE(408)] = 16115,
-  [SMALL_STATE(409)] = 16122,
-  [SMALL_STATE(410)] = 16129,
-  [SMALL_STATE(411)] = 16136,
-  [SMALL_STATE(412)] = 16143,
-  [SMALL_STATE(413)] = 16150,
-  [SMALL_STATE(414)] = 16157,
-  [SMALL_STATE(415)] = 16164,
-  [SMALL_STATE(416)] = 16171,
-  [SMALL_STATE(417)] = 16178,
-  [SMALL_STATE(418)] = 16185,
-  [SMALL_STATE(419)] = 16192,
-  [SMALL_STATE(420)] = 16199,
-  [SMALL_STATE(421)] = 16206,
-  [SMALL_STATE(422)] = 16213,
-  [SMALL_STATE(423)] = 16220,
-  [SMALL_STATE(424)] = 16227,
-  [SMALL_STATE(425)] = 16234,
-  [SMALL_STATE(426)] = 16241,
-  [SMALL_STATE(427)] = 16248,
-  [SMALL_STATE(428)] = 16255,
-  [SMALL_STATE(429)] = 16262,
-  [SMALL_STATE(430)] = 16269,
-  [SMALL_STATE(431)] = 16276,
-  [SMALL_STATE(432)] = 16283,
-  [SMALL_STATE(433)] = 16290,
-  [SMALL_STATE(434)] = 16297,
-  [SMALL_STATE(435)] = 16304,
-  [SMALL_STATE(436)] = 16311,
-  [SMALL_STATE(437)] = 16318,
-  [SMALL_STATE(438)] = 16325,
-  [SMALL_STATE(439)] = 16332,
-  [SMALL_STATE(440)] = 16339,
-  [SMALL_STATE(441)] = 16346,
-  [SMALL_STATE(442)] = 16353,
-  [SMALL_STATE(443)] = 16360,
-  [SMALL_STATE(444)] = 16367,
-  [SMALL_STATE(445)] = 16374,
-  [SMALL_STATE(446)] = 16381,
-  [SMALL_STATE(447)] = 16388,
-  [SMALL_STATE(448)] = 16395,
-  [SMALL_STATE(449)] = 16402,
-  [SMALL_STATE(450)] = 16409,
-  [SMALL_STATE(451)] = 16416,
-  [SMALL_STATE(452)] = 16423,
-  [SMALL_STATE(453)] = 16430,
-  [SMALL_STATE(454)] = 16437,
-  [SMALL_STATE(455)] = 16444,
-  [SMALL_STATE(456)] = 16451,
-  [SMALL_STATE(457)] = 16458,
-  [SMALL_STATE(458)] = 16465,
-  [SMALL_STATE(459)] = 16472,
-  [SMALL_STATE(460)] = 16479,
-  [SMALL_STATE(461)] = 16486,
-  [SMALL_STATE(462)] = 16493,
-  [SMALL_STATE(463)] = 16500,
-  [SMALL_STATE(464)] = 16507,
-  [SMALL_STATE(465)] = 16514,
-  [SMALL_STATE(466)] = 16521,
-  [SMALL_STATE(467)] = 16528,
-  [SMALL_STATE(468)] = 16535,
-  [SMALL_STATE(469)] = 16542,
-  [SMALL_STATE(470)] = 16549,
-  [SMALL_STATE(471)] = 16556,
+  [SMALL_STATE(25)] = 2764,
+  [SMALL_STATE(26)] = 2880,
+  [SMALL_STATE(27)] = 2981,
+  [SMALL_STATE(28)] = 3082,
+  [SMALL_STATE(29)] = 3183,
+  [SMALL_STATE(30)] = 3284,
+  [SMALL_STATE(31)] = 3385,
+  [SMALL_STATE(32)] = 3486,
+  [SMALL_STATE(33)] = 3587,
+  [SMALL_STATE(34)] = 3685,
+  [SMALL_STATE(35)] = 3783,
+  [SMALL_STATE(36)] = 3881,
+  [SMALL_STATE(37)] = 3979,
+  [SMALL_STATE(38)] = 4077,
+  [SMALL_STATE(39)] = 4175,
+  [SMALL_STATE(40)] = 4273,
+  [SMALL_STATE(41)] = 4371,
+  [SMALL_STATE(42)] = 4469,
+  [SMALL_STATE(43)] = 4567,
+  [SMALL_STATE(44)] = 4665,
+  [SMALL_STATE(45)] = 4763,
+  [SMALL_STATE(46)] = 4861,
+  [SMALL_STATE(47)] = 4959,
+  [SMALL_STATE(48)] = 5057,
+  [SMALL_STATE(49)] = 5155,
+  [SMALL_STATE(50)] = 5253,
+  [SMALL_STATE(51)] = 5351,
+  [SMALL_STATE(52)] = 5449,
+  [SMALL_STATE(53)] = 5547,
+  [SMALL_STATE(54)] = 5645,
+  [SMALL_STATE(55)] = 5743,
+  [SMALL_STATE(56)] = 5841,
+  [SMALL_STATE(57)] = 5939,
+  [SMALL_STATE(58)] = 6037,
+  [SMALL_STATE(59)] = 6135,
+  [SMALL_STATE(60)] = 6233,
+  [SMALL_STATE(61)] = 6331,
+  [SMALL_STATE(62)] = 6429,
+  [SMALL_STATE(63)] = 6527,
+  [SMALL_STATE(64)] = 6625,
+  [SMALL_STATE(65)] = 6723,
+  [SMALL_STATE(66)] = 6774,
+  [SMALL_STATE(67)] = 6825,
+  [SMALL_STATE(68)] = 6887,
+  [SMALL_STATE(69)] = 6949,
+  [SMALL_STATE(70)] = 7008,
+  [SMALL_STATE(71)] = 7067,
+  [SMALL_STATE(72)] = 7126,
+  [SMALL_STATE(73)] = 7185,
+  [SMALL_STATE(74)] = 7241,
+  [SMALL_STATE(75)] = 7297,
+  [SMALL_STATE(76)] = 7353,
+  [SMALL_STATE(77)] = 7409,
+  [SMALL_STATE(78)] = 7465,
+  [SMALL_STATE(79)] = 7521,
+  [SMALL_STATE(80)] = 7577,
+  [SMALL_STATE(81)] = 7633,
+  [SMALL_STATE(82)] = 7689,
+  [SMALL_STATE(83)] = 7738,
+  [SMALL_STATE(84)] = 7783,
+  [SMALL_STATE(85)] = 7828,
+  [SMALL_STATE(86)] = 7877,
+  [SMALL_STATE(87)] = 7926,
+  [SMALL_STATE(88)] = 7970,
+  [SMALL_STATE(89)] = 8014,
+  [SMALL_STATE(90)] = 8058,
+  [SMALL_STATE(91)] = 8102,
+  [SMALL_STATE(92)] = 8146,
+  [SMALL_STATE(93)] = 8190,
+  [SMALL_STATE(94)] = 8236,
+  [SMALL_STATE(95)] = 8280,
+  [SMALL_STATE(96)] = 8324,
+  [SMALL_STATE(97)] = 8367,
+  [SMALL_STATE(98)] = 8410,
+  [SMALL_STATE(99)] = 8453,
+  [SMALL_STATE(100)] = 8496,
+  [SMALL_STATE(101)] = 8539,
+  [SMALL_STATE(102)] = 8582,
+  [SMALL_STATE(103)] = 8625,
+  [SMALL_STATE(104)] = 8672,
+  [SMALL_STATE(105)] = 8715,
+  [SMALL_STATE(106)] = 8758,
+  [SMALL_STATE(107)] = 8801,
+  [SMALL_STATE(108)] = 8844,
+  [SMALL_STATE(109)] = 8887,
+  [SMALL_STATE(110)] = 8932,
+  [SMALL_STATE(111)] = 8979,
+  [SMALL_STATE(112)] = 9022,
+  [SMALL_STATE(113)] = 9069,
+  [SMALL_STATE(114)] = 9112,
+  [SMALL_STATE(115)] = 9155,
+  [SMALL_STATE(116)] = 9198,
+  [SMALL_STATE(117)] = 9241,
+  [SMALL_STATE(118)] = 9284,
+  [SMALL_STATE(119)] = 9327,
+  [SMALL_STATE(120)] = 9370,
+  [SMALL_STATE(121)] = 9413,
+  [SMALL_STATE(122)] = 9460,
+  [SMALL_STATE(123)] = 9503,
+  [SMALL_STATE(124)] = 9546,
+  [SMALL_STATE(125)] = 9589,
+  [SMALL_STATE(126)] = 9636,
+  [SMALL_STATE(127)] = 9682,
+  [SMALL_STATE(128)] = 9728,
+  [SMALL_STATE(129)] = 9769,
+  [SMALL_STATE(130)] = 9820,
+  [SMALL_STATE(131)] = 9896,
+  [SMALL_STATE(132)] = 9938,
+  [SMALL_STATE(133)] = 9980,
+  [SMALL_STATE(134)] = 10022,
+  [SMALL_STATE(135)] = 10098,
+  [SMALL_STATE(136)] = 10133,
+  [SMALL_STATE(137)] = 10168,
+  [SMALL_STATE(138)] = 10208,
+  [SMALL_STATE(139)] = 10244,
+  [SMALL_STATE(140)] = 10280,
+  [SMALL_STATE(141)] = 10318,
+  [SMALL_STATE(142)] = 10358,
+  [SMALL_STATE(143)] = 10396,
+  [SMALL_STATE(144)] = 10436,
+  [SMALL_STATE(145)] = 10474,
+  [SMALL_STATE(146)] = 10514,
+  [SMALL_STATE(147)] = 10554,
+  [SMALL_STATE(148)] = 10594,
+  [SMALL_STATE(149)] = 10634,
+  [SMALL_STATE(150)] = 10674,
+  [SMALL_STATE(151)] = 10714,
+  [SMALL_STATE(152)] = 10754,
+  [SMALL_STATE(153)] = 10791,
+  [SMALL_STATE(154)] = 10824,
+  [SMALL_STATE(155)] = 10857,
+  [SMALL_STATE(156)] = 10890,
+  [SMALL_STATE(157)] = 10959,
+  [SMALL_STATE(158)] = 10992,
+  [SMALL_STATE(159)] = 11025,
+  [SMALL_STATE(160)] = 11058,
+  [SMALL_STATE(161)] = 11091,
+  [SMALL_STATE(162)] = 11124,
+  [SMALL_STATE(163)] = 11157,
+  [SMALL_STATE(164)] = 11190,
+  [SMALL_STATE(165)] = 11223,
+  [SMALL_STATE(166)] = 11260,
+  [SMALL_STATE(167)] = 11297,
+  [SMALL_STATE(168)] = 11330,
+  [SMALL_STATE(169)] = 11363,
+  [SMALL_STATE(170)] = 11396,
+  [SMALL_STATE(171)] = 11433,
+  [SMALL_STATE(172)] = 11466,
+  [SMALL_STATE(173)] = 11499,
+  [SMALL_STATE(174)] = 11532,
+  [SMALL_STATE(175)] = 11565,
+  [SMALL_STATE(176)] = 11598,
+  [SMALL_STATE(177)] = 11631,
+  [SMALL_STATE(178)] = 11668,
+  [SMALL_STATE(179)] = 11737,
+  [SMALL_STATE(180)] = 11806,
+  [SMALL_STATE(181)] = 11843,
+  [SMALL_STATE(182)] = 11880,
+  [SMALL_STATE(183)] = 11917,
+  [SMALL_STATE(184)] = 11950,
+  [SMALL_STATE(185)] = 11983,
+  [SMALL_STATE(186)] = 12020,
+  [SMALL_STATE(187)] = 12052,
+  [SMALL_STATE(188)] = 12084,
+  [SMALL_STATE(189)] = 12116,
+  [SMALL_STATE(190)] = 12148,
+  [SMALL_STATE(191)] = 12182,
+  [SMALL_STATE(192)] = 12214,
+  [SMALL_STATE(193)] = 12245,
+  [SMALL_STATE(194)] = 12276,
+  [SMALL_STATE(195)] = 12307,
+  [SMALL_STATE(196)] = 12338,
+  [SMALL_STATE(197)] = 12369,
+  [SMALL_STATE(198)] = 12400,
+  [SMALL_STATE(199)] = 12431,
+  [SMALL_STATE(200)] = 12462,
+  [SMALL_STATE(201)] = 12493,
+  [SMALL_STATE(202)] = 12524,
+  [SMALL_STATE(203)] = 12555,
+  [SMALL_STATE(204)] = 12586,
+  [SMALL_STATE(205)] = 12617,
+  [SMALL_STATE(206)] = 12648,
+  [SMALL_STATE(207)] = 12679,
+  [SMALL_STATE(208)] = 12710,
+  [SMALL_STATE(209)] = 12741,
+  [SMALL_STATE(210)] = 12772,
+  [SMALL_STATE(211)] = 12803,
+  [SMALL_STATE(212)] = 12834,
+  [SMALL_STATE(213)] = 12865,
+  [SMALL_STATE(214)] = 12896,
+  [SMALL_STATE(215)] = 12927,
+  [SMALL_STATE(216)] = 12958,
+  [SMALL_STATE(217)] = 12989,
+  [SMALL_STATE(218)] = 13020,
+  [SMALL_STATE(219)] = 13051,
+  [SMALL_STATE(220)] = 13082,
+  [SMALL_STATE(221)] = 13144,
+  [SMALL_STATE(222)] = 13205,
+  [SMALL_STATE(223)] = 13266,
+  [SMALL_STATE(224)] = 13321,
+  [SMALL_STATE(225)] = 13382,
+  [SMALL_STATE(226)] = 13443,
+  [SMALL_STATE(227)] = 13498,
+  [SMALL_STATE(228)] = 13559,
+  [SMALL_STATE(229)] = 13614,
+  [SMALL_STATE(230)] = 13669,
+  [SMALL_STATE(231)] = 13724,
+  [SMALL_STATE(232)] = 13750,
+  [SMALL_STATE(233)] = 13776,
+  [SMALL_STATE(234)] = 13804,
+  [SMALL_STATE(235)] = 13830,
+  [SMALL_STATE(236)] = 13854,
+  [SMALL_STATE(237)] = 13900,
+  [SMALL_STATE(238)] = 13926,
+  [SMALL_STATE(239)] = 13947,
+  [SMALL_STATE(240)] = 13968,
+  [SMALL_STATE(241)] = 13989,
+  [SMALL_STATE(242)] = 14035,
+  [SMALL_STATE(243)] = 14081,
+  [SMALL_STATE(244)] = 14127,
+  [SMALL_STATE(245)] = 14146,
+  [SMALL_STATE(246)] = 14165,
+  [SMALL_STATE(247)] = 14188,
+  [SMALL_STATE(248)] = 14211,
+  [SMALL_STATE(249)] = 14228,
+  [SMALL_STATE(250)] = 14245,
+  [SMALL_STATE(251)] = 14280,
+  [SMALL_STATE(252)] = 14297,
+  [SMALL_STATE(253)] = 14330,
+  [SMALL_STATE(254)] = 14345,
+  [SMALL_STATE(255)] = 14360,
+  [SMALL_STATE(256)] = 14389,
+  [SMALL_STATE(257)] = 14415,
+  [SMALL_STATE(258)] = 14443,
+  [SMALL_STATE(259)] = 14469,
+  [SMALL_STATE(260)] = 14495,
+  [SMALL_STATE(261)] = 14521,
+  [SMALL_STATE(262)] = 14537,
+  [SMALL_STATE(263)] = 14563,
+  [SMALL_STATE(264)] = 14586,
+  [SMALL_STATE(265)] = 14609,
+  [SMALL_STATE(266)] = 14632,
+  [SMALL_STATE(267)] = 14655,
+  [SMALL_STATE(268)] = 14678,
+  [SMALL_STATE(269)] = 14701,
+  [SMALL_STATE(270)] = 14719,
+  [SMALL_STATE(271)] = 14739,
+  [SMALL_STATE(272)] = 14761,
+  [SMALL_STATE(273)] = 14779,
+  [SMALL_STATE(274)] = 14799,
+  [SMALL_STATE(275)] = 14821,
+  [SMALL_STATE(276)] = 14839,
+  [SMALL_STATE(277)] = 14859,
+  [SMALL_STATE(278)] = 14881,
+  [SMALL_STATE(279)] = 14900,
+  [SMALL_STATE(280)] = 14913,
+  [SMALL_STATE(281)] = 14932,
+  [SMALL_STATE(282)] = 14949,
+  [SMALL_STATE(283)] = 14968,
+  [SMALL_STATE(284)] = 14987,
+  [SMALL_STATE(285)] = 15006,
+  [SMALL_STATE(286)] = 15023,
+  [SMALL_STATE(287)] = 15040,
+  [SMALL_STATE(288)] = 15059,
+  [SMALL_STATE(289)] = 15073,
+  [SMALL_STATE(290)] = 15089,
+  [SMALL_STATE(291)] = 15099,
+  [SMALL_STATE(292)] = 15115,
+  [SMALL_STATE(293)] = 15131,
+  [SMALL_STATE(294)] = 15147,
+  [SMALL_STATE(295)] = 15157,
+  [SMALL_STATE(296)] = 15173,
+  [SMALL_STATE(297)] = 15185,
+  [SMALL_STATE(298)] = 15199,
+  [SMALL_STATE(299)] = 15211,
+  [SMALL_STATE(300)] = 15221,
+  [SMALL_STATE(301)] = 15237,
+  [SMALL_STATE(302)] = 15247,
+  [SMALL_STATE(303)] = 15261,
+  [SMALL_STATE(304)] = 15271,
+  [SMALL_STATE(305)] = 15285,
+  [SMALL_STATE(306)] = 15297,
+  [SMALL_STATE(307)] = 15311,
+  [SMALL_STATE(308)] = 15325,
+  [SMALL_STATE(309)] = 15341,
+  [SMALL_STATE(310)] = 15357,
+  [SMALL_STATE(311)] = 15371,
+  [SMALL_STATE(312)] = 15383,
+  [SMALL_STATE(313)] = 15397,
+  [SMALL_STATE(314)] = 15411,
+  [SMALL_STATE(315)] = 15425,
+  [SMALL_STATE(316)] = 15439,
+  [SMALL_STATE(317)] = 15455,
+  [SMALL_STATE(318)] = 15471,
+  [SMALL_STATE(319)] = 15487,
+  [SMALL_STATE(320)] = 15501,
+  [SMALL_STATE(321)] = 15515,
+  [SMALL_STATE(322)] = 15531,
+  [SMALL_STATE(323)] = 15541,
+  [SMALL_STATE(324)] = 15551,
+  [SMALL_STATE(325)] = 15567,
+  [SMALL_STATE(326)] = 15576,
+  [SMALL_STATE(327)] = 15589,
+  [SMALL_STATE(328)] = 15602,
+  [SMALL_STATE(329)] = 15615,
+  [SMALL_STATE(330)] = 15628,
+  [SMALL_STATE(331)] = 15641,
+  [SMALL_STATE(332)] = 15654,
+  [SMALL_STATE(333)] = 15667,
+  [SMALL_STATE(334)] = 15680,
+  [SMALL_STATE(335)] = 15693,
+  [SMALL_STATE(336)] = 15706,
+  [SMALL_STATE(337)] = 15719,
+  [SMALL_STATE(338)] = 15732,
+  [SMALL_STATE(339)] = 15745,
+  [SMALL_STATE(340)] = 15758,
+  [SMALL_STATE(341)] = 15771,
+  [SMALL_STATE(342)] = 15784,
+  [SMALL_STATE(343)] = 15797,
+  [SMALL_STATE(344)] = 15810,
+  [SMALL_STATE(345)] = 15819,
+  [SMALL_STATE(346)] = 15832,
+  [SMALL_STATE(347)] = 15845,
+  [SMALL_STATE(348)] = 15858,
+  [SMALL_STATE(349)] = 15871,
+  [SMALL_STATE(350)] = 15884,
+  [SMALL_STATE(351)] = 15897,
+  [SMALL_STATE(352)] = 15910,
+  [SMALL_STATE(353)] = 15923,
+  [SMALL_STATE(354)] = 15932,
+  [SMALL_STATE(355)] = 15945,
+  [SMALL_STATE(356)] = 15958,
+  [SMALL_STATE(357)] = 15971,
+  [SMALL_STATE(358)] = 15984,
+  [SMALL_STATE(359)] = 15997,
+  [SMALL_STATE(360)] = 16010,
+  [SMALL_STATE(361)] = 16020,
+  [SMALL_STATE(362)] = 16030,
+  [SMALL_STATE(363)] = 16038,
+  [SMALL_STATE(364)] = 16048,
+  [SMALL_STATE(365)] = 16056,
+  [SMALL_STATE(366)] = 16064,
+  [SMALL_STATE(367)] = 16072,
+  [SMALL_STATE(368)] = 16082,
+  [SMALL_STATE(369)] = 16090,
+  [SMALL_STATE(370)] = 16098,
+  [SMALL_STATE(371)] = 16106,
+  [SMALL_STATE(372)] = 16116,
+  [SMALL_STATE(373)] = 16126,
+  [SMALL_STATE(374)] = 16136,
+  [SMALL_STATE(375)] = 16146,
+  [SMALL_STATE(376)] = 16156,
+  [SMALL_STATE(377)] = 16164,
+  [SMALL_STATE(378)] = 16174,
+  [SMALL_STATE(379)] = 16184,
+  [SMALL_STATE(380)] = 16192,
+  [SMALL_STATE(381)] = 16200,
+  [SMALL_STATE(382)] = 16210,
+  [SMALL_STATE(383)] = 16220,
+  [SMALL_STATE(384)] = 16230,
+  [SMALL_STATE(385)] = 16240,
+  [SMALL_STATE(386)] = 16250,
+  [SMALL_STATE(387)] = 16260,
+  [SMALL_STATE(388)] = 16270,
+  [SMALL_STATE(389)] = 16278,
+  [SMALL_STATE(390)] = 16288,
+  [SMALL_STATE(391)] = 16298,
+  [SMALL_STATE(392)] = 16308,
+  [SMALL_STATE(393)] = 16318,
+  [SMALL_STATE(394)] = 16328,
+  [SMALL_STATE(395)] = 16336,
+  [SMALL_STATE(396)] = 16344,
+  [SMALL_STATE(397)] = 16354,
+  [SMALL_STATE(398)] = 16364,
+  [SMALL_STATE(399)] = 16374,
+  [SMALL_STATE(400)] = 16381,
+  [SMALL_STATE(401)] = 16388,
+  [SMALL_STATE(402)] = 16395,
+  [SMALL_STATE(403)] = 16402,
+  [SMALL_STATE(404)] = 16409,
+  [SMALL_STATE(405)] = 16416,
+  [SMALL_STATE(406)] = 16423,
+  [SMALL_STATE(407)] = 16430,
+  [SMALL_STATE(408)] = 16437,
+  [SMALL_STATE(409)] = 16444,
+  [SMALL_STATE(410)] = 16451,
+  [SMALL_STATE(411)] = 16458,
+  [SMALL_STATE(412)] = 16465,
+  [SMALL_STATE(413)] = 16472,
+  [SMALL_STATE(414)] = 16479,
+  [SMALL_STATE(415)] = 16486,
+  [SMALL_STATE(416)] = 16493,
+  [SMALL_STATE(417)] = 16500,
+  [SMALL_STATE(418)] = 16507,
+  [SMALL_STATE(419)] = 16514,
+  [SMALL_STATE(420)] = 16521,
+  [SMALL_STATE(421)] = 16528,
+  [SMALL_STATE(422)] = 16535,
+  [SMALL_STATE(423)] = 16542,
+  [SMALL_STATE(424)] = 16549,
+  [SMALL_STATE(425)] = 16556,
+  [SMALL_STATE(426)] = 16563,
+  [SMALL_STATE(427)] = 16570,
+  [SMALL_STATE(428)] = 16577,
+  [SMALL_STATE(429)] = 16584,
+  [SMALL_STATE(430)] = 16591,
+  [SMALL_STATE(431)] = 16598,
+  [SMALL_STATE(432)] = 16605,
+  [SMALL_STATE(433)] = 16612,
+  [SMALL_STATE(434)] = 16619,
+  [SMALL_STATE(435)] = 16626,
+  [SMALL_STATE(436)] = 16633,
+  [SMALL_STATE(437)] = 16640,
+  [SMALL_STATE(438)] = 16647,
+  [SMALL_STATE(439)] = 16654,
+  [SMALL_STATE(440)] = 16661,
+  [SMALL_STATE(441)] = 16668,
+  [SMALL_STATE(442)] = 16675,
+  [SMALL_STATE(443)] = 16682,
+  [SMALL_STATE(444)] = 16689,
+  [SMALL_STATE(445)] = 16696,
+  [SMALL_STATE(446)] = 16703,
+  [SMALL_STATE(447)] = 16710,
+  [SMALL_STATE(448)] = 16717,
+  [SMALL_STATE(449)] = 16724,
+  [SMALL_STATE(450)] = 16731,
+  [SMALL_STATE(451)] = 16738,
+  [SMALL_STATE(452)] = 16745,
+  [SMALL_STATE(453)] = 16752,
+  [SMALL_STATE(454)] = 16759,
+  [SMALL_STATE(455)] = 16766,
+  [SMALL_STATE(456)] = 16773,
+  [SMALL_STATE(457)] = 16780,
+  [SMALL_STATE(458)] = 16787,
+  [SMALL_STATE(459)] = 16794,
+  [SMALL_STATE(460)] = 16801,
+  [SMALL_STATE(461)] = 16808,
+  [SMALL_STATE(462)] = 16815,
+  [SMALL_STATE(463)] = 16822,
+  [SMALL_STATE(464)] = 16829,
+  [SMALL_STATE(465)] = 16836,
+  [SMALL_STATE(466)] = 16843,
+  [SMALL_STATE(467)] = 16850,
+  [SMALL_STATE(468)] = 16857,
+  [SMALL_STATE(469)] = 16864,
+  [SMALL_STATE(470)] = 16871,
+  [SMALL_STATE(471)] = 16878,
+  [SMALL_STATE(472)] = 16885,
+  [SMALL_STATE(473)] = 16892,
+  [SMALL_STATE(474)] = 16899,
+  [SMALL_STATE(475)] = 16906,
+  [SMALL_STATE(476)] = 16913,
+  [SMALL_STATE(477)] = 16920,
 };
 
 static const TSParseActionEntry ts_parse_actions[] = {
@@ -17974,572 +18394,580 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(),
   [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT_EXTRA(),
   [5] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_program, 0),
-  [7] = {.entry = {.count = 1, .reusable = true}}, SHIFT(357),
-  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(299),
-  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(289),
-  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(274),
-  [15] = {.entry = {.count = 1, .reusable = true}}, SHIFT(463),
-  [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(462),
-  [19] = {.entry = {.count = 1, .reusable = true}}, SHIFT(461),
-  [21] = {.entry = {.count = 1, .reusable = true}}, SHIFT(460),
+  [7] = {.entry = {.count = 1, .reusable = true}}, SHIFT(385),
+  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(321),
+  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(311),
+  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(278),
+  [15] = {.entry = {.count = 1, .reusable = true}}, SHIFT(469),
+  [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(468),
+  [19] = {.entry = {.count = 1, .reusable = true}}, SHIFT(463),
+  [21] = {.entry = {.count = 1, .reusable = true}}, SHIFT(462),
   [23] = {.entry = {.count = 1, .reusable = true}}, SHIFT(459),
-  [25] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
-  [27] = {.entry = {.count = 1, .reusable = true}}, SHIFT(280),
-  [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(281),
-  [31] = {.entry = {.count = 1, .reusable = true}}, SHIFT(455),
-  [33] = {.entry = {.count = 1, .reusable = false}}, SHIFT(256),
-  [35] = {.entry = {.count = 1, .reusable = true}}, SHIFT(63),
-  [37] = {.entry = {.count = 1, .reusable = false}}, SHIFT(93),
-  [39] = {.entry = {.count = 1, .reusable = false}}, SHIFT(98),
-  [41] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
-  [43] = {.entry = {.count = 1, .reusable = true}}, SHIFT(315),
-  [45] = {.entry = {.count = 1, .reusable = false}}, SHIFT(464),
+  [25] = {.entry = {.count = 1, .reusable = true}}, SHIFT(300),
+  [27] = {.entry = {.count = 1, .reusable = true}}, SHIFT(282),
+  [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(284),
+  [31] = {.entry = {.count = 1, .reusable = true}}, SHIFT(444),
+  [33] = {.entry = {.count = 1, .reusable = false}}, SHIFT(261),
+  [35] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
+  [37] = {.entry = {.count = 1, .reusable = false}}, SHIFT(90),
+  [39] = {.entry = {.count = 1, .reusable = false}}, SHIFT(104),
+  [41] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
+  [43] = {.entry = {.count = 1, .reusable = true}}, SHIFT(323),
+  [45] = {.entry = {.count = 1, .reusable = false}}, SHIFT(433),
   [47] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
-  [49] = {.entry = {.count = 1, .reusable = true}}, SHIFT(353),
-  [51] = {.entry = {.count = 1, .reusable = false}}, SHIFT(111),
-  [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(284),
-  [55] = {.entry = {.count = 1, .reusable = true}}, SHIFT(287),
+  [49] = {.entry = {.count = 1, .reusable = true}}, SHIFT(359),
+  [51] = {.entry = {.count = 1, .reusable = false}}, SHIFT(116),
+  [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302),
+  [55] = {.entry = {.count = 1, .reusable = true}}, SHIFT(304),
   [57] = {.entry = {.count = 1, .reusable = true}}, SHIFT(288),
-  [59] = {.entry = {.count = 1, .reusable = true}}, SHIFT(290),
-  [61] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85),
-  [63] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
-  [65] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
-  [67] = {.entry = {.count = 1, .reusable = true}}, SHIFT(254),
+  [59] = {.entry = {.count = 1, .reusable = true}}, SHIFT(310),
+  [61] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
+  [63] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
+  [65] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
+  [67] = {.entry = {.count = 1, .reusable = true}}, SHIFT(257),
   [69] = {.entry = {.count = 1, .reusable = false}}, SHIFT(30),
-  [71] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21),
-  [73] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
-  [75] = {.entry = {.count = 1, .reusable = true}}, SHIFT(375),
-  [77] = {.entry = {.count = 1, .reusable = true}}, SHIFT(404),
-  [79] = {.entry = {.count = 1, .reusable = true}}, SHIFT(258),
-  [81] = {.entry = {.count = 1, .reusable = false}}, SHIFT(260),
-  [83] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
-  [85] = {.entry = {.count = 1, .reusable = true}}, SHIFT(298),
-  [87] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
+  [71] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
+  [73] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
+  [75] = {.entry = {.count = 1, .reusable = true}}, SHIFT(381),
+  [77] = {.entry = {.count = 1, .reusable = true}}, SHIFT(424),
+  [79] = {.entry = {.count = 1, .reusable = true}}, SHIFT(263),
+  [81] = {.entry = {.count = 1, .reusable = false}}, SHIFT(266),
+  [83] = {.entry = {.count = 1, .reusable = true}}, SHIFT(173),
+  [85] = {.entry = {.count = 1, .reusable = true}}, SHIFT(316),
+  [87] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
   [89] = {.entry = {.count = 1, .reusable = true}}, SHIFT(279),
-  [91] = {.entry = {.count = 1, .reusable = true}}, SHIFT(126),
-  [93] = {.entry = {.count = 1, .reusable = true}}, SHIFT(265),
-  [95] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
-  [97] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
-  [99] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
-  [101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(397),
-  [103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(178),
-  [105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(304),
-  [107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(309),
-  [109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
-  [111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(173),
-  [113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(158),
-  [115] = {.entry = {.count = 1, .reusable = true}}, SHIFT(165),
-  [117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(177),
-  [119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(156),
-  [121] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
-  [123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
-  [125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
-  [127] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(357),
-  [130] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(404),
-  [133] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(299),
-  [136] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(289),
-  [139] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(463),
-  [142] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(462),
-  [145] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(461),
-  [148] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(460),
-  [151] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(459),
-  [154] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2),
-  [156] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(282),
-  [159] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(280),
-  [162] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(281),
-  [165] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(67),
-  [168] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(279),
-  [171] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(126),
-  [174] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(265),
-  [177] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(268),
-  [180] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(269),
-  [183] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(65),
-  [186] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(397),
-  [189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
-  [191] = {.entry = {.count = 1, .reusable = false}}, SHIFT(81),
-  [193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
-  [195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
-  [197] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
-  [199] = {.entry = {.count = 1, .reusable = false}}, SHIFT(302),
-  [201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302),
-  [203] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_name, 1),
-  [205] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_name, 1),
-  [207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
-  [209] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_name, 2),
-  [211] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_name, 2),
-  [213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(297),
-  [215] = {.entry = {.count = 1, .reusable = false}}, SHIFT(125),
-  [217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
-  [219] = {.entry = {.count = 1, .reusable = false}}, SHIFT(400),
-  [221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
-  [223] = {.entry = {.count = 1, .reusable = false}}, SHIFT(92),
-  [225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
-  [227] = {.entry = {.count = 1, .reusable = false}}, SHIFT(271),
-  [229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(264),
-  [231] = {.entry = {.count = 1, .reusable = false}}, SHIFT(380),
-  [233] = {.entry = {.count = 1, .reusable = false}}, SHIFT(465),
-  [235] = {.entry = {.count = 1, .reusable = false}}, SHIFT(466),
-  [237] = {.entry = {.count = 1, .reusable = false}}, SHIFT(401),
-  [239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(271),
-  [241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(152),
-  [243] = {.entry = {.count = 1, .reusable = true}}, SHIFT(153),
-  [245] = {.entry = {.count = 1, .reusable = true}}, SHIFT(194),
-  [247] = {.entry = {.count = 1, .reusable = false}}, SHIFT(194),
-  [249] = {.entry = {.count = 1, .reusable = true}}, SHIFT(195),
-  [251] = {.entry = {.count = 1, .reusable = true}}, SHIFT(239),
-  [253] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240),
-  [255] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_type, 1),
-  [257] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_type, 1),
-  [259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
-  [261] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_alias_name, 1),
-  [263] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_alias_name, 1),
-  [265] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_type, 1),
-  [267] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_type, 1),
-  [269] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_alias_type, 1),
-  [271] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_alias_type, 1),
-  [273] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_alias_name, 2),
-  [275] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_alias_name, 2),
-  [277] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_symbol_literal, 1),
-  [279] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_symbol_literal, 1),
-  [281] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
-  [283] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_constant_suffix, 2),
-  [285] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_constant_suffix, 2),
-  [287] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_identifier_suffix, 2),
-  [289] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_identifier_suffix, 2),
-  [291] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_name, 2),
-  [293] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_name, 2),
-  [295] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_constant_setter, 2),
-  [297] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_constant_setter, 2),
-  [299] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_setter, 2),
-  [301] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_setter, 2),
-  [303] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_method_name, 1),
-  [305] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_name, 1),
-  [307] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_operator, 1),
-  [309] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_operator, 1),
-  [311] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_name, 1),
-  [313] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_name, 1),
-  [315] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_optional_type, 2),
-  [317] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_optional_type, 2),
-  [319] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_type, 4, .production_id = 14),
-  [321] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_type, 4, .production_id = 14),
-  [323] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_arguments, 4),
-  [325] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_arguments, 4),
-  [327] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_type, 2),
-  [329] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_type, 2),
-  [331] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_builtin_type, 1),
-  [333] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_builtin_type, 1),
-  [335] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_type, 2),
-  [337] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_type, 2),
-  [339] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_symbol_literal, 2),
-  [341] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_symbol_literal, 2),
-  [343] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_type, 3, .production_id = 14),
-  [345] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_type, 3, .production_id = 14),
-  [347] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_union_type, 3, .production_id = 15),
-  [349] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_union_type, 3, .production_id = 15),
-  [351] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
-  [353] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
-  [355] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_singleton_type, 4),
-  [357] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_singleton_type, 4),
-  [359] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_type, 4),
-  [361] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple_type, 4),
-  [363] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_literal, 2),
-  [365] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_literal, 2),
-  [367] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_type, 3),
-  [369] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple_type, 3),
-  [371] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_type, 5),
-  [373] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple_type, 5),
-  [375] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 3),
-  [377] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type, 3),
-  [379] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_type, 4, .production_id = 19),
-  [381] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_type, 4, .production_id = 19),
-  [383] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 1),
-  [385] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type, 1),
-  [387] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_intersection_type, 3, .production_id = 15),
-  [389] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_intersection_type, 3, .production_id = 15),
-  [391] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_type, 5, .production_id = 19),
-  [393] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_type, 5, .production_id = 19),
-  [395] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_literal, 3),
-  [397] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_literal, 3),
-  [399] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_type, 2),
-  [401] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple_type, 2),
-  [403] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_arguments, 3),
-  [405] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_arguments, 3),
-  [407] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_proc, 5),
-  [409] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_proc, 5),
+  [91] = {.entry = {.count = 1, .reusable = true}}, SHIFT(128),
+  [93] = {.entry = {.count = 1, .reusable = true}}, SHIFT(273),
+  [95] = {.entry = {.count = 1, .reusable = true}}, SHIFT(276),
+  [97] = {.entry = {.count = 1, .reusable = true}}, SHIFT(270),
+  [99] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
+  [101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(452),
+  [103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(158),
+  [105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(291),
+  [107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(293),
+  [109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(164),
+  [111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(160),
+  [113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155),
+  [115] = {.entry = {.count = 1, .reusable = true}}, SHIFT(169),
+  [117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167),
+  [119] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(385),
+  [122] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(424),
+  [125] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(321),
+  [128] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(311),
+  [131] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(469),
+  [134] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(468),
+  [137] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(463),
+  [140] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(462),
+  [143] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(459),
+  [146] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2),
+  [148] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(300),
+  [151] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(282),
+  [154] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(284),
+  [157] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(69),
+  [160] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(279),
+  [163] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(128),
+  [166] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(273),
+  [169] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(276),
+  [172] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(270),
+  [175] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(67),
+  [178] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 2), SHIFT_REPEAT(452),
+  [181] = {.entry = {.count = 1, .reusable = true}}, SHIFT(184),
+  [183] = {.entry = {.count = 1, .reusable = true}}, SHIFT(183),
+  [185] = {.entry = {.count = 1, .reusable = true}}, SHIFT(154),
+  [187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(153),
+  [189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157),
+  [191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(159),
+  [193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(172),
+  [195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(174),
+  [197] = {.entry = {.count = 1, .reusable = true}}, SHIFT(162),
+  [199] = {.entry = {.count = 1, .reusable = false}}, SHIFT(84),
+  [201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108),
+  [203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
+  [205] = {.entry = {.count = 1, .reusable = true}}, SHIFT(114),
+  [207] = {.entry = {.count = 1, .reusable = false}}, SHIFT(296),
+  [209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(296),
+  [211] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_name, 2),
+  [213] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_name, 2),
+  [215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(305),
+  [217] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_name, 1),
+  [219] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_name, 1),
+  [221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(298),
+  [223] = {.entry = {.count = 1, .reusable = false}}, SHIFT(126),
+  [225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127),
+  [227] = {.entry = {.count = 1, .reusable = false}}, SHIFT(445),
+  [229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
+  [231] = {.entry = {.count = 1, .reusable = false}}, SHIFT(89),
+  [233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
+  [235] = {.entry = {.count = 1, .reusable = false}}, SHIFT(269),
+  [237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(272),
+  [239] = {.entry = {.count = 1, .reusable = false}}, SHIFT(370),
+  [241] = {.entry = {.count = 1, .reusable = false}}, SHIFT(453),
+  [243] = {.entry = {.count = 1, .reusable = false}}, SHIFT(455),
+  [245] = {.entry = {.count = 1, .reusable = false}}, SHIFT(457),
+  [247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(269),
+  [249] = {.entry = {.count = 1, .reusable = true}}, SHIFT(185),
+  [251] = {.entry = {.count = 1, .reusable = true}}, SHIFT(182),
+  [253] = {.entry = {.count = 1, .reusable = true}}, SHIFT(215),
+  [255] = {.entry = {.count = 1, .reusable = false}}, SHIFT(215),
+  [257] = {.entry = {.count = 1, .reusable = true}}, SHIFT(213),
+  [259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(246),
+  [261] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247),
+  [263] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_type, 1),
+  [265] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_type, 1),
+  [267] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
+  [269] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_alias_name, 2),
+  [271] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_alias_name, 2),
+  [273] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_alias_name, 1),
+  [275] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_alias_name, 1),
+  [277] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_alias_type, 1),
+  [279] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_alias_type, 1),
+  [281] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_type, 1),
+  [283] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_type, 1),
+  [285] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_setter, 2),
+  [287] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_setter, 2),
+  [289] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_method_name, 1),
+  [291] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_name, 1),
+  [293] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_operator, 1),
+  [295] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_operator, 1),
+  [297] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_name, 1),
+  [299] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_name, 1),
+  [301] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_constant_suffix, 2),
+  [303] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_constant_suffix, 2),
+  [305] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_constant_setter, 2),
+  [307] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_constant_setter, 2),
+  [309] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_symbol_literal, 1),
+  [311] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_symbol_literal, 1),
+  [313] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107),
+  [315] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_name, 2),
+  [317] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_name, 2),
+  [319] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_identifier_suffix, 2),
+  [321] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_identifier_suffix, 2),
+  [323] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_type, 2),
+  [325] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_interface_type, 2),
+  [327] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 3),
+  [329] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type, 3),
+  [331] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_optional_type, 2),
+  [333] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_optional_type, 2),
+  [335] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_literal, 2),
+  [337] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_literal, 2),
+  [339] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_type, 2),
+  [341] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_type, 2),
+  [343] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_type, 4, .production_id = 25),
+  [345] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_type, 4, .production_id = 25),
+  [347] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_type, 2),
+  [349] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_type, 2),
+  [351] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_proc, 6),
+  [353] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_proc, 6),
+  [355] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
+  [357] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
+  [359] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_builtin_type, 1),
+  [361] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_builtin_type, 1),
+  [363] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_singleton_type, 4),
+  [365] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_singleton_type, 4),
+  [367] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_type, 4),
+  [369] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple_type, 4),
+  [371] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_symbol_literal, 2),
+  [373] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_symbol_literal, 2),
+  [375] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_type, 2),
+  [377] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple_type, 2),
+  [379] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_intersection_type, 3, .production_id = 26),
+  [381] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_intersection_type, 3, .production_id = 26),
+  [383] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_union_type, 3, .production_id = 26),
+  [385] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_union_type, 3, .production_id = 26),
+  [387] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_arguments, 3),
+  [389] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_arguments, 3),
+  [391] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_proc, 3),
+  [393] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_proc, 3),
+  [395] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_type, 5),
+  [397] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple_type, 5),
+  [399] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_type, 5, .production_id = 30),
+  [401] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_type, 5, .production_id = 30),
+  [403] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 1),
+  [405] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type, 1),
+  [407] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_symbol_literal, 3),
+  [409] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_symbol_literal, 3),
   [411] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_alias_type, 2),
   [413] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_alias_type, 2),
-  [415] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_type, 2),
-  [417] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_type, 2),
-  [419] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_proc, 4),
-  [421] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_proc, 4),
-  [423] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_proc, 6),
-  [425] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_proc, 6),
-  [427] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_proc, 3),
-  [429] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_proc, 3),
-  [431] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_symbol_literal, 3),
-  [433] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_symbol_literal, 3),
-  [435] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
-  [437] = {.entry = {.count = 1, .reusable = false}}, SHIFT(89),
-  [439] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
-  [441] = {.entry = {.count = 1, .reusable = false}}, SHIFT(90),
-  [443] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_attribyte_type, 1),
-  [445] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribyte_type, 1),
-  [447] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 2),
-  [449] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 2), SHIFT_REPEAT(463),
-  [452] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 2), SHIFT_REPEAT(462),
-  [455] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 2), SHIFT_REPEAT(461),
-  [458] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 2), SHIFT_REPEAT(460),
-  [461] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 2), SHIFT_REPEAT(459),
-  [464] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias_decl, 4),
-  [466] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
-  [468] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_const_decl, 3),
-  [470] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_program, 1),
-  [472] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias_decl, 5),
-  [474] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 1),
-  [476] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_annotation, 3),
-  [478] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type_body, 2),
-  [480] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 7),
-  [482] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_self_types, 1),
-  [484] = {.entry = {.count = 1, .reusable = true}}, SHIFT(259),
-  [486] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type_body, 4),
-  [488] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 6),
-  [490] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 10),
-  [492] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ivar_member, 3),
-  [494] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type_body, 3),
-  [496] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_type_parameters, 4),
-  [498] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module_type_parameters, 4),
-  [500] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 8),
-  [502] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_type_parameters, 3),
-  [504] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module_type_parameters, 3),
-  [506] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 9),
-  [508] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 4),
-  [510] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ivar_member, 5),
-  [512] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 5),
-  [514] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_method_types_repeat1, 2),
-  [516] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_method_types_repeat1, 2), SHIFT_REPEAT(224),
-  [519] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_program, 2),
-  [521] = {.entry = {.count = 1, .reusable = true}}, SHIFT(200),
-  [523] = {.entry = {.count = 1, .reusable = true}}, SHIFT(206),
-  [525] = {.entry = {.count = 1, .reusable = true}}, SHIFT(186),
-  [527] = {.entry = {.count = 1, .reusable = true}}, SHIFT(204),
-  [529] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_member, 2),
-  [531] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 4, .production_id = 5),
-  [533] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_superclass, 2),
-  [535] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 5, .production_id = 3),
-  [537] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 5, .production_id = 12),
-  [539] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_extend_member, 2),
-  [541] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_alias_decl, 4, .production_id = 7),
-  [543] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 4, .production_id = 3),
-  [545] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_prepend_member, 2),
-  [547] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_types, 2),
-  [549] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
-  [551] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 4, .production_id = 8),
-  [553] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_decl, 4),
-  [555] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 6, .production_id = 17),
-  [557] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_decl, 4, .production_id = 9),
-  [559] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2),
-  [561] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(357),
-  [564] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(299),
-  [567] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(289),
-  [570] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(463),
-  [573] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(462),
-  [576] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(461),
-  [579] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(460),
-  [582] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(459),
-  [585] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(282),
-  [588] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(280),
-  [591] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(281),
-  [594] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(455),
-  [597] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_decl, 3),
-  [599] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 3, .production_id = 3),
-  [601] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_alias_decl, 4, .production_id = 4),
-  [603] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 4),
-  [605] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 5),
-  [607] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 5, .production_id = 11),
-  [609] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_decl, 5, .production_id = 13),
-  [611] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 6, .production_id = 16),
-  [613] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 3),
-  [615] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_types, 1),
-  [617] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_self_types, 2),
-  [619] = {.entry = {.count = 1, .reusable = true}}, SHIFT(261),
-  [621] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type, 2),
-  [623] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type, 1),
-  [625] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type, 3, .production_id = 22),
-  [627] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type, 2, .production_id = 2),
-  [629] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_member, 7),
-  [631] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_visibility_member, 2),
-  [633] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_member, 6),
-  [635] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_member, 5),
-  [637] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_member, 1),
-  [639] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_singleton_method_name, 3),
-  [641] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_member, 4),
-  [643] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_self_types, 4),
-  [645] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 1),
-  [647] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_self_type_binds, 2),
-  [649] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_superclass, 3),
-  [651] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_member, 2, .production_id = 2),
-  [653] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_member, 3),
-  [655] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_extend_member, 3),
-  [657] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_prepend_member, 3),
+  [415] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string_literal, 3),
+  [417] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_string_literal, 3),
+  [419] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_type, 3, .production_id = 25),
+  [421] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_type, 3, .production_id = 25),
+  [423] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_proc, 5),
+  [425] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_proc, 5),
+  [427] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_tuple_type, 3),
+  [429] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_tuple_type, 3),
+  [431] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_record_type, 4, .production_id = 30),
+  [433] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_record_type, 4, .production_id = 30),
+  [435] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_arguments, 4),
+  [437] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_type_arguments, 4),
+  [439] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_proc, 4),
+  [441] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_proc, 4),
+  [443] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
+  [445] = {.entry = {.count = 1, .reusable = false}}, SHIFT(87),
+  [447] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
+  [449] = {.entry = {.count = 1, .reusable = false}}, SHIFT(92),
+  [451] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_attribyte_type, 1),
+  [453] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribyte_type, 1),
+  [455] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 2),
+  [457] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 2), SHIFT_REPEAT(469),
+  [460] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 2), SHIFT_REPEAT(468),
+  [463] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 2), SHIFT_REPEAT(463),
+  [466] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 2), SHIFT_REPEAT(462),
+  [469] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 2), SHIFT_REPEAT(459),
+  [472] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias_decl, 4),
+  [474] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
+  [476] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_alias_decl, 5),
+  [478] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_const_decl, 3),
+  [480] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_program, 1),
+  [482] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_decl_repeat1, 1),
+  [484] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_annotation, 3),
+  [486] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 5),
+  [488] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_type_parameters, 3),
+  [490] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module_type_parameters, 3),
+  [492] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_type_parameters, 4),
+  [494] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_module_type_parameters, 4),
+  [496] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type_body, 2),
+  [498] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 6),
+  [500] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type_body, 3),
+  [502] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 9),
+  [504] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type_body, 4),
+  [506] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 7),
+  [508] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ivar_member, 3),
+  [510] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 10),
+  [512] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 8),
+  [514] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_ivar_member, 5),
+  [516] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute_member, 4),
+  [518] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_self_types, 1),
+  [520] = {.entry = {.count = 1, .reusable = true}}, SHIFT(265),
+  [522] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_method_types_repeat1, 2),
+  [524] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_method_types_repeat1, 2), SHIFT_REPEAT(230),
+  [527] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 5, .production_id = 20),
+  [529] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 4, .production_id = 9),
+  [531] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 4, .production_id = 7),
+  [533] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 5, .production_id = 19),
+  [535] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 3, .production_id = 4),
+  [537] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 5, .production_id = 18),
+  [539] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 4, .production_id = 8),
+  [541] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_alias_decl, 4, .production_id = 11),
+  [543] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 4, .production_id = 12),
+  [545] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_decl, 3, .production_id = 4),
+  [547] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 4, .production_id = 13),
+  [549] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_prepend_member, 2),
+  [551] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_extend_member, 2),
+  [553] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 4, .production_id = 14),
+  [555] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_decl, 4, .production_id = 8),
+  [557] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 5, .production_id = 21),
+  [559] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_member, 2),
+  [561] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_decl, 4, .production_id = 15),
+  [563] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 5, .production_id = 22),
+  [565] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 3, .production_id = 5),
+  [567] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 5, .production_id = 23),
+  [569] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_decl, 5, .production_id = 24),
+  [571] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_alias_decl, 4, .production_id = 6),
+  [573] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_superclass, 2, .production_id = 4),
+  [575] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_program, 2),
+  [577] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2),
+  [579] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(385),
+  [582] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(321),
+  [585] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(311),
+  [588] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(469),
+  [591] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(468),
+  [594] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(463),
+  [597] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(462),
+  [600] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(459),
+  [603] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(300),
+  [606] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(282),
+  [609] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(284),
+  [612] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat2, 2), SHIFT_REPEAT(444),
+  [615] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_types, 2),
+  [617] = {.entry = {.count = 1, .reusable = true}}, SHIFT(230),
+  [619] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_types, 1),
+  [621] = {.entry = {.count = 1, .reusable = true}}, SHIFT(211),
+  [623] = {.entry = {.count = 1, .reusable = true}}, SHIFT(209),
+  [625] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_decl, 6, .production_id = 27),
+  [627] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_decl, 6, .production_id = 28),
+  [629] = {.entry = {.count = 1, .reusable = true}}, SHIFT(208),
+  [631] = {.entry = {.count = 1, .reusable = true}}, SHIFT(205),
+  [633] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type, 2, .production_id = 32),
+  [635] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type, 3, .production_id = 34),
+  [637] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type, 2, .production_id = 3),
+  [639] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_self_types, 2),
+  [641] = {.entry = {.count = 1, .reusable = true}}, SHIFT(267),
+  [643] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type, 1, .production_id = 1),
+  [645] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_member, 2, .production_id = 3),
+  [647] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_member, 7),
+  [649] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_self_type_binds, 2),
+  [651] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_member, 6),
+  [653] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_self_types, 4),
+  [655] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_member, 5),
+  [657] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_visibility_member, 2),
   [659] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_self_types, 3),
-  [661] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_alias_member, 3, .production_id = 10),
-  [663] = {.entry = {.count = 1, .reusable = true}}, SHIFT(170),
-  [665] = {.entry = {.count = 1, .reusable = true}}, SHIFT(452),
-  [667] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
-  [669] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
-  [671] = {.entry = {.count = 1, .reusable = true}}, SHIFT(383),
-  [673] = {.entry = {.count = 1, .reusable = true}}, SHIFT(392),
-  [675] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
-  [677] = {.entry = {.count = 1, .reusable = true}}, SHIFT(413),
-  [679] = {.entry = {.count = 1, .reusable = true}}, SHIFT(197),
-  [681] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(463),
-  [684] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(462),
-  [687] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(461),
-  [690] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(460),
-  [693] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(459),
-  [696] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2),
-  [698] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(67),
-  [701] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(452),
-  [704] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(265),
-  [707] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(66),
-  [710] = {.entry = {.count = 1, .reusable = true}}, SHIFT(176),
-  [712] = {.entry = {.count = 1, .reusable = true}}, SHIFT(166),
-  [714] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
-  [716] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_directive, 2),
-  [718] = {.entry = {.count = 1, .reusable = true}}, SHIFT(272),
-  [720] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_program_repeat1, 2),
-  [722] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat1, 2), SHIFT_REPEAT(274),
-  [725] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_clause, 1, .production_id = 1),
-  [727] = {.entry = {.count = 1, .reusable = true}}, SHIFT(395),
-  [729] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_global_decl, 3),
-  [731] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_directive, 3),
-  [733] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_use_directive_repeat1, 2),
-  [735] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_use_directive_repeat1, 2), SHIFT_REPEAT(272),
-  [738] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_clause, 2),
-  [740] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_clause, 3, .production_id = 6),
-  [742] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decl, 2, .production_id = 2),
-  [744] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decl, 1),
-  [746] = {.entry = {.count = 1, .reusable = true}}, SHIFT(324),
-  [748] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_member, 1),
-  [750] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 1),
-  [752] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93),
-  [754] = {.entry = {.count = 1, .reusable = true}}, SHIFT(464),
-  [756] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_member, 2, .production_id = 2),
-  [758] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type_parameters, 4),
-  [760] = {.entry = {.count = 1, .reusable = true}}, SHIFT(318),
-  [762] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type_parameters, 3),
-  [764] = {.entry = {.count = 1, .reusable = true}}, SHIFT(411),
-  [766] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
-  [768] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_var_name, 1),
-  [770] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameter, 1),
-  [772] = {.entry = {.count = 1, .reusable = true}}, SHIFT(326),
-  [774] = {.entry = {.count = 1, .reusable = true}}, SHIFT(275),
-  [776] = {.entry = {.count = 1, .reusable = true}}, SHIFT(424),
-  [778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
-  [780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106),
-  [782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89),
-  [784] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
-  [786] = {.entry = {.count = 1, .reusable = true}}, SHIFT(116),
-  [788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
-  [790] = {.entry = {.count = 1, .reusable = false}}, SHIFT_EXTRA(),
-  [792] = {.entry = {.count = 1, .reusable = false}}, SHIFT(68),
-  [794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(188),
-  [796] = {.entry = {.count = 1, .reusable = false}}, SHIFT(126),
-  [798] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
-  [800] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_optional_keywords, 4, .production_id = 23),
-  [802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(255),
-  [804] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_required_keywords, 3, .production_id = 21),
-  [806] = {.entry = {.count = 1, .reusable = true}}, SHIFT(252),
-  [808] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__record_type_single, 3, .production_id = 18),
-  [810] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_tuple_type_repeat1, 2),
-  [812] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_visibility, 1),
-  [814] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_visibility, 1),
-  [816] = {.entry = {.count = 1, .reusable = true}}, SHIFT(415),
-  [818] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
-  [820] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 11),
-  [822] = {.entry = {.count = 1, .reusable = false}}, SHIFT(105),
-  [824] = {.entry = {.count = 1, .reusable = false}}, SHIFT(296),
-  [826] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_type_parameter, 3),
-  [828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(245),
-  [830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(431),
-  [832] = {.entry = {.count = 1, .reusable = false}}, SHIFT(295),
-  [834] = {.entry = {.count = 1, .reusable = false}}, SHIFT(100),
-  [836] = {.entry = {.count = 1, .reusable = false}}, SHIFT(294),
-  [838] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_namespace, 1),
-  [840] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_namespace, 1),
-  [842] = {.entry = {.count = 1, .reusable = false}}, SHIFT(292),
-  [844] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 5),
-  [846] = {.entry = {.count = 1, .reusable = false}}, SHIFT(123),
-  [848] = {.entry = {.count = 1, .reusable = false}}, SHIFT(307),
-  [850] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
-  [852] = {.entry = {.count = 1, .reusable = false}}, SHIFT(301),
-  [854] = {.entry = {.count = 1, .reusable = false}}, SHIFT(114),
-  [856] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_namespace, 3),
-  [858] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_namespace, 3),
-  [860] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_literal_repeat1, 2),
-  [862] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_literal_repeat1, 2), SHIFT_REPEAT(301),
-  [865] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109),
-  [867] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_namespace, 2),
-  [869] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_namespace, 2),
-  [871] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_type_parameter, 1),
-  [873] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_type_parameter, 2),
-  [875] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_literal_repeat2, 2),
-  [877] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_literal_repeat2, 2), SHIFT_REPEAT(307),
-  [880] = {.entry = {.count = 1, .reusable = true}}, SHIFT(352),
-  [882] = {.entry = {.count = 1, .reusable = true}}, SHIFT(441),
-  [884] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
-  [886] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 9),
-  [888] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 3),
-  [890] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 7),
-  [892] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 2),
-  [894] = {.entry = {.count = 1, .reusable = true}}, SHIFT(414),
-  [896] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 8),
-  [898] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
-  [900] = {.entry = {.count = 1, .reusable = true}}, SHIFT(409),
-  [902] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113),
-  [904] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_optional_positionals, 2),
-  [906] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_optional_positionals, 2), SHIFT(429),
-  [909] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
-  [911] = {.entry = {.count = 1, .reusable = true}}, SHIFT(143),
-  [913] = {.entry = {.count = 1, .reusable = false}}, SHIFT(403),
-  [915] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49),
-  [917] = {.entry = {.count = 1, .reusable = true}}, SHIFT(405),
-  [919] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_method_type_parameters_repeat1, 2), SHIFT_REPEAT(387),
-  [922] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_method_type_parameters_repeat1, 2),
-  [924] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_variable, 1),
-  [926] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_required_positionals, 2),
-  [928] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_required_positionals, 2), SHIFT(29),
-  [931] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_record_type_repeat1, 2, .production_id = 20), SHIFT_REPEAT(356),
-  [934] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_record_type_repeat1, 2, .production_id = 20),
-  [936] = {.entry = {.count = 1, .reusable = true}}, SHIFT(320),
-  [938] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110),
-  [940] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_tuple_type_repeat1, 2), SHIFT_REPEAT(40),
-  [943] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
-  [945] = {.entry = {.count = 1, .reusable = false}}, SHIFT(393),
-  [947] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
-  [949] = {.entry = {.count = 1, .reusable = true}}, SHIFT(468),
-  [951] = {.entry = {.count = 1, .reusable = true}}, SHIFT(145),
-  [953] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_required_positionals, 1),
-  [955] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_required_positionals, 1), SHIFT(29),
-  [958] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trailing_positionals, 1),
-  [960] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_trailing_positionals, 1), SHIFT(29),
-  [963] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
-  [965] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_required_positionals_repeat1, 2),
-  [967] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_required_positionals_repeat1, 2), SHIFT_REPEAT(29),
-  [970] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
-  [972] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_optional_positionals, 3),
-  [974] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_optional_positionals, 3), SHIFT(429),
-  [977] = {.entry = {.count = 1, .reusable = false}}, SHIFT(451),
-  [979] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
-  [981] = {.entry = {.count = 1, .reusable = true}}, SHIFT(444),
-  [983] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
-  [985] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_optional_positionals_repeat1, 2),
-  [987] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_optional_positionals_repeat1, 2), SHIFT_REPEAT(429),
-  [990] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
-  [992] = {.entry = {.count = 1, .reusable = false}}, SHIFT(84),
-  [994] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
-  [996] = {.entry = {.count = 1, .reusable = false}}, SHIFT(88),
-  [998] = {.entry = {.count = 1, .reusable = true}}, SHIFT(387),
-  [1000] = {.entry = {.count = 1, .reusable = true}}, SHIFT(249),
-  [1002] = {.entry = {.count = 1, .reusable = false}}, SHIFT(408),
-  [1004] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61),
-  [1006] = {.entry = {.count = 1, .reusable = true}}, SHIFT(406),
-  [1008] = {.entry = {.count = 1, .reusable = true}}, SHIFT(331),
-  [1010] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
-  [1012] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247),
-  [1014] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trailing_positionals, 2),
-  [1016] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_trailing_positionals, 2), SHIFT(29),
-  [1019] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_type_parameters_repeat1, 2), SHIFT_REPEAT(262),
-  [1022] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_type_parameters_repeat1, 2),
+  [661] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_member, 4),
+  [663] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_member, 1, .production_id = 1),
+  [665] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_class_decl_repeat1, 1),
+  [667] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_singleton_method_name, 3),
+  [669] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_alias_member, 3, .production_id = 17),
+  [671] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_superclass, 3, .production_id = 16),
+  [673] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_prepend_member, 3),
+  [675] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_extend_member, 3),
+  [677] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_include_member, 3),
+  [679] = {.entry = {.count = 1, .reusable = true}}, SHIFT(163),
+  [681] = {.entry = {.count = 1, .reusable = true}}, SHIFT(458),
+  [683] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
+  [685] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2),
+  [687] = {.entry = {.count = 1, .reusable = true}}, SHIFT(367),
+  [689] = {.entry = {.count = 1, .reusable = true}}, SHIFT(392),
+  [691] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
+  [693] = {.entry = {.count = 1, .reusable = true}}, SHIFT(470),
+  [695] = {.entry = {.count = 1, .reusable = true}}, SHIFT(199),
+  [697] = {.entry = {.count = 1, .reusable = true}}, SHIFT(171),
+  [699] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175),
+  [701] = {.entry = {.count = 1, .reusable = true}}, SHIFT(168),
+  [703] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(469),
+  [706] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(468),
+  [709] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(463),
+  [712] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(462),
+  [715] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(459),
+  [718] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2),
+  [720] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(69),
+  [723] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(458),
+  [726] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(273),
+  [729] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 2), SHIFT_REPEAT(68),
+  [732] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_program_repeat1, 2),
+  [734] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_program_repeat1, 2), SHIFT_REPEAT(278),
+  [737] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_directive, 2),
+  [739] = {.entry = {.count = 1, .reusable = true}}, SHIFT(287),
+  [741] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_global_decl, 3),
+  [743] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_use_directive_repeat1, 2),
+  [745] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_use_directive_repeat1, 2), SHIFT_REPEAT(287),
+  [748] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_clause, 1, .production_id = 2),
+  [750] = {.entry = {.count = 1, .reusable = true}}, SHIFT(471),
+  [752] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_directive, 3),
+  [754] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_clause, 2),
+  [756] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_use_clause, 3, .production_id = 10),
+  [758] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decl, 2, .production_id = 3),
+  [760] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decl, 1, .production_id = 1),
+  [762] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_member, 2, .production_id = 3),
+  [764] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interface_member, 1, .production_id = 1),
+  [766] = {.entry = {.count = 1, .reusable = true}}, SHIFT(325),
+  [768] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_interface_decl_repeat1, 1),
+  [770] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90),
+  [772] = {.entry = {.count = 1, .reusable = true}}, SHIFT(433),
+  [774] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type_parameters, 4),
+  [776] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_type_parameters, 3),
+  [778] = {.entry = {.count = 1, .reusable = true}}, SHIFT(299),
+  [780] = {.entry = {.count = 1, .reusable = true}}, SHIFT(472),
+  [782] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
+  [784] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_var_name, 1),
+  [786] = {.entry = {.count = 1, .reusable = true}}, SHIFT(344),
+  [788] = {.entry = {.count = 1, .reusable = true}}, SHIFT(281),
+  [790] = {.entry = {.count = 1, .reusable = true}}, SHIFT(420),
+  [792] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameter, 1),
+  [794] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
+  [796] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31),
+  [798] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122),
+  [800] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
+  [802] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
+  [804] = {.entry = {.count = 1, .reusable = true}}, SHIFT(111),
+  [806] = {.entry = {.count = 1, .reusable = false}}, SHIFT_EXTRA(),
+  [808] = {.entry = {.count = 1, .reusable = false}}, SHIFT(71),
+  [810] = {.entry = {.count = 1, .reusable = true}}, SHIFT(200),
+  [812] = {.entry = {.count = 1, .reusable = false}}, SHIFT(128),
+  [814] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
+  [816] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_visibility, 1),
+  [818] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_visibility, 1),
+  [820] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_optional_keywords, 4, .production_id = 35),
+  [822] = {.entry = {.count = 1, .reusable = true}}, SHIFT(260),
+  [824] = {.entry = {.count = 1, .reusable = true}}, SHIFT(411),
+  [826] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_required_keywords, 3, .production_id = 33),
+  [828] = {.entry = {.count = 1, .reusable = true}}, SHIFT(256),
+  [830] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
+  [832] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_tuple_type_repeat1, 2),
+  [834] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__record_type_single, 3, .production_id = 29),
+  [836] = {.entry = {.count = 1, .reusable = false}}, SHIFT(107),
+  [838] = {.entry = {.count = 1, .reusable = false}}, SHIFT(314),
+  [840] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 3),
+  [842] = {.entry = {.count = 1, .reusable = true}}, SHIFT(447),
+  [844] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 7),
+  [846] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
+  [848] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
+  [850] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_type_parameter, 3),
+  [852] = {.entry = {.count = 1, .reusable = true}}, SHIFT(252),
+  [854] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_namespace, 2),
+  [856] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_namespace, 2),
+  [858] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 8),
+  [860] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 9),
+  [862] = {.entry = {.count = 1, .reusable = false}}, SHIFT(99),
+  [864] = {.entry = {.count = 1, .reusable = false}}, SHIFT(319),
+  [866] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 11),
+  [868] = {.entry = {.count = 1, .reusable = false}}, SHIFT(315),
+  [870] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_namespace, 3),
+  [872] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_namespace, 3),
+  [874] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_type_parameter, 2),
+  [876] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_type_parameter, 1),
+  [878] = {.entry = {.count = 1, .reusable = true}}, SHIFT(437),
+  [880] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61),
+  [882] = {.entry = {.count = 1, .reusable = false}}, SHIFT(312),
+  [884] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_namespace, 1),
+  [886] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_namespace, 1),
+  [888] = {.entry = {.count = 1, .reusable = false}}, SHIFT(117),
+  [890] = {.entry = {.count = 1, .reusable = false}}, SHIFT(320),
+  [892] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_literal_repeat1, 2),
+  [894] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_literal_repeat1, 2), SHIFT_REPEAT(313),
+  [897] = {.entry = {.count = 1, .reusable = false}}, SHIFT(313),
+  [899] = {.entry = {.count = 1, .reusable = false}}, SHIFT(119),
+  [901] = {.entry = {.count = 1, .reusable = true}}, SHIFT(353),
+  [903] = {.entry = {.count = 1, .reusable = true}}, SHIFT(417),
+  [905] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_string_literal_repeat2, 2),
+  [907] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_string_literal_repeat2, 2), SHIFT_REPEAT(320),
+  [910] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 5),
+  [912] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameters, 2),
+  [914] = {.entry = {.count = 1, .reusable = false}}, SHIFT(399),
+  [916] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
+  [918] = {.entry = {.count = 1, .reusable = true}}, SHIFT(404),
+  [920] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_optional_positionals, 2),
+  [922] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_optional_positionals, 2), SHIFT(418),
+  [925] = {.entry = {.count = 1, .reusable = true}}, SHIFT(393),
+  [927] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
+  [929] = {.entry = {.count = 1, .reusable = true}}, SHIFT(354),
+  [931] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120),
+  [933] = {.entry = {.count = 1, .reusable = true}}, SHIFT(474),
+  [935] = {.entry = {.count = 1, .reusable = true}}, SHIFT(115),
+  [937] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_optional_positionals_repeat1, 2),
+  [939] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_optional_positionals_repeat1, 2), SHIFT_REPEAT(418),
+  [942] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_required_positionals, 1),
+  [944] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_required_positionals, 1), SHIFT(26),
+  [947] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_required_positionals, 2),
+  [949] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_required_positionals, 2), SHIFT(26),
+  [952] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_record_type_repeat1, 2, .production_id = 31), SHIFT_REPEAT(372),
+  [955] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_record_type_repeat1, 2, .production_id = 31),
+  [957] = {.entry = {.count = 1, .reusable = false}}, SHIFT(83),
+  [959] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
+  [961] = {.entry = {.count = 1, .reusable = false}}, SHIFT(94),
+  [963] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trailing_positionals, 2),
+  [965] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_trailing_positionals, 2), SHIFT(26),
+  [968] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_tuple_type_repeat1, 2), SHIFT_REPEAT(60),
+  [971] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
+  [973] = {.entry = {.count = 1, .reusable = false}}, SHIFT(423),
+  [975] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
+  [977] = {.entry = {.count = 1, .reusable = true}}, SHIFT(422),
+  [979] = {.entry = {.count = 1, .reusable = true}}, SHIFT(268),
+  [981] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139),
+  [983] = {.entry = {.count = 1, .reusable = false}}, SHIFT(449),
+  [985] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
+  [987] = {.entry = {.count = 1, .reusable = true}}, SHIFT(446),
+  [989] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
+  [991] = {.entry = {.count = 1, .reusable = false}}, SHIFT(473),
+  [993] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
+  [995] = {.entry = {.count = 1, .reusable = true}}, SHIFT(464),
+  [997] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_variable, 1),
+  [999] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
+  [1001] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_trailing_positionals, 1),
+  [1003] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_trailing_positionals, 1), SHIFT(26),
+  [1006] = {.entry = {.count = 1, .reusable = true}}, SHIFT(124),
+  [1008] = {.entry = {.count = 1, .reusable = true}}, SHIFT(330),
+  [1010] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123),
+  [1012] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_required_positionals_repeat1, 2),
+  [1014] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_required_positionals_repeat1, 2), SHIFT_REPEAT(26),
+  [1017] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_optional_positionals, 3),
+  [1019] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym_optional_positionals, 3), SHIFT(418),
+  [1022] = {.entry = {.count = 1, .reusable = true}}, SHIFT(254),
   [1024] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_self_type_binding, 5),
-  [1026] = {.entry = {.count = 1, .reusable = true}}, SHIFT(119),
-  [1028] = {.entry = {.count = 1, .reusable = true}}, SHIFT(457),
-  [1030] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
-  [1032] = {.entry = {.count = 1, .reusable = true}}, SHIFT(469),
-  [1034] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_const_name, 1),
-  [1036] = {.entry = {.count = 1, .reusable = true}}, SHIFT(291),
-  [1038] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
-  [1040] = {.entry = {.count = 1, .reusable = true}}, SHIFT(470),
-  [1042] = {.entry = {.count = 1, .reusable = true}}, SHIFT(313),
-  [1044] = {.entry = {.count = 1, .reusable = true}}, SHIFT(242),
-  [1046] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
-  [1048] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
-  [1050] = {.entry = {.count = 1, .reusable = true}}, SHIFT(312),
-  [1052] = {.entry = {.count = 1, .reusable = true}}, SHIFT(250),
-  [1054] = {.entry = {.count = 1, .reusable = true}}, SHIFT(232),
-  [1056] = {.entry = {.count = 1, .reusable = true}}, SHIFT(314),
-  [1058] = {.entry = {.count = 1, .reusable = true}}, SHIFT(253),
-  [1060] = {.entry = {.count = 1, .reusable = true}}, SHIFT(248),
-  [1062] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
-  [1064] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
-  [1066] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_optional_positionals_repeat1, 3),
-  [1068] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_bound_type, 1),
-  [1070] = {.entry = {.count = 1, .reusable = true}}, SHIFT(251),
-  [1072] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generics_bound, 2),
-  [1074] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
-  [1076] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameter, 2),
-  [1078] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_const_name, 2),
-  [1080] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_type_parameter, 4),
-  [1082] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
-  [1084] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rest_positional, 2),
-  [1086] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_record_type_repeat1, 2, .production_id = 14),
-  [1088] = {.entry = {.count = 1, .reusable = true}}, SHIFT(402),
-  [1090] = {.entry = {.count = 1, .reusable = true}}, SHIFT(234),
-  [1092] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_splat_keyword, 2),
-  [1094] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
-  [1096] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
-  [1098] = {.entry = {.count = 1, .reusable = true}}, SHIFT(217),
-  [1100] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
-  [1102] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
-  [1104] = {.entry = {.count = 1, .reusable = true}}, SHIFT(420),
-  [1106] = {.entry = {.count = 1, .reusable = true}}, SHIFT(427),
-  [1108] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
-  [1110] = {.entry = {.count = 1, .reusable = true}}, SHIFT(423),
-  [1112] = {.entry = {.count = 1, .reusable = true}}, SHIFT(458),
-  [1114] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
-  [1116] = {.entry = {.count = 1, .reusable = true}}, SHIFT(442),
-  [1118] = {.entry = {.count = 1, .reusable = true}}, SHIFT(223),
-  [1120] = {.entry = {.count = 1, .reusable = true}}, SHIFT(367),
-  [1122] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 5),
-  [1124] = {.entry = {.count = 1, .reusable = true}}, SHIFT(216),
-  [1126] = {.entry = {.count = 1, .reusable = true}}, SHIFT(134),
-  [1128] = {.entry = {.count = 1, .reusable = true}}, SHIFT(433),
-  [1130] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33),
-  [1132] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generics_variance, 1),
-  [1134] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
-  [1136] = {.entry = {.count = 1, .reusable = true}}, SHIFT(439),
-  [1138] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
-  [1140] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_required_keywords, 5, .production_id = 21),
-  [1142] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 6),
-  [1144] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
-  [1146] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
-  [1148] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
-  [1150] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_optional_keywords, 6, .production_id = 23),
-  [1152] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
-  [1154] = {.entry = {.count = 1, .reusable = true}}, SHIFT(218),
-  [1156] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 7),
-  [1158] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
-  [1160] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
-  [1162] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
-  [1164] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keywords, 1),
-  [1166] = {.entry = {.count = 1, .reusable = true}}, SHIFT(283),
-  [1168] = {.entry = {.count = 1, .reusable = true}}, SHIFT(407),
-  [1170] = {.entry = {.count = 1, .reusable = true}}, SHIFT(382),
-  [1172] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [1174] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
-  [1176] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
-  [1178] = {.entry = {.count = 1, .reusable = true}}, SHIFT(418),
-  [1180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(419),
-  [1182] = {.entry = {.count = 1, .reusable = true}}, SHIFT(421),
-  [1184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(422),
-  [1186] = {.entry = {.count = 1, .reusable = true}}, SHIFT(434),
-  [1188] = {.entry = {.count = 1, .reusable = true}}, SHIFT(300),
-  [1190] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
-  [1192] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
-  [1194] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
-  [1196] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
-  [1198] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
-  [1200] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
+  [1026] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
+  [1028] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32),
+  [1030] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_method_type_parameters_repeat1, 2), SHIFT_REPEAT(393),
+  [1033] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_method_type_parameters_repeat1, 2),
+  [1035] = {.entry = {.count = 1, .reusable = true}}, SHIFT(138),
+  [1037] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_module_type_parameters_repeat1, 2), SHIFT_REPEAT(268),
+  [1040] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_module_type_parameters_repeat1, 2),
+  [1042] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102),
+  [1044] = {.entry = {.count = 1, .reusable = true}}, SHIFT(322),
+  [1046] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
+  [1048] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generics_bound, 2),
+  [1050] = {.entry = {.count = 1, .reusable = true}}, SHIFT(476),
+  [1052] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_optional_positionals_repeat1, 3),
+  [1054] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_bound_type, 1),
+  [1056] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
+  [1058] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_const_name, 2),
+  [1060] = {.entry = {.count = 1, .reusable = true}}, SHIFT(294),
+  [1062] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
+  [1064] = {.entry = {.count = 1, .reusable = true}}, SHIFT(255),
+  [1066] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
+  [1068] = {.entry = {.count = 1, .reusable = true}}, SHIFT(448),
+  [1070] = {.entry = {.count = 1, .reusable = true}}, SHIFT(262),
+  [1072] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
+  [1074] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_rest_positional, 2),
+  [1076] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module_type_parameter, 4),
+  [1078] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
+  [1080] = {.entry = {.count = 1, .reusable = true}}, SHIFT(258),
+  [1082] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_const_name, 1),
+  [1084] = {.entry = {.count = 1, .reusable = true}}, SHIFT(475),
+  [1086] = {.entry = {.count = 1, .reusable = true}}, SHIFT(301),
+  [1088] = {.entry = {.count = 1, .reusable = true}}, SHIFT(259),
+  [1090] = {.entry = {.count = 1, .reusable = true}}, SHIFT(238),
+  [1092] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_record_type_repeat1, 2, .production_id = 25),
+  [1094] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_parameter, 2),
+  [1096] = {.entry = {.count = 1, .reusable = true}}, SHIFT(290),
+  [1098] = {.entry = {.count = 1, .reusable = true}}, SHIFT(250),
+  [1100] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
+  [1102] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3),
+  [1104] = {.entry = {.count = 1, .reusable = true}}, SHIFT(426),
+  [1106] = {.entry = {.count = 1, .reusable = true}}, SHIFT(222),
+  [1108] = {.entry = {.count = 1, .reusable = true}}, SHIFT(136),
+  [1110] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
+  [1112] = {.entry = {.count = 1, .reusable = true}}, SHIFT(429),
+  [1114] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
+  [1116] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_keywords, 1),
+  [1118] = {.entry = {.count = 1, .reusable = true}}, SHIFT(466),
+  [1120] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
+  [1122] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51),
+  [1124] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
+  [1126] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 5),
+  [1128] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28),
+  [1130] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_generics_variance, 1),
+  [1132] = {.entry = {.count = 1, .reusable = true}}, SHIFT(406),
+  [1134] = {.entry = {.count = 1, .reusable = true}}, SHIFT(412),
+  [1136] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105),
+  [1138] = {.entry = {.count = 1, .reusable = true}}, SHIFT(439),
+  [1140] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [1142] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
+  [1144] = {.entry = {.count = 1, .reusable = true}}, SHIFT(224),
+  [1146] = {.entry = {.count = 1, .reusable = true}}, SHIFT(227),
+  [1148] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [1150] = {.entry = {.count = 1, .reusable = true}}, SHIFT(324),
+  [1152] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_required_keywords, 5, .production_id = 33),
+  [1154] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 6),
+  [1156] = {.entry = {.count = 1, .reusable = true}}, SHIFT(63),
+  [1158] = {.entry = {.count = 1, .reusable = true}}, SHIFT(371),
+  [1160] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [1162] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_optional_keywords, 6, .production_id = 35),
+  [1164] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
+  [1166] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
+  [1168] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74),
+  [1170] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_block, 7),
+  [1172] = {.entry = {.count = 1, .reusable = true}}, SHIFT(465),
+  [1174] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
+  [1176] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
+  [1178] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
+  [1180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(225),
+  [1182] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
+  [1184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303),
+  [1186] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
+  [1188] = {.entry = {.count = 1, .reusable = true}}, SHIFT(408),
+  [1190] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
+  [1192] = {.entry = {.count = 1, .reusable = true}}, SHIFT(438),
+  [1194] = {.entry = {.count = 1, .reusable = true}}, SHIFT(402),
+  [1196] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
+  [1198] = {.entry = {.count = 1, .reusable = true}}, SHIFT(403),
+  [1200] = {.entry = {.count = 1, .reusable = true}}, SHIFT(405),
+  [1202] = {.entry = {.count = 1, .reusable = true}}, SHIFT(384),
+  [1204] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240),
+  [1206] = {.entry = {.count = 1, .reusable = true}}, SHIFT(415),
+  [1208] = {.entry = {.count = 1, .reusable = true}}, SHIFT(428),
+  [1210] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
+  [1212] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75),
+  [1214] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
+  [1216] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_splat_keyword, 2),
 };
 
 #ifdef __cplusplus