Merge pull request #1372 from jckarter/se-0377-method-modifiers

Add declaration-level `consuming` and `borrowing` modifiers from SE-0377

Author: jckarter

CodeGeneration/Sources/SyntaxSupport/AttributeKinds.swift

@@ -1881,15 +1881,15 @@ public let DECL_MODIFIER_KINDS: [Attribute] = [
   ),
   ContextualSimpleDeclAttribute(
     name: "__consuming",
-    className: "Consuming",
+    className: "LegacyConsuming",
     options:
       onFunc,
     onAccessor,
     declModifier,
     userInaccessible,
     notSerialized,
-    ABIStableToAdd,
-    ABIStableToRemove,
+    ABIBreakingToAdd,
+    ABIBreakingToRemove,
     APIStableToAdd,
     APIStableToRemove,
     code: 40
@@ -2159,6 +2159,36 @@ public let DECL_MODIFIER_KINDS: [Attribute] = [
     APIBreakingToRemove,
     code: 130
   ),
+  ContextualSimpleDeclAttribute(
+    name: "consuming",
+    className: "Consuming",
+    options:
+      declModifier,
+    onFunc,
+    onAccessor,
+    userInaccessible,
+    notSerialized,
+    ABIBreakingToAdd,
+    ABIBreakingToRemove,
+    APIStableToAdd,
+    APIStableToRemove,
+    code: 140
+  ),
+  ContextualSimpleDeclAttribute(
+    name: "borrowing",
+    className: "Borrowing",
+    options:
+      declModifier,
+    onFunc,
+    onAccessor,
+    userInaccessible,
+    notSerialized,
+    ABIBreakingToAdd,
+    ABIBreakingToRemove,
+    APIStableToAdd,
+    APIStableToRemove,
+    code: 141
+  ),
 ]
 
 public let DEPRECATED_MODIFIER_KINDS: [Attribute] = [

CodeGeneration/Sources/SyntaxSupport/gyb_generated/DeclNodes.swift

@@ -226,7 +226,7 @@ public let DECL_NODES: [Node] = [
        kind: "Syntax",
        children: [
          Child(name: "Name",
-               kind: .token(choices: [.keyword(text: "class"), .keyword(text: "convenience"), .keyword(text: "dynamic"), .keyword(text: "final"), .keyword(text: "infix"), .keyword(text: "lazy"), .keyword(text: "optional"), .keyword(text: "override"), .keyword(text: "postfix"), .keyword(text: "prefix"), .keyword(text: "required"), .keyword(text: "static"), .keyword(text: "unowned"), .keyword(text: "weak"), .keyword(text: "private"), .keyword(text: "fileprivate"), .keyword(text: "internal"), .keyword(text: "public"), .keyword(text: "open"), .keyword(text: "mutating"), .keyword(text: "nonmutating"), .keyword(text: "indirect"), .keyword(text: "__consuming"), .keyword(text: "actor"), .keyword(text: "async"), .keyword(text: "distributed"), .keyword(text: "isolated"), .keyword(text: "nonisolated"), .keyword(text: "_const"), .keyword(text: "_local"), .keyword(text: "package")]),
+               kind: .token(choices: [.keyword(text: "class"), .keyword(text: "convenience"), .keyword(text: "dynamic"), .keyword(text: "final"), .keyword(text: "infix"), .keyword(text: "lazy"), .keyword(text: "optional"), .keyword(text: "override"), .keyword(text: "postfix"), .keyword(text: "prefix"), .keyword(text: "required"), .keyword(text: "static"), .keyword(text: "unowned"), .keyword(text: "weak"), .keyword(text: "private"), .keyword(text: "fileprivate"), .keyword(text: "internal"), .keyword(text: "public"), .keyword(text: "open"), .keyword(text: "mutating"), .keyword(text: "nonmutating"), .keyword(text: "indirect"), .keyword(text: "__consuming"), .keyword(text: "borrowing"), .keyword(text: "consuming"), .keyword(text: "actor"), .keyword(text: "async"), .keyword(text: "distributed"), .keyword(text: "isolated"), .keyword(text: "nonisolated"), .keyword(text: "_const"), .keyword(text: "_local"), .keyword(text: "package")]),
                classification: "Attribute"),
          Child(name: "Detail",
                kind: .node(kind: "DeclModifierDetail"),

Sources/SwiftParser/Declarations.swift

@@ -16,8 +16,8 @@ extension DeclarationModifier {
   var canHaveParenthesizedArgument: Bool {
     switch self {
     case .__consuming, .__setter_access, ._const, ._local, .async,
-      .class, .convenience, .distributed, .dynamic, .final,
-      .indirect, .infix, .isolated, .lazy, .mutating, .nonisolated,
+      .borrowing, .class, .consuming, .convenience, .distributed, .dynamic,
+      .final, .indirect, .infix, .isolated, .lazy, .mutating, .nonisolated,
       .nonmutating, .optional, .override, .postfix, .prefix, .reasync,
       .required, .rethrows, .static, .weak:
       return false

Sources/SwiftParser/Modifiers.swift

@@ -68,6 +68,8 @@ extension Parser {
         (.prefix, let handle)?,
         (.postfix, let handle)?,
         (.__consuming, let handle)?,
+        (.borrowing, let handle)?,
+        (.consuming, let handle)?,
         (.mutating, let handle)?,
         (.nonmutating, let handle)?,
         (.convenience, let handle)?,

Sources/SwiftParser/generated/DeclarationModifier.swift

@@ -48,6 +48,8 @@ enum DeclarationModifier: TokenSpecSet {
   case distributed
   case _const
   case _local
+  case consuming
+  case borrowing
 
   init?(lexeme: Lexer.Lexeme) {
     switch PrepareForKeywordMatch(lexeme) {
@@ -117,6 +119,10 @@ enum DeclarationModifier: TokenSpecSet {
       self = ._const
     case TokenSpec(._local):
       self = ._local
+    case TokenSpec(.consuming):
+      self = .consuming
+    case TokenSpec(.borrowing):
+      self = .borrowing
     default:
       return nil
     }
@@ -190,6 +196,10 @@ enum DeclarationModifier: TokenSpecSet {
       return .keyword(._const)
     case ._local:
       return .keyword(._local)
+    case .consuming:
+      return .keyword(.consuming)
+    case .borrowing:
+      return .keyword(.borrowing)
     }
   }
 }

gyb_syntax_support/AttributeKinds.py

@@ -785,12 +785,12 @@ def __init__(self, name, swift_name=None):
                                   DeclModifier,
                                   ABIStableToAdd,  ABIStableToRemove,  APIStableToAdd,  APIStableToRemove,
                                   code=25),
-    ContextualSimpleDeclAttribute('__consuming', 'Consuming',
+    ContextualSimpleDeclAttribute('__consuming', 'LegacyConsuming',
                                   OnFunc,  OnAccessor,
                                   DeclModifier,
                                   UserInaccessible,
                                   NotSerialized,
-                                  ABIStableToAdd,  ABIStableToRemove,  APIStableToAdd,  APIStableToRemove,
+                                  ABIBreakingToAdd,  ABIBreakingToRemove,  APIStableToAdd,  APIStableToRemove,
                                   code=40),
     ContextualSimpleDeclAttribute('mutating', 'Mutating',
                                   OnFunc,  OnAccessor,
@@ -897,6 +897,21 @@ def __init__(self, name, swift_name=None):
                                   ABIBreakingToAdd,  ABIBreakingToRemove,
                                   APIBreakingToAdd,  APIBreakingToRemove,
                                   code=130),
+
+    ContextualSimpleDeclAttribute('consuming', 'Consuming',
+                                  OnFunc,  OnAccessor,
+                                  DeclModifier,
+                                  UserInaccessible,
+                                  NotSerialized,
+                                  ABIBreakingToAdd,  ABIBreakingToRemove,  APIStableToAdd,  APIStableToRemove,
+                                  code=140),
+    ContextualSimpleDeclAttribute('borrowing', 'Borrowing',
+                                  OnFunc,  OnAccessor,
+                                  DeclModifier,
+                                  UserInaccessible,
+                                  NotSerialized,
+                                  ABIBreakingToAdd,  ABIBreakingToRemove,  APIStableToAdd,  APIStableToRemove,
+                                  code=141),
 ]
 
 DEPRECATED_MODIFIER_KINDS = [

gyb_syntax_support/DeclNodes.py

@@ -161,6 +161,7 @@
                        'KeywordToken|required', 'KeywordToken|static', 'KeywordToken|unowned', 'KeywordToken|weak', 'KeywordToken|private',
                        'KeywordToken|fileprivate', 'KeywordToken|internal', 'KeywordToken|public', 'KeywordToken|open',
                        'KeywordToken|mutating', 'KeywordToken|nonmutating', 'KeywordToken|indirect', 'KeywordToken|__consuming',
+                       'KeywordToken|borrowing', 'KeywordToken|consuming',
                        'KeywordToken|actor', 'KeywordToken|async', 'KeywordToken|distributed', 'KeywordToken|isolated',
                        'KeywordToken|nonisolated', 'KeywordToken|_const', 'KeywordToken|_local', 'KeywordToken|package'
                    ]),