unified: regenerate files

Author: tausbn

unified/extractor/tree-sitter-swift/node-types.yml

@@ -56,6 +56,44 @@ supertypes:
     - tuple_expression
     - value_pack_expansion
     - value_parameter_pack
+  global_declaration:
+    - associatedtype_declaration
+    - class_declaration
+    - function_declaration
+    - import_declaration
+    - init_declaration
+    - macro_declaration
+    - operator_declaration
+    - precedence_group_declaration
+    - property_declaration
+    - protocol_declaration
+    - typealias_declaration
+  local_declaration:
+    - class_declaration
+    - function_declaration
+    - property_declaration
+    - typealias_declaration
+  protocol_member_declaration:
+    - associatedtype_declaration
+    - deinit_declaration
+    - init_declaration
+    - protocol_function_declaration
+    - protocol_property_declaration
+    - subscript_declaration
+    - typealias_declaration
+  type_level_declaration:
+    - associatedtype_declaration
+    - class_declaration
+    - deinit_declaration
+    - function_declaration
+    - import_declaration
+    - init_declaration
+    - operator_declaration
+    - precedence_group_declaration
+    - property_declaration
+    - protocol_declaration
+    - subscript_declaration
+    - typealias_declaration
   unannotated_type:
     - array_type
     - dictionary_type
@@ -128,7 +166,7 @@ named:
     target: expression
     type: type
   class_body:
-    $children*: [associatedtype_declaration, class_declaration, deinit_declaration, function_declaration, import_declaration, init_declaration, multiline_comment, operator_declaration, precedence_group_declaration, property_declaration, protocol_declaration, subscript_declaration, typealias_declaration]
+    $children*: [multiline_comment, type_level_declaration]
   class_declaration:
     $children*: [attribute, inheritance_modifier, inheritance_specifier, modifiers, ownership_modifier, property_behavior_modifier, type_constraints, type_parameters]
     body: [class_body, enum_class_body]
@@ -188,7 +226,7 @@ named:
     $children*: [catch_block, statements]
   else:
   enum_class_body:
-    $children*: [associatedtype_declaration, class_declaration, deinit_declaration, enum_entry, function_declaration, import_declaration, init_declaration, operator_declaration, precedence_group_declaration, property_declaration, protocol_declaration, subscript_declaration, typealias_declaration]
+    $children*: [enum_entry, type_level_declaration]
   enum_entry:
     $children?: modifiers
     data_contents*: enum_type_parameters
@@ -372,8 +410,7 @@ named:
     value*: expression
   property_modifier:
   protocol_body:
-    $children*: [associatedtype_declaration, deinit_declaration, init_declaration, protocol_function_declaration, protocol_property_declaration, subscript_declaration, typealias_declaration]
-    body*: protocol_function_declaration
+    $children*: protocol_member_declaration
   protocol_composition_type:
     $children+: unannotated_type
   protocol_declaration:
@@ -382,9 +419,10 @@ named:
     declaration_kind: "protocol"
     name: type_identifier
   protocol_function_declaration:
-    $children*: [attribute, modifiers, parameter, statements, throws, throws_clause, type_constraints, type_parameters]
+    $children*: [attribute, modifiers, parameter, throws, throws_clause, type_constraints, type_parameters]
+    body?: function_body
     default_value*: expression
-    name?: [referenceable_operator, simple_identifier]
+    name: [referenceable_operator, simple_identifier]
     return_type?: [implicitly_unwrapped_type, type]
   protocol_property_declaration:
     $children+: [modifiers, protocol_property_requirements, type_annotation, type_constraints]
@@ -421,11 +459,11 @@ named:
   shebang_line:
   simple_identifier:
   source_file:
-    $children*: [associatedtype_declaration, class_declaration, do_statement, expression, for_statement, function_declaration, guard_statement, import_declaration, init_declaration, macro_declaration, operator_declaration, precedence_group_declaration, property_declaration, protocol_declaration, repeat_while_statement, shebang_line, statement_label, throw_keyword, typealias_declaration, while_statement]
+    $children*: [do_statement, expression, for_statement, global_declaration, guard_statement, repeat_while_statement, shebang_line, statement_label, throw_keyword, while_statement]
   special_literal:
   statement_label:
   statements:
-    $children+: [class_declaration, control_transfer_statement, do_statement, expression, for_statement, function_declaration, guard_statement, property_declaration, repeat_while_statement, statement_label, typealias_declaration, while_statement]
+    $children+: [control_transfer_statement, do_statement, expression, for_statement, guard_statement, local_declaration, repeat_while_statement, statement_label, while_statement]
   str_escaped_char:
   subscript_declaration:
     $children+: [attribute, computed_property, modifiers, parameter, type_constraints, type_parameters]

unified/extractor/tree-sitter-swift/src/grammar.json

@@ -5416,7 +5416,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "_local_declaration"
+          "name": "local_declaration"
         },
         {
           "type": "SYMBOL",
@@ -5437,7 +5437,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "_global_declaration"
+          "name": "global_declaration"
         },
         {
           "type": "SYMBOL",
@@ -6056,7 +6056,7 @@
         }
       ]
     },
-    "_global_declaration": {
+    "global_declaration": {
       "type": "CHOICE",
       "members": [
         {
@@ -6105,7 +6105,7 @@
         }
       ]
     },
-    "_type_level_declaration": {
+    "type_level_declaration": {
       "type": "CHOICE",
       "members": [
         {
@@ -6158,7 +6158,7 @@
         }
       ]
     },
-    "_local_declaration": {
+    "local_declaration": {
       "type": "CHOICE",
       "members": [
         {
@@ -7921,7 +7921,7 @@
           "members": [
             {
               "type": "SYMBOL",
-              "name": "_type_level_declaration"
+              "name": "type_level_declaration"
             },
             {
               "type": "REPEAT",
@@ -7934,7 +7934,7 @@
                   },
                   {
                     "type": "SYMBOL",
-                    "name": "_type_level_declaration"
+                    "name": "type_level_declaration"
                   }
                 ]
               }
@@ -8402,7 +8402,7 @@
               },
               {
                 "type": "SYMBOL",
-                "name": "_type_level_declaration"
+                "name": "type_level_declaration"
               }
             ]
           }
@@ -8847,7 +8847,7 @@
           "members": [
             {
               "type": "SYMBOL",
-              "name": "_protocol_member_declaration"
+              "name": "protocol_member_declaration"
             },
             {
               "type": "REPEAT",
@@ -8860,7 +8860,7 @@
                   },
                   {
                     "type": "SYMBOL",
-                    "name": "_protocol_member_declaration"
+                    "name": "protocol_member_declaration"
                   }
                 ]
               }
@@ -8881,38 +8881,12 @@
         }
       ]
     },
-    "_protocol_member_declaration": {
+    "protocol_member_declaration": {
       "type": "CHOICE",
       "members": [
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "_bodyless_function_declaration"
-              },
-              {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "FIELD",
-                    "name": "body",
-                    "content": {
-                      "type": "SYMBOL",
-                      "name": "function_body"
-                    }
-                  },
-                  {
-                    "type": "BLANK"
-                  }
-                ]
-              }
-            ]
-          },
-          "named": true,
-          "value": "protocol_function_declaration"
+          "type": "SYMBOL",
+          "name": "protocol_function_declaration"
         },
         {
           "type": "SYMBOL",
@@ -8940,6 +8914,31 @@
         }
       ]
     },
+    "protocol_function_declaration": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "_bodyless_function_declaration"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "body",
+              "content": {
+                "type": "SYMBOL",
+                "name": "function_body"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
     "init_declaration": {
       "type": "PREC_RIGHT",
       "value": 0,
@@ -11394,7 +11393,11 @@
   ],
   "supertypes": [
     "expression",
-    "unannotated_type"
+    "unannotated_type",
+    "global_declaration",
+    "type_level_declaration",
+    "local_declaration",
+    "protocol_member_declaration"
   ],
   "reserved": {}
 }