Add dedicated node for @_originallyDefinedIn arguments

This moves @_originallyDEfinedIn away from using TokenList for its arguments.

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/gyb_generated/AttributeNodes.swift

@@ -113,6 +113,8 @@ public let ATTRIBUTE_NODES: [Node] = [
                        kind: "OpaqueReturnTypeOfAttributeArguments"),
                  Child(name: "ExposeAttributeArguments",
                        kind: "ExposeAttributeArguments"),
+                 Child(name: "OriginallyDefinedInArguments",
+                       kind: "OriginallyDefinedInArguments"),
                  Child(name: "TokenList",
                        kind: "TokenList",
                        collectionElementName: "Token")
@@ -564,19 +566,19 @@ public let ATTRIBUTE_NODES: [Node] = [
                  "Colon"
                ]),
          Child(name: "VersionList",
-               kind: "BackDeployVersionList",
+               kind: "AvailabilityVersionRestrictionList",
                description: "The list of OS versions in which the declaration became ABIstable.",
                collectionElementName: "Availability")
        ]),
 
-  Node(name: "BackDeployVersionList",
+  Node(name: "AvailabilityVersionRestrictionList",
        nameForDiagnostics: "version list",
        kind: "SyntaxCollection",
-       element: "BackDeployVersionArgument"),
+       element: "AvailabilityVersionRestrictionListEntry"),
 
-  Node(name: "BackDeployVersionArgument",
+  Node(name: "AvailabilityVersionRestrictionListEntry",
        nameForDiagnostics: "version",
-       description: "A single platform/version pair in a `@_backDeploy` attribute,e.g. `iOS 10.1`.",
+       description: "A single platform/version pair in an attribute, e.g. `iOS 10.1`.",
        kind: "Syntax",
        children: [
          Child(name: "AvailabilityVersionRestriction",
@@ -705,4 +707,37 @@ public let ATTRIBUTE_NODES: [Node] = [
                ])
        ]),
 
+  Node(name: "OriginallyDefinedInArguments",
+       nameForDiagnostics: "@_originallyDefinedIn arguments",
+       description: "The arguments for the '@_originallyDefinedIn' attribute",
+       kind: "Syntax",
+       children: [
+         Child(name: "ModuleLabel",
+               kind: "IdentifierToken",
+               tokenChoices: [
+                 "Identifier"
+               ],
+               textChoices: [
+                 "module"
+               ]),
+         Child(name: "Colon",
+               kind: "ColonToken",
+               tokenChoices: [
+                 "Colon"
+               ]),
+         Child(name: "ModuleName",
+               kind: "StringLiteralToken",
+               tokenChoices: [
+                 "StringLiteral"
+               ]),
+         Child(name: "Comma",
+               kind: "CommaToken",
+               tokenChoices: [
+                 "Comma"
+               ]),
+         Child(name: "Platforms",
+               kind: "AvailabilityVersionRestrictionList",
+               collectionElementName: "Platform")
+       ]),
+
 ]

Sources/IDEUtils/generated/SyntaxClassification.swift

@@ -122,7 +122,7 @@ extension SyntaxClassification {
       }
     } else {
       switch (parentKind, indexInParent) {
-      case (.backDeployVersionArgument, 1): 
+      case (.availabilityVersionRestrictionListEntry, 1): 
         return (.keyword, false)
       case (.customAttribute, 3): 
         return (.attribute, false)

Sources/SwiftParser/Attributes.swift

@@ -209,6 +209,10 @@ extension Parser {
       return parseAttribute(hasRequiredArguments: true) { parser in
         return .exposeAttributeArguments(parser.parseExposeArguments())
       }
+    case ._originallyDefinedIn:
+      return parseAttribute(hasRequiredArguments: true) { parser in
+        return .originallyDefinedInArguments(parser.parseOriginallyDefinedInArguments())
+      }
     case .__objc_bridged, .__raw_doc_comment, ._alwaysEmitConformanceMetadata, ._alwaysEmitIntoClient, ._assemblyVision, ._borrowed, ._compilerInitialized, ._custom, ._disfavoredOverload, ._eagerMove, ._exported, ._fixed_layout, ._frozen, ._hasInitialValue, ._hasMissingDesignatedInitializers, ._hasStorage, ._implementationOnly, ._implicitSelfCapture, ._inheritActorContext, ._inheritsConvenienceInitializers, ._marker, ._moveOnly, ._noAllocation, ._noEagerMove, ._noImplicitCopy, ._noLocks, ._noMetadata, ._nonEphemeral, ._nonoverride, ._objc_non_lazy_realization, ._show_in_interface, ._specializeExtension, ._spiOnly, ._staticInitializeObjCMetadata, ._transparent, ._unsafeInheritExecutor, ._weakLinked, .atReasync, .atRethrows, .discardableResult, .dynamicCallable, .dynamicMemberLookup, .frozen, .GKInspectable, .globalActor, .IBAction, .IBDesignable, .IBInspectable, .IBOutlet, .IBSegueAction, .inlinable, .LLDBDebuggerFunction, .main, .noDerivative, .nonobjc, .NSApplicationMain, .NSCopying,
       .NSManaged, .objcMembers, .preconcurrency, .propertyWrapper, .requires_stored_property_inits, .resultBuilder, .runtimeMetadata, .Sendable, .testable, .typeWrapper, .typeWrapperIgnored, .UIApplicationMain, .unsafe_no_objc_tagged_pointer, .usableFromInline, .warn_unqualified_access:
       // No arguments
@@ -217,9 +221,6 @@ extension Parser {
       // Virtual attributes that should not be parsed
       break
     // MARK: - Other
-    case ._originallyDefinedIn:
-      // @_originallyDefinedIn(module: "HighLevel", OSX 10.9, iOS 13.0)
-      break
     case ._unavailableFromAsync:
       // @_unavailableFromAsync(message: "Use Task.runInline from a sync context to begin an async context.")
       break
@@ -839,13 +840,13 @@ extension Parser {
   mutating func parseBackDeployArguments() -> RawBackDeployAttributeSpecListSyntax {
     let (unexpectedBeforeLabel, label) = self.expectContextualKeyword("before")
     let (unexpectedBeforeColon, colon) = self.expect(.colon)
-    var elements: [RawBackDeployVersionArgumentSyntax] = []
+    var elements: [RawAvailabilityVersionRestrictionListEntrySyntax] = []
     var keepGoing: RawTokenSyntax? = nil
     repeat {
       let versionRestriction = self.parsePlatformVersionConstraintSpec()
       keepGoing = self.consume(if: .comma)
       elements.append(
-        RawBackDeployVersionArgumentSyntax(
+        RawAvailabilityVersionRestrictionListEntrySyntax(
           availabilityVersionRestriction: versionRestriction,
           trailingComma: keepGoing,
           arena: self.arena
@@ -857,7 +858,7 @@ extension Parser {
       beforeLabel: label,
       unexpectedBeforeColon,
       colon: colon,
-      versionList: RawBackDeployVersionListSyntax(elements: elements, arena: self.arena),
+      versionList: RawAvailabilityVersionRestrictionListSyntax(elements: elements, arena: self.arena),
       arena: self.arena
     )
   }
@@ -895,6 +896,42 @@ extension Parser {
   }
 }
 
+extension Parser {
+  mutating func parseOriginallyDefinedInArguments() -> RawOriginallyDefinedInArgumentsSyntax {
+    let (unexpectedBeforeModuleLabel, moduleLabel) = self.expectContextualKeyword("module")
+    let (unexpectedBeforeColon, colon) = self.expect(.colon)
+    let (unexpectedBeforeModuleName, moduleName) = self.expect(.stringLiteral)
+    let (unexpectedBeforeComma, comma) = self.expect(.comma)
+
+    var platforms: [RawAvailabilityVersionRestrictionListEntrySyntax] = []
+    var keepGoing: RawTokenSyntax?
+    repeat {
+      let restriction = self.parseAvailabilityMacro()
+      keepGoing = self.consume(if: .comma)
+      platforms.append(
+        RawAvailabilityVersionRestrictionListEntrySyntax(
+          availabilityVersionRestriction: restriction,
+          trailingComma: keepGoing,
+          arena: self.arena
+        )
+      )
+    } while keepGoing != nil
+
+    return RawOriginallyDefinedInArgumentsSyntax(
+      unexpectedBeforeModuleLabel,
+      moduleLabel: moduleLabel,
+      unexpectedBeforeColon,
+      colon: colon,
+      unexpectedBeforeModuleName,
+      moduleName: moduleName,
+      unexpectedBeforeComma,
+      comma: comma,
+      platforms: RawAvailabilityVersionRestrictionListSyntax(elements: platforms, arena: self.arena),
+      arena: self.arena
+    )
+  }
+}
+
 // MARK: Lookahead
 
 extension Parser.Lookahead {

Sources/SwiftSyntax/Documentation.docc/gyb_generated/SwiftSyntax.md

@@ -234,8 +234,8 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/ObjCSelectorPieceSyntax>
 - <doc:SwiftSyntax/DifferentiabilityParamListSyntax>
 - <doc:SwiftSyntax/DifferentiabilityParamSyntax>
-- <doc:SwiftSyntax/BackDeployVersionListSyntax>
-- <doc:SwiftSyntax/BackDeployVersionArgumentSyntax>
+- <doc:SwiftSyntax/AvailabilityVersionRestrictionListSyntax>
+- <doc:SwiftSyntax/AvailabilityVersionRestrictionListEntrySyntax>
 - <doc:SwiftSyntax/CatchClauseListSyntax>
 - <doc:SwiftSyntax/CatchClauseSyntax>
 - <doc:SwiftSyntax/CaseItemListSyntax>
@@ -359,12 +359,13 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/QualifiedDeclNameSyntax>
 - <doc:SwiftSyntax/FunctionDeclNameSyntax>
 - <doc:SwiftSyntax/BackDeployAttributeSpecListSyntax>
-- <doc:SwiftSyntax/BackDeployVersionListSyntax>
-- <doc:SwiftSyntax/BackDeployVersionArgumentSyntax>
+- <doc:SwiftSyntax/AvailabilityVersionRestrictionListSyntax>
+- <doc:SwiftSyntax/AvailabilityVersionRestrictionListEntrySyntax>
 - <doc:SwiftSyntax/OpaqueReturnTypeOfAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/ConventionAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/ConventionWitnessMethodAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/ExposeAttributeArgumentsSyntax>
+- <doc:SwiftSyntax/OriginallyDefinedInArgumentsSyntax>
 - <doc:SwiftSyntax/SwitchCaseListSyntax>
 - <doc:SwiftSyntax/WhereClauseSyntax>
 - <doc:SwiftSyntax/CatchClauseListSyntax>