Unified: Rename predicates

Author: paldepind

unified/extractor/ast_types.yml

@@ -505,7 +505,7 @@ named:
     type_parameter*: type_parameter
     type_constraint*: type_constraint
     base_type*: base_type
-    direct_member*: member
+    member*: member
 
   # One of the base types of a class declaration.
   #

unified/extractor/src/languages/swift/swift.rs

@@ -550,7 +550,7 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                     modifier: [(modifier "chained_declaration") if { ctx.is_chained }]
                     modifier: (modifier "enum_case")
                     name_node: (identifier #{name})
-                    direct_member: {constructor}))
+                    member: {constructor}))
             }
         ),
         rule!(
@@ -1401,8 +1401,8 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                     type_constraint: {parameter_constraints}
                     type_constraint: {declaration_constraints}
                     base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
-                    direct_member: {members}
-                    direct_member: {implicit_initializer}))
+                    member: {members}
+                    member: {implicit_initializer}))
             }
         ),
         // Enum class declaration: same as a regular class but with an enum body.
@@ -1426,7 +1426,7 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                 type_constraint: {parameter_constraints}
                 type_constraint: {declaration_constraints}
                 base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
-                direct_member: {members})
+                member: {members})
         ),
         // A `struct` declaration, including an implicit parameter-less `init`
         // when no explicit initializer is present.
@@ -1452,8 +1452,8 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                     type_constraint: {parameter_constraints}
                     type_constraint: {declaration_constraints}
                     base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
-                    direct_member: {members}
-                    direct_member: {implicit_initializer}))
+                    member: {members}
+                    member: {implicit_initializer}))
             }
         ),
         // Protocol declaration
@@ -1474,7 +1474,7 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                 type_parameter: {params}
                 type_constraint: {declaration_constraints}
                 base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
-                direct_member: {members})
+                member: {members})
         ),
         // An `extension Foo.Bar { … }` is likewise a `class_like_declaration`.
         rule!(
@@ -1490,7 +1490,7 @@ fn translation_rules() -> Vec<Rule<SwiftContext>> {
                 modifier: {mods}
                 extension_target: {extendedType}
                 base_type: {bases.into_iter().map(|ty| tree!((base_type type: {ty})))}
-                direct_member: {members})
+                member: {members})
         ),
         // A member of a type declaration unwraps to the contained declaration.
         rule!((memberBlockItem decl: _* @d) => member* { d }),

unified/extractor/tests/corpus/swift/conditional-compilation/conditional-compilation-in-attributes.output

@@ -44,8 +44,8 @@ sourceFile
               leftBrace: {
               rightBrace: }
               statements:
-          name: identifier "f"
           modifiers:
+          name: identifier "f"
           signature:
             functionSignature
               parameterClause:

unified/extractor/tests/corpus/swift/conditional-compilation/conditional-compilation-in-class-body.output

@@ -78,10 +78,10 @@ top_level source="⟨body⟩"
   body:
     block source="⟨stmt⟩"
       stmt:
-        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n    ⟨direct_member⟩\n}"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n    ⟨member⟩\n}"
           modifier: modifier "class" source="class"
           name_node: identifier "C" source="C"
-          direct_member:
+          member:
             if_expr source="#if ⟨condition⟩\n        ⟨then⟩\n    #endif"
               modifier: modifier "conditional_compilation" source=""
               condition: identifier "DEBUG" source="DEBUG"

unified/extractor/tests/corpus/swift/conditional-compilation/conditional-compilation-in-switch-cases.output

@@ -87,8 +87,8 @@ sourceFile
                             declReferenceExpr
                               baseName: identifier "x"
                           switchKeyword: switch
-          name: identifier "f"
           modifiers:
+          name: identifier "f"
           signature:
             functionSignature
               parameterClause:

unified/extractor/tests/corpus/swift/conditional-compilation/conditional-compilation-nested.output

@@ -87,8 +87,8 @@ sourceFile
                                       leftBrace: {
                                       rightBrace: }
                                       statements:
-                                  name: identifier "f"
                                   modifiers:
+                                  name: identifier "f"
                                   signature:
                                     functionSignature
                                       parameterClause:
@@ -140,6 +140,7 @@ sourceFile
       item:
         protocolDecl
           attributes:
+          modifiers:
           name: identifier "P"
           memberBlock:
             memberBlock
@@ -156,15 +157,14 @@ sourceFile
                               decl:
                                 associatedTypeDecl
                                   attributes:
-                                  name: identifier "T"
                                   modifiers:
+                                  name: identifier "T"
                                   associatedtypeKeyword: associatedtype
                           condition:
                             declReferenceExpr
                               baseName: identifier "DEBUG"
                           poundKeyword: #if
                       poundEndif: #endif
-          modifiers:
           protocolKeyword: protocol
     codeBlockItem
       item:
@@ -256,8 +256,8 @@ sourceFile
                                 booleanLiteralExpr
                                   literal: true
                           ifKeyword: if
-          name: identifier "use"
           modifiers:
+          name: identifier "use"
           signature:
             functionSignature
               parameterClause:
@@ -309,10 +309,10 @@ top_level source="⟨body⟩"
                               pattern: identifier "third" source="third"
                               value: int_literal "3" source="3"
           else: block "#else" source="#else"
-        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n    ⟨direct_member⟩\n}"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n    ⟨member⟩\n}"
           modifier: modifier "protocol" source="protocol"
           name_node: identifier "P" source="P"
-          direct_member:
+          member:
             if_expr source="#if ⟨condition⟩\n        ⟨then⟩\n    #endif"
               modifier: modifier "conditional_compilation" source=""
               condition: identifier "DEBUG" source="DEBUG"

unified/extractor/tests/corpus/swift/conditional-compilation/conditional-compilation-with-elseif-in-class-body.output

@@ -17,6 +17,7 @@ sourceFile
       item:
         classDecl
           attributes:
+          modifiers:
           name: identifier "C"
           memberBlock:
             memberBlock
@@ -113,7 +114,6 @@ sourceFile
                                   initKeyword: init
                           poundKeyword: #else
                       poundEndif: #endif
-          modifiers:
           classKeyword: class
 
 ---
@@ -122,10 +122,10 @@ top_level source="⟨body⟩"
   body:
     block source="⟨stmt⟩"
       stmt:
-        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n    ⟨direct_member⟩\n}"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n    ⟨member⟩\n}"
           modifier: modifier "class" source="class"
           name_node: identifier "C" source="C"
-          direct_member:
+          member:
             if_expr source="#if ⟨condition⟩\n        ⟨then⟩\n    ⟨else⟩\n    #endif"
               modifier: modifier "conditional_compilation" source=""
               condition: identifier "DEBUG" source="DEBUG"

unified/extractor/tests/corpus/swift/control-flow/discard-statement.output

@@ -67,13 +67,13 @@ top_level source="⟨body⟩"
   body:
     block source="⟨stmt⟩"
       stmt:
-        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨base_type⟩ {\n  ⟨direct_member⟩\n}"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨base_type⟩ {\n  ⟨member⟩\n}"
           modifier: modifier "struct" source="struct"
           name_node: identifier "Resource" source="Resource"
           base_type:
             base_type source="⟨type⟩"
               type: unsupported_node "~Copyable" source="~Copyable"
-          direct_member:
+          member:
             function_declaration source="⟨modifier⟩ func ⟨name_node⟩() ⟨body⟩"
               modifier: modifier "consuming" source="consuming"
               name_node: identifier "close" source="close"

unified/extractor/tests/corpus/swift/expressions/super-expression.output

@@ -146,10 +146,10 @@ top_level source="⟨body⟩"
   body:
     block source="⟨stmt⟩\n\n⟨stmt⟩"
       stmt:
-        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨direct_member⟩\n\n  ⟨direct_member⟩\n}"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {\n  ⟨member⟩\n\n  ⟨member⟩\n}"
           modifier: modifier "class" source="class"
           name_node: identifier "Base" source="Base"
-          direct_member:
+          member:
             variable_declaration source="⟨modifier⟩ ⟨pattern⟩ = ⟨value⟩"
               modifier: modifier "var" source="var"
               pattern: identifier "value" source="value"
@@ -161,13 +161,13 @@ top_level source="⟨body⟩"
               modifier: modifier "generated" source=""
               name_node: identifier "init" source=""
               body: block source=""
-        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨base_type⟩ {\n  ⟨direct_member⟩\n}"
+        class_like_declaration source="⟨modifier⟩ ⟨name_node⟩: ⟨base_type⟩ {\n  ⟨member⟩\n}"
           modifier: modifier "class" source="class"
           name_node: identifier "Derived" source="Derived"
           base_type:
             base_type source="⟨type⟩"
               type: identifier "Base" source="Base"
-          direct_member:
+          member:
             function_declaration source="⟨modifier⟩ func ⟨name_node⟩() ⟨body⟩"
               modifier: modifier "override" source="override"
               name_node: identifier "update" source="update"

unified/extractor/tests/corpus/swift/functions/constructor-call-with-type-arguments.output

@@ -83,7 +83,7 @@ top_level source="⟨body⟩"
         class_like_declaration source="⟨modifier⟩ ⟨name_node⟩ {}"
           modifier: modifier "class" source="class"
           name_node: identifier "Foo" source="Foo"
-          direct_member:
+          member:
             constructor_declaration source=""
               modifier: modifier "generated" source=""
               name_node: identifier "init" source=""
@@ -94,7 +94,7 @@ top_level source="⟨body⟩"
           type_parameter:
             type_parameter source="⟨name_node⟩"
               name_node: identifier "T" source="T"
-          direct_member:
+          member:
             constructor_declaration source=""
               modifier: modifier "generated" source=""
               name_node: identifier "init" source=""