Merge pull request #1731 from hborla/init-accessors

Parse `init` accessors.

Author: xedin

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -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,
@@ -99,6 +167,7 @@ public let DECL_NODES: [Node] = [
           .keyword(text: "mutableAddressWithNativeOwner"),
           .keyword(text: "_read"),
           .keyword(text: "_modify"),
+          .keyword(text: "init"),
         ])
       ),
       Child(
@@ -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),

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

@@ -85,6 +85,7 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("_underlyingVersion"),
   KeywordSpec("_UnknownLayout"),
   KeywordSpec("_version"),
+  KeywordSpec("accesses"),
   KeywordSpec("actor"),
   KeywordSpec("addressWithNativeOwner"),
   KeywordSpec("addressWithOwner"),
@@ -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),

CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

@@ -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
@@ -168,6 +170,7 @@ public enum SyntaxNodeKind: String, CaseIterable {
   case inheritedType
   case initializerClause
   case initializerDecl
+  case initializesEffect
   case integerLiteralExpr
   case isExpr
   case isTypePattern

Sources/SwiftParser/Declarations.swift

@@ -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)
@@ -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(
@@ -1538,6 +1538,7 @@ extension Parser {
     }
 
     let effectSpecifiers = self.parseAccessorEffectSpecifiers()
+    let initEffects = self.parseInitAccessorEffects()
 
     let body = self.parseOptionalCodeBlock()
     return RawAccessorDeclSyntax(
@@ -1547,6 +1548,7 @@ extension Parser {
       accessorKind: introducer.token,
       parameter: parameter,
       effectSpecifiers: effectSpecifiers,
+      initEffects: initEffects,
       body: body,
       arena: self.arena
     )

Sources/SwiftParser/Specifiers.swift

@@ -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
+    )
+  }
+}

Sources/SwiftParser/TokenSpecSet.swift

@@ -28,6 +28,7 @@ enum AccessorKind: TokenSpecSet {
   case `set`
   case `didSet`
   case `willSet`
+  case `init`
   case unsafeAddress
   case addressWithOwner
   case addressWithNativeOwner
@@ -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
@@ -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)

Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift

@@ -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:
@@ -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:

Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift

@@ -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:
@@ -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:

Sources/SwiftSyntax/Documentation.docc/generated/SwiftSyntax.md

@@ -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>
@@ -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>