Sync source file changes in CodeGeneration

Author: StevenWong12

CodeGeneration/Sources/SyntaxSupport/AttributeKinds.swift

@@ -676,10 +676,57 @@ public let DECL_ATTR_KINDS: [Attribute] = [
 ///
 /// If you're adding a new kind of attribute that is spelled with a leading
 /// '@' symbol, add an entry to the `DECL_ATTR_KINDS` array instead.
-public let DECL_MODIFIER_KINDS: [Attribute] = [
-  // These are not really attributes or modifiers in the C++ AST and they are
-  // serialized directly into the ASTs they are attached to rather than using
-  // the generic attribute serialization infrastructure.
+
+// These are not really attributes or modifiers in the C++ AST and they are
+// serialized directly into the ASTs they are attached to rather than using
+// the generic attribute serialization infrastructure.
+public let DECL_MODIFIER_KINDS: [Attribute] = CONTEXTUAL_DECL_MODIFIER_KINDS + NONCONTEXTUAL_DECL_MODIFIER_KINDS
+
+// Modifiers that not exclusively used for declarations
+public let CONTEXTUAL_DECL_MODIFIER_KINDS: [Attribute] = [
+  ContextualDeclAttribute(
+    name: "weak",
+    className: "ReferenceOwnership"
+  ),
+  ContextualDeclAttributeAlias(
+    name: "unowned",
+    className: "ReferenceOwnership",
+    swiftName: "unowned"
+  ),
+  SimpleDeclAttribute(
+    name: "rethrows",
+    className: "Rethrows",
+    swiftName: "`rethrows`"
+  ),
+  ContextualSimpleDeclAttribute(
+    name: "isolated",
+    className: "Isolated"
+  ),
+  ContextualSimpleDeclAttribute(
+    name: "async",
+    className: "Async"
+  ),
+  SimpleDeclAttribute(
+    name: "reasync",
+    className: "Reasync",
+    swiftName: "reasync"
+  ),
+  ContextualSimpleDeclAttribute(
+    name: "consuming",
+    className: "Consuming"
+  ),
+  ContextualSimpleDeclAttribute(
+    name: "borrowing",
+    className: "Borrowing"
+  ),
+  ContextualSimpleDeclAttribute(
+    name: "_const",
+    className: "CompileTimeConst"
+  ),
+]
+
+// Modifiers that exclusively used for declarations
+public let NONCONTEXTUAL_DECL_MODIFIER_KINDS: [Attribute] = [
   BuiltinDeclModifier(
     name: "static",
     swiftName: "`static`"
@@ -775,37 +822,10 @@ public let DECL_MODIFIER_KINDS: [Attribute] = [
     className: "SetterAccess",
     swiftName: "__setter_access"
   ),
-  ContextualDeclAttribute(
-    name: "weak",
-    className: "ReferenceOwnership"
-  ),
-  ContextualDeclAttributeAlias(
-    name: "unowned",
-    className: "ReferenceOwnership",
-    swiftName: "unowned"
-  ),
-  SimpleDeclAttribute(
-    name: "rethrows",
-    className: "Rethrows",
-    swiftName: "`rethrows`"
-  ),
   ContextualSimpleDeclAttribute(
     name: "indirect",
     className: "Indirect"
   ),
-  ContextualSimpleDeclAttribute(
-    name: "isolated",
-    className: "Isolated"
-  ),
-  ContextualSimpleDeclAttribute(
-    name: "async",
-    className: "Async"
-  ),
-  SimpleDeclAttribute(
-    name: "reasync",
-    className: "Reasync",
-    swiftName: "reasync"
-  ),
   ContextualSimpleDeclAttribute(
     name: "nonisolated",
     className: "Nonisolated"
@@ -814,22 +834,10 @@ public let DECL_MODIFIER_KINDS: [Attribute] = [
     name: "distributed",
     className: "DistributedActor"
   ),
-  ContextualSimpleDeclAttribute(
-    name: "_const",
-    className: "CompileTimeConst"
-  ),
   ContextualSimpleDeclAttribute(
     name: "_local",
     className: "KnownToBeLocal"
   ),
-  ContextualSimpleDeclAttribute(
-    name: "consuming",
-    className: "Consuming"
-  ),
-  ContextualSimpleDeclAttribute(
-    name: "borrowing",
-    className: "Borrowing"
-  ),
 ]
 
 public let DEPRECATED_MODIFIER_KINDS: [Attribute] = [

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/DeclarationModifierFile.swift

@@ -38,13 +38,14 @@ let declarationModifierFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
 
     try VariableDeclSyntax("var spec: TokenSpec") {
       try SwitchExprSyntax("switch self") {
-        for attribute in DECL_MODIFIER_KINDS {
+        for attribute in NONCONTEXTUAL_DECL_MODIFIER_KINDS {
+          SwitchCaseSyntax("case .\(raw: attribute.swiftName):") {
+            StmtSyntax("return .keyword(.\(raw: attribute.swiftName))")
+          }
+        }
+        for attribute in CONTEXTUAL_DECL_MODIFIER_KINDS {
           SwitchCaseSyntax("case .\(raw: attribute.swiftName):") {
-            if attribute.swiftName.hasSuffix("Keyword") {
-              StmtSyntax("return .\(raw: attribute.swiftName)")
-            } else {
-              StmtSyntax("return .keyword(.\(raw: attribute.swiftName))")
-            }
+            StmtSyntax("return TokenSpec(.\(raw: attribute.swiftName), recoveryPrecedence: .declKeyword)")
           }
         }
       }

Sources/SwiftParser/generated/DeclarationModifier.swift

@@ -15,6 +15,15 @@
 @_spi(RawSyntax) import SwiftSyntax
 
 enum DeclarationModifier: TokenSpecSet {
+  case weak
+  case unowned
+  case `rethrows`
+  case isolated
+  case async
+  case reasync
+  case consuming
+  case borrowing
+  case _const
   case `static`
   case `class`
   case final
@@ -37,22 +46,31 @@ enum DeclarationModifier: TokenSpecSet {
   case package
   case open
   case __setter_access
-  case weak
-  case unowned
-  case `rethrows`
   case indirect
-  case isolated
-  case async
-  case reasync
   case nonisolated
   case distributed
-  case _const
   case _local
-  case consuming
-  case borrowing
 
   init?(lexeme: Lexer.Lexeme) {
     switch PrepareForKeywordMatch(lexeme) {
+    case TokenSpec(.weak):
+      self = .weak
+    case TokenSpec(.unowned):
+      self = .unowned
+    case TokenSpec(.`rethrows`):
+      self = .`rethrows`
+    case TokenSpec(.isolated):
+      self = .isolated
+    case TokenSpec(.async):
+      self = .async
+    case TokenSpec(.reasync):
+      self = .reasync
+    case TokenSpec(.consuming):
+      self = .consuming
+    case TokenSpec(.borrowing):
+      self = .borrowing
+    case TokenSpec(._const):
+      self = ._const
     case TokenSpec(.`static`):
       self = .`static`
     case TokenSpec(.`class`):
@@ -97,32 +115,14 @@ enum DeclarationModifier: TokenSpecSet {
       self = .open
     case TokenSpec(.__setter_access):
       self = .__setter_access
-    case TokenSpec(.weak):
-      self = .weak
-    case TokenSpec(.unowned):
-      self = .unowned
-    case TokenSpec(.`rethrows`):
-      self = .`rethrows`
     case TokenSpec(.indirect):
       self = .indirect
-    case TokenSpec(.isolated):
-      self = .isolated
-    case TokenSpec(.async):
-      self = .async
-    case TokenSpec(.reasync):
-      self = .reasync
     case TokenSpec(.nonisolated):
       self = .nonisolated
     case TokenSpec(.distributed):
       self = .distributed
-    case TokenSpec(._const):
-      self = ._const
     case TokenSpec(._local):
       self = ._local
-    case TokenSpec(.consuming):
-      self = .consuming
-    case TokenSpec(.borrowing):
-      self = .borrowing
     default:
       return nil
     }
@@ -174,32 +174,32 @@ enum DeclarationModifier: TokenSpecSet {
       return .keyword(.open)
     case .__setter_access:
       return .keyword(.__setter_access)
+    case .indirect:
+      return .keyword(.indirect)
+    case .nonisolated:
+      return .keyword(.nonisolated)
+    case .distributed:
+      return .keyword(.distributed)
+    case ._local:
+      return .keyword(._local)
     case .weak:
       return TokenSpec(.weak, recoveryPrecedence: .declKeyword)
     case .unowned:
       return TokenSpec(.unowned, recoveryPrecedence: .declKeyword)
     case .`rethrows`:
       return TokenSpec(.`rethrows`, recoveryPrecedence: .declKeyword)
-    case .indirect:
-      return .keyword(.indirect)
     case .isolated:
       return TokenSpec(.isolated, recoveryPrecedence: .declKeyword)
     case .async:
       return TokenSpec(.async, recoveryPrecedence: .declKeyword)
     case .reasync:
       return TokenSpec(.reasync, recoveryPrecedence: .declKeyword)
-    case .nonisolated:
-      return .keyword(.nonisolated)
-    case .distributed:
-      return .keyword(.distributed)
-    case ._const:
-      return TokenSpec(._const, recoveryPrecedence: .declKeyword)
-    case ._local:
-      return .keyword(._local)
     case .consuming:
       return TokenSpec(.consuming, recoveryPrecedence: .declKeyword)
     case .borrowing:
       return TokenSpec(.borrowing, recoveryPrecedence: .declKeyword)
+    case ._const:
+      return TokenSpec(._const, recoveryPrecedence: .declKeyword)
     }
   }
 }