Skip to content

Parse init accessors. #1731

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.

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 6 commits into from
Jun 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
74 changes: 74 additions & 0 deletions CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,74 @@ public let DECL_NODES: [Node] = [
]
),

Node(
kind: .accessesEffect,
base: .syntax,
nameForDiagnostics: "accesses effect",
children: [
Child(
name: "AccessesKeyword",
kind: .token(choices: [.keyword(text: "accesses")])
),
Child(
name: "LeftParen",
kind: .token(choices: [.token(tokenKind: "LeftParenToken")])
),
Child(
name: "PropertyList",
kind: .collection(kind: .tupleExprElementList, collectionElementName: "Property"),
nameForDiagnostics: "properties"
),
Child(
name: "RightParen",
kind: .token(choices: [.token(tokenKind: "RightParenToken")])
),
]
),

Node(
kind: .initializesEffect,
base: .syntax,
nameForDiagnostics: "initializes effect",
children: [
Child(
name: "InitializesKeyword",
kind: .token(choices: [.keyword(text: "initializes")])
),
Child(
name: "LeftParen",
kind: .token(choices: [.token(tokenKind: "LeftParenToken")])
),
Child(
name: "PropertyList",
kind: .collection(kind: .tupleExprElementList, collectionElementName: "Property"),
nameForDiagnostics: "properties"
),
Child(
name: "RightParen",
kind: .token(choices: [.token(tokenKind: "RightParenToken")])
),
]
),

Node(
kind: .accessorInitEffects,
base: .syntax,
nameForDiagnostics: "init accessor effects",
children: [
Child(
name: "InitializesEffect",
kind: .node(kind: .initializesEffect),
isOptional: true
),
Child(
name: "AccessesEffect",
kind: .node(kind: .accessesEffect),
isOptional: true
),
]
),

Node(
kind: .accessorDecl,
base: .decl,
Expand Down Expand Up @@ -99,6 +167,7 @@ public let DECL_NODES: [Node] = [
.keyword(text: "mutableAddressWithNativeOwner"),
.keyword(text: "_read"),
.keyword(text: "_modify"),
.keyword(text: "init"),
])
),
Child(
Expand All @@ -112,6 +181,11 @@ public let DECL_NODES: [Node] = [
kind: .node(kind: .accessorEffectSpecifiers),
isOptional: true
),
Child(
name: "InitEffects",
kind: .node(kind: .accessorInitEffects),
isOptional: true
),
Child(
name: "Body",
kind: .node(kind: .codeBlock),
Expand Down
2 changes: 2 additions & 0 deletions CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public let KEYWORDS: [KeywordSpec] = [
KeywordSpec("_underlyingVersion"),
KeywordSpec("_UnknownLayout"),
KeywordSpec("_version"),
KeywordSpec("accesses"),
KeywordSpec("actor"),
KeywordSpec("addressWithNativeOwner"),
KeywordSpec("addressWithOwner"),
Expand Down Expand Up @@ -152,6 +153,7 @@ public let KEYWORDS: [KeywordSpec] = [
KeywordSpec("indirect"),
KeywordSpec("infix"),
KeywordSpec("init", isLexerClassified: true),
KeywordSpec("initializes"),
KeywordSpec("inline"),
KeywordSpec("inout", isLexerClassified: true, requiresTrailingSpace: true),
KeywordSpec("internal", isLexerClassified: true, requiresTrailingSpace: true),
Expand Down
3 changes: 3 additions & 0 deletions CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ import SwiftSyntaxBuilder
public enum SyntaxNodeKind: String, CaseIterable {
// Please keep this list sorted alphabetically

case accessesEffect
case accessorBlock
case accessorDecl
case accessorEffectSpecifiers
case accessorInitEffects
case accessorList
case accessorParameter
case actorDecl
Expand Down Expand Up @@ -168,6 +170,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
case inheritedType
case initializerClause
case initializerDecl
case initializesEffect
case integerLiteralExpr
case isExpr
case isTypePattern
Expand Down
6 changes: 4 additions & 2 deletions Sources/SwiftParser/Declarations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@ extension Parser {
}

let accessor: RawPatternBindingSyntax.Accessor?
if self.at(.leftBrace) || (inMemberDeclList && self.at(anyIn: AccessorKind.self) != nil) {
if self.at(.leftBrace) || (inMemberDeclList && self.at(anyIn: AccessorKind.self) != nil && !self.at(.keyword(.`init`))) {
switch self.parseGetSet() {
case .accessors(let accessors):
accessor = .accessors(accessors)
Expand Down Expand Up @@ -1522,7 +1522,7 @@ extension Parser {
//
// set-name ::= '(' identifier ')'
let parameter: RawAccessorParameterSyntax?
if [AccessorKind.set, .willSet, .didSet].contains(introducer.kind), let lparen = self.consume(if: .leftParen) {
if [AccessorKind.set, .willSet, .didSet, .`init`].contains(introducer.kind), let lparen = self.consume(if: .leftParen) {
let (unexpectedBeforeName, name) = self.expectIdentifier()
let (unexpectedBeforeRParen, rparen) = self.expect(.rightParen)
parameter = RawAccessorParameterSyntax(
Expand All @@ -1538,6 +1538,7 @@ extension Parser {
}

let effectSpecifiers = self.parseAccessorEffectSpecifiers()
let initEffects = self.parseInitAccessorEffects()

let body = self.parseOptionalCodeBlock()
return RawAccessorDeclSyntax(
Expand All @@ -1547,6 +1548,7 @@ extension Parser {
accessorKind: introducer.token,
parameter: parameter,
effectSpecifiers: effectSpecifiers,
initEffects: initEffects,
body: body,
arena: self.arena
)
Expand Down
71 changes: 71 additions & 0 deletions Sources/SwiftParser/Specifiers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -572,3 +572,74 @@ extension Parser {
return RawUnexpectedNodesSyntax(unexpected, arena: self.arena)
}
}

// MARK: - Parsing `initializes` and `accesses` specifiers in init accessors

extension Parser {
mutating func parseInitAccessorEffects() -> RawAccessorInitEffectsSyntax? {
let initializes = self.parseInitializesSpecifier()
let accesses = self.parseAccessesSpecifier()

if initializes == nil, accesses == nil {
return nil
}

return RawAccessorInitEffectsSyntax(
initializesEffect: initializes,
accessesEffect: accesses,
arena: self.arena
)
}

mutating func parseInitializesSpecifier() -> RawInitializesEffectSyntax? {
guard let keyword = self.consume(if: .keyword(.initializes)) else {
return nil
}

let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)

let args = parseArgumentListElements(pattern: .none)
let argumentList = RawTupleExprElementListSyntax(
elements: args,
arena: self.arena
)

let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)

return RawInitializesEffectSyntax(
initializesKeyword: keyword,
unexpectedBeforeLeftParen,
leftParen: leftParen,
propertyList: argumentList,
unexpectedBeforeRightParen,
rightParen: rightParen,
arena: self.arena
)
}

mutating func parseAccessesSpecifier() -> RawAccessesEffectSyntax? {
guard let keyword = self.consume(if: .keyword(.accesses)) else {
return nil
}

let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)

let args = parseArgumentListElements(pattern: .none)
let argumentList = RawTupleExprElementListSyntax(
elements: args,
arena: self.arena
)

let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)

return RawAccessesEffectSyntax(
accessesKeyword: keyword,
unexpectedBeforeLeftParen,
leftParen: leftParen,
propertyList: argumentList,
unexpectedBeforeRightParen,
rightParen: rightParen,
arena: self.arena
)
}
}
3 changes: 3 additions & 0 deletions Sources/SwiftParser/TokenSpecSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ enum AccessorKind: TokenSpecSet {
case `set`
case `didSet`
case `willSet`
case `init`
case unsafeAddress
case addressWithOwner
case addressWithNativeOwner
Expand All @@ -43,6 +44,7 @@ enum AccessorKind: TokenSpecSet {
case TokenSpec(.set): self = .set
case TokenSpec(.didSet): self = .didSet
case TokenSpec(.willSet): self = .willSet
case TokenSpec(.`init`): self = .`init`
case TokenSpec(.unsafeAddress): self = .unsafeAddress
case TokenSpec(.addressWithOwner): self = .addressWithOwner
case TokenSpec(.addressWithNativeOwner): self = .addressWithNativeOwner
Expand All @@ -61,6 +63,7 @@ enum AccessorKind: TokenSpecSet {
case .set: return .keyword(.set)
case .didSet: return .keyword(.didSet)
case .willSet: return .keyword(.willSet)
case .`init`: return .keyword(.`init`)
case .unsafeAddress: return .keyword(.unsafeAddress)
case .addressWithOwner: return .keyword(.addressWithOwner)
case .addressWithNativeOwner: return .keyword(.addressWithNativeOwner)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import SwiftSyntax

private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
switch keyPath {
case \AccessesEffectSyntax.propertyList:
return "properties"
case \AccessorDeclSyntax.attributes:
return "attributes"
case \AccessorDeclSyntax.modifier:
Expand Down Expand Up @@ -208,6 +210,8 @@ private func childNameForDiagnostics(_ keyPath: AnyKeyPath) -> String? {
return "function signature"
case \InitializerDeclSyntax.genericWhereClause:
return "generic where clause"
case \InitializesEffectSyntax.propertyList:
return "properties"
case \KeyPathExprSyntax.root:
return "root"
case \KeyPathSubscriptComponentSyntax.argumentList:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,14 @@ extension SyntaxKind {
switch self {
case .token:
return "token"
case .accessesEffect:
return "accesses effect"
case .accessorDecl:
return "accessor"
case .accessorEffectSpecifiers:
return "accessor specifiers"
case .accessorInitEffects:
return "init accessor effects"
case .actorDecl:
return "actor"
case .arrayElement:
Expand Down Expand Up @@ -225,6 +229,8 @@ extension SyntaxKind {
return "inherited type"
case .initializerDecl:
return "initializer"
case .initializesEffect:
return "initializes effect"
case .integerLiteralExpr:
return "integer literal"
case .isExpr:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,10 @@ These articles are intended for developers wishing to contribute to SwiftSyntax

### Miscellaneous Syntax

- <doc:SwiftSyntax/AccessesEffectSyntax>
- <doc:SwiftSyntax/AccessorBlockSyntax>
- <doc:SwiftSyntax/AccessorEffectSpecifiersSyntax>
- <doc:SwiftSyntax/AccessorInitEffectsSyntax>
- <doc:SwiftSyntax/AccessorParameterSyntax>
- <doc:SwiftSyntax/AvailabilityConditionSyntax>
- <doc:SwiftSyntax/AvailabilityLabeledArgumentSyntax>
Expand Down Expand Up @@ -336,6 +338,7 @@ These articles are intended for developers wishing to contribute to SwiftSyntax
- <doc:SwiftSyntax/GenericParameterClauseSyntax>
- <doc:SwiftSyntax/ImplementsAttributeArgumentsSyntax>
- <doc:SwiftSyntax/InitializerClauseSyntax>
- <doc:SwiftSyntax/InitializesEffectSyntax>
- <doc:SwiftSyntax/KeyPathOptionalComponentSyntax>
- <doc:SwiftSyntax/KeyPathPropertyComponentSyntax>
- <doc:SwiftSyntax/KeyPathSubscriptComponentSyntax>
Expand Down
Loading