Skip to content

Rename children that refer to a MemberDeclBlock from members to memberBlock #1524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2023
Merged

Rename children that refer to a MemberDeclBlock from members to memberBlock #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public let DECL_NODES: [Node] = [
isOptional: true
),
Child(
name: "Members",
name: "MemberBlock",
kind: .node(kind: "MemberDeclBlock")
),
]
Expand Down Expand Up @@ -312,7 +312,7 @@ public let DECL_NODES: [Node] = [
isOptional: true
),
Child(
name: "Members",
name: "MemberBlock",
kind: .node(kind: "MemberDeclBlock")
),
]
Expand Down Expand Up @@ -654,7 +654,7 @@ public let DECL_NODES: [Node] = [
isOptional: true
),
Child(
name: "Members",
name: "MemberBlock",
kind: .node(kind: "MemberDeclBlock"),
description: "The cases and other members of this enum."
),
Expand Down Expand Up @@ -709,7 +709,7 @@ public let DECL_NODES: [Node] = [
isOptional: true
),
Child(
name: "Members",
name: "MemberBlock",
kind: .node(kind: "MemberDeclBlock")
),
]
Expand Down Expand Up @@ -1722,7 +1722,7 @@ public let DECL_NODES: [Node] = [
isOptional: true
),
Child(
name: "Members",
name: "MemberBlock",
kind: .node(kind: "MemberDeclBlock")
),
]
Expand Down Expand Up @@ -1824,7 +1824,7 @@ public let DECL_NODES: [Node] = [
isOptional: true
),
Child(
name: "Members",
name: "MemberBlock",
kind: .node(kind: "MemberDeclBlock")
),
]
Expand Down
2 changes: 1 addition & 1 deletion CodeGeneration/Sources/SyntaxSupport/Traits.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public let TRAITS: [Trait] = [
children: [
Child(name: "Attributes", kind: .node(kind: "AttributeList"), isOptional: true),
Child(name: "Modifiers", kind: .node(kind: "ModifierList"), isOptional: true),
Child(name: "Members", kind: .node(kind: "MemberDeclBlock")),
Child(name: "MemberBlock", kind: .node(kind: "MemberDeclBlock")),
]
),
Trait(
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftParser/Declarations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ extension Parser {
} else {
whereClause = nil
}
let members = self.parseMemberDeclList(introducer: extensionKeyword)
let memberBlock = self.parseMemberDeclList(introducer: extensionKeyword)
return RawExtensionDeclSyntax(
attributes: attrs.attributes,
modifiers: attrs.modifiers,
Expand All @@ -428,7 +428,7 @@ extension Parser {
extendedType: type,
inheritanceClause: inheritance,
genericWhereClause: whereClause,
members: members,
memberBlock: memberBlock,
arena: self.arena
)
}
Expand Down
88 changes: 74 additions & 14 deletions Sources/SwiftParser/Nominals.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ protocol NominalTypeDeclarationTrait {
primaryOrGenerics: PrimaryOrGenerics?,
inheritanceClause: RawTypeInheritanceClauseSyntax?,
genericWhereClause: RawGenericWhereClauseSyntax?,
members: RawMemberDeclBlockSyntax,
memberBlock: RawMemberDeclBlockSyntax,
arena: __shared SyntaxArena
)

Expand All @@ -43,10 +43,22 @@ extension RawProtocolDeclSyntax: NominalTypeDeclarationTrait {
primaryOrGenerics: RawPrimaryAssociatedTypeClauseSyntax?,
inheritanceClause: RawTypeInheritanceClauseSyntax?,
genericWhereClause: RawGenericWhereClauseSyntax?,
members: RawMemberDeclBlockSyntax,
memberBlock: RawMemberDeclBlockSyntax,
arena: __shared SyntaxArena
) {
self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, protocolKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, primaryAssociatedTypeClause: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
self.init(
attributes: attributes,
modifiers: modifiers,
unexpectedBeforeIntroducerKeyword,
protocolKeyword: introducerKeyword,
unexpectedBeforeIdentifier,
identifier: identifier,
primaryAssociatedTypeClause: primaryOrGenerics,
inheritanceClause: inheritanceClause,
genericWhereClause: genericWhereClause,
memberBlock: memberBlock,
arena: arena
)
}

static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawPrimaryAssociatedTypeClauseSyntax? {
Expand All @@ -65,10 +77,22 @@ extension RawClassDeclSyntax: NominalTypeDeclarationTrait {
primaryOrGenerics: RawGenericParameterClauseSyntax?,
inheritanceClause: RawTypeInheritanceClauseSyntax?,
genericWhereClause: RawGenericWhereClauseSyntax?,
members: RawMemberDeclBlockSyntax,
memberBlock: RawMemberDeclBlockSyntax,
arena: __shared SyntaxArena
) {
self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, classKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, genericParameterClause: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
self.init(
attributes: attributes,
modifiers: modifiers,
unexpectedBeforeIntroducerKeyword,
classKeyword: introducerKeyword,
unexpectedBeforeIdentifier,
identifier: identifier,
genericParameterClause: primaryOrGenerics,
inheritanceClause: inheritanceClause,
genericWhereClause: genericWhereClause,
memberBlock: memberBlock,
arena: arena
)
}

static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawGenericParameterClauseSyntax? {
Expand All @@ -87,10 +111,22 @@ extension RawActorDeclSyntax: NominalTypeDeclarationTrait {
primaryOrGenerics: RawGenericParameterClauseSyntax?,
inheritanceClause: RawTypeInheritanceClauseSyntax?,
genericWhereClause: RawGenericWhereClauseSyntax?,
members: RawMemberDeclBlockSyntax,
memberBlock: RawMemberDeclBlockSyntax,
arena: __shared SyntaxArena
) {
self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, actorKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, genericParameterClause: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
self.init(
attributes: attributes,
modifiers: modifiers,
unexpectedBeforeIntroducerKeyword,
actorKeyword: introducerKeyword,
unexpectedBeforeIdentifier,
identifier: identifier,
genericParameterClause: primaryOrGenerics,
inheritanceClause: inheritanceClause,
genericWhereClause: genericWhereClause,
memberBlock: memberBlock,
arena: arena
)
}

static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawGenericParameterClauseSyntax? {
Expand All @@ -109,10 +145,22 @@ extension RawStructDeclSyntax: NominalTypeDeclarationTrait {
primaryOrGenerics: RawGenericParameterClauseSyntax?,
inheritanceClause: RawTypeInheritanceClauseSyntax?,
genericWhereClause: RawGenericWhereClauseSyntax?,
members: RawMemberDeclBlockSyntax,
memberBlock: RawMemberDeclBlockSyntax,
arena: __shared SyntaxArena
) {
self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, structKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, genericParameterClause: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
self.init(
attributes: attributes,
modifiers: modifiers,
unexpectedBeforeIntroducerKeyword,
structKeyword: introducerKeyword,
unexpectedBeforeIdentifier,
identifier: identifier,
genericParameterClause: primaryOrGenerics,
inheritanceClause: inheritanceClause,
genericWhereClause: genericWhereClause,
memberBlock: memberBlock,
arena: arena
)
}

static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawGenericParameterClauseSyntax? {
Expand All @@ -131,10 +179,22 @@ extension RawEnumDeclSyntax: NominalTypeDeclarationTrait {
primaryOrGenerics: RawGenericParameterClauseSyntax?,
inheritanceClause: RawTypeInheritanceClauseSyntax?,
genericWhereClause: RawGenericWhereClauseSyntax?,
members: RawMemberDeclBlockSyntax,
memberBlock: RawMemberDeclBlockSyntax,
arena: __shared SyntaxArena
) {
self.init(attributes: attributes, modifiers: modifiers, unexpectedBeforeIntroducerKeyword, enumKeyword: introducerKeyword, unexpectedBeforeIdentifier, identifier: identifier, genericParameters: primaryOrGenerics, inheritanceClause: inheritanceClause, genericWhereClause: genericWhereClause, members: members, arena: arena)
self.init(
attributes: attributes,
modifiers: modifiers,
unexpectedBeforeIntroducerKeyword,
enumKeyword: introducerKeyword,
unexpectedBeforeIdentifier,
identifier: identifier,
genericParameters: primaryOrGenerics,
inheritanceClause: inheritanceClause,
genericWhereClause: genericWhereClause,
memberBlock: memberBlock,
arena: arena
)
}

static func parsePrimaryOrGenerics(_ parser: inout Parser) -> RawGenericParameterClauseSyntax? {
Expand Down Expand Up @@ -162,7 +222,7 @@ extension Parser {
primaryOrGenerics: nil,
inheritanceClause: nil,
genericWhereClause: nil,
members: RawMemberDeclBlockSyntax(
memberBlock: RawMemberDeclBlockSyntax(
leftBrace: RawTokenSyntax(missing: .leftBrace, arena: self.arena),
members: RawMemberDeclListSyntax(elements: [], arena: self.arena),
rightBrace: RawTokenSyntax(missing: .rightBrace, arena: self.arena),
Expand Down Expand Up @@ -194,7 +254,7 @@ extension Parser {
whereClause = nil
}

let members = self.parseMemberDeclList(introducer: introducerKeyword)
let memberBlock = self.parseMemberDeclList(introducer: introducerKeyword)
return T.init(
attributes: attrs.attributes,
modifiers: attrs.modifiers,
Expand All @@ -205,7 +265,7 @@ extension Parser {
primaryOrGenerics: primaryOrGenerics,
inheritanceClause: inheritance,
genericWhereClause: whereClause,
members: members,
memberBlock: memberBlock,
arena: self.arena
)
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftParserDiagnostics/PresenceUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class PresentMaker: SyntaxRewriter {
modifiers: node.modifiers,
structKeyword: .keyword(.struct, presence: .missing),
identifier: .identifier("<#declaration#>", leadingTrivia: leadingTriviaBeforePlaceholder),
members: MemberDeclBlockSyntax(
memberBlock: MemberDeclBlockSyntax(
leftBrace: .leftBraceToken(presence: .missing),
members: MemberDeclListSyntax([]),
rightBrace: .rightBraceToken(presence: .missing)
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftSyntax/generated/SyntaxTraits.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public protocol DeclGroupSyntax: SyntaxProtocol {
set
}

var members: MemberDeclBlockSyntax {
var memberBlock: MemberDeclBlockSyntax {
get
set
}
Expand Down
Loading