Merge pull request #3150 from meg-gupta/borrowandmutateaccessors

Add support for borrow and mutate accessors

Author: meg-gupta

CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

@@ -120,6 +120,8 @@ public let DECL_NODES: [Node] = [
  .keyword(._modify),
  .keyword(.modify),
  .keyword(.`init`),
+ .keyword(.borrow),
+ .keyword(.mutate),
  ])
  ),
  Child(

CodeGeneration/Sources/SyntaxSupport/ExperimentalFeatures.swift

@@ -23,6 +23,7 @@ public enum ExperimentalFeature: String, CaseIterable {
  case oldOwnershipOperatorSpellings
  case defaultIsolationPerFile
  case moduleSelector
+ case borrowAndMutateAccessors
 
  /// The name of the feature as it is written in the compiler's `Features.def` file.
  public var featureName: String {
@@ -47,6 +48,8 @@ public enum ExperimentalFeature: String, CaseIterable {
  return "DefaultIsolationPerFile"
  case .moduleSelector:
  return "ModuleSelector"
+ case .borrowAndMutateAccessors:
+ return "BorrowAndMutateAccessors"
  }
  }
 
@@ -73,6 +76,8 @@ public enum ExperimentalFeature: String, CaseIterable {
  return "set default actor isolation for a file"
  case .moduleSelector:
  return "Module selector syntax (`ModName::identifier`)"
+ case .borrowAndMutateAccessors:
+ return "borrow and mutate accessors"
  }
  }
 

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

@@ -201,6 +201,7 @@ public enum Keyword: CaseIterable {
  case metadata
  case modify
  case module
+ case mutate
  case mutableAddressWithNativeOwner
  case mutableAddressWithOwner
  case mutating
@@ -535,6 +536,8 @@ public enum Keyword: CaseIterable {
  return KeywordSpec("modify", experimentalFeature: .coroutineAccessors)
  case .module:
  return KeywordSpec("module")
+ case .mutate:
+ return KeywordSpec("mutate", experimentalFeature: .borrowAndMutateAccessors)
  case .mutableAddressWithNativeOwner:
  return KeywordSpec("mutableAddressWithNativeOwner")
  case .mutableAddressWithOwner:

Sources/SwiftParser/TokenPrecedence.swift

@@ -239,7 +239,7 @@ enum TokenPrecedence: Comparable {
  .dependsOn, .scoped, .sending,
  // Accessors
  .get, .set, .didSet, .willSet, .unsafeAddress, .addressWithOwner, .addressWithNativeOwner, .unsafeMutableAddress,
- .mutableAddressWithOwner, .mutableAddressWithNativeOwner, ._read, .read, ._modify, .modify,
+ .mutableAddressWithOwner, .mutableAddressWithNativeOwner, ._read, .read, ._modify, .modify, .mutate,
  // Misc
  .import, .using:
  self = .declKeyword

Sources/SwiftParser/generated/ExperimentalFeatures.swift

@@ -3473,6 +3473,28 @@ final class DeclarationTests: ParserTestCase {
  )
  }
 
+ func testBorrowAndMutateAccessors() {
+ assertParse(
+ """
+ public class Klass {}
+
+ public struct Wrapper {
+ var _otherK: Klass
+
+ var k1: Klass {
+ borrow {
+ return _otherK
+ }
+ mutate {
+ return &_otherK
+ }
+ }
+ }
+ """,
+ experimentalFeatures: .borrowAndMutateAccessors
+ )
+ }
+
  func testMissingCommaInParameters() {
  assertParse(
  "func a(foo: Bar1️⃣ foo2: Bar2) {}",