Update @_package syntax layout

Author: stevapple

CodeGeneration/Sources/SyntaxSupport/gyb_generated/AttributeNodes.swift

@@ -199,45 +199,80 @@ public let ATTRIBUTE_NODES: [Node] = [
        nameForDiagnostics: "@_package arguments",
        description: "The arguments for the `@_package` attribute imitating `PackageDescription`",
        kind: "Syntax",
+       children: [
+         Child(name: "Description",
+               kind: .nodeChoices(choices: [
+                 Child(name: "Remote",
+                       kind: .node(kind: "RemotePackageDescription")),
+                 Child(name: "Local",
+                       kind: .node(kind: "LocalPackageDescription"))
+               ])),
+         Child(name: "Comma",
+               kind: .token(choices: [.token(tokenKind: "CommaToken")]),
+               description: "The comma between the package description and product, if it exists",
+               isOptional: true),
+         Child(name: "Product",
+               kind: .node(kind: "PackageProduct"),
+               description: "Explicit product declaration of package.",
+               isOptional: true)
+       ]),
+
+  Node(name: "PackageProduct",
+       nameForDiagnostics: "package product",
+       description: "Explicit package product declaration",
+       kind: "Syntax",
+       children: [
+         Child(name: "Label",
+               kind: .token(choices: [.keyword(text: "product")]),
+               description: "The product label"),
+         Child(name: "Colon",
+               kind: .token(choices: [.token(tokenKind: "ColonToken")])),
+         Child(name: "Name",
+               kind: .node(kind: "StringLiteralExpr"),
+               description: "The exact product name from package")
+       ]),
+
+  Node(name: "LocalPackageDescription",
+       nameForDiagnostics: "local package description",
+       description: "The description of a local package",
+       kind: "Syntax",
+       children: [
+         Child(name: "Label",
+               kind: .token(choices: [.keyword(text: "path")]),
+               description: "The path label"),
+         Child(name: "Colon",
+               kind: .token(choices: [.token(tokenKind: "ColonToken")])),
+         Child(name: "Path",
+               kind: .node(kind: "StringLiteralExpr"),
+               description: "The package path")
+       ]),
+
+  Node(name: "RemotePackageDescription",
+       nameForDiagnostics: "remote package description",
+       description: "The description of a remote package",
+       kind: "Syntax",
        children: [
          Child(name: "LocationLabel",
-               kind: .token(choices: [.keyword(text: "id"), .keyword(text: "path"), .keyword(text: "url")]),
+               kind: .token(choices: [.keyword(text: "id"), .keyword(text: "url")]),
                description: "The location label."),
          Child(name: "LocationColon",
                kind: .token(choices: [.token(tokenKind: "ColonToken")])),
          Child(name: "Location",
                kind: .node(kind: "StringLiteralExpr"),
-               description: "The location/identifier of package."),
-         Child(name: "RequirementComma",
+               description: "The URL or identifier of package."),
+         Child(name: "Comma",
                kind: .token(choices: [.token(tokenKind: "CommaToken")]),
-               description: "The comma before the package requirement, if it exists.",
-               isOptional: true),
+               description: "The comma between the package location and requirement"),
          Child(name: "RequirementLabel",
                kind: .token(choices: [.keyword(text: "branch"), .keyword(text: "exact"), .keyword(text: "from"), .keyword(text: "revision")]),
-               description: "The requirement label.",
+               description: "The requirement label",
                isOptional: true),
          Child(name: "RequirementColon",
                kind: .token(choices: [.token(tokenKind: "ColonToken")]),
                isOptional: true),
          Child(name: "Requirement",
                kind: .node(kind: "Expr"),
-               description: "The version requirement of package.",
-               isOptional: true),
-         Child(name: "ProductComma",
-               kind: .token(choices: [.token(tokenKind: "CommaToken")]),
-               description: "The comma before the package product, if it exists.",
-               isOptional: true),
-         Child(name: "ProductLabel",
-               kind: .token(choices: [.keyword(text: "product")]),
-               description: "The product label.",
-               isOptional: true),
-         Child(name: "ProductColon",
-               kind: .token(choices: [.token(tokenKind: "ColonToken")]),
-               isOptional: true),
-         Child(name: "ProductName",
-               kind: .node(kind: "StringLiteralExpr"),
-               description: "The exact product name from package",
-               isOptional: true)
+               description: "Version requirement of remote package")
        ]),
 
   Node(name: "ObjCSelectorPiece",

Sources/SwiftParser/Attributes.swift

@@ -874,66 +874,87 @@ extension Parser {
 
 extension Parser {
   mutating func parsePackageAttributeArguments() -> RawPackageAttributeArgumentsSyntax {
-    // Parsing package location.
+    // Parsing package description
     let (unexpectedBeforeLocationLabel, locationLabel) = self.expectAny([.keyword(.id), .keyword(.path), .keyword(.url)], default: .keyword(.id))
     let (unexpectedBeforeLocationColon, locationColon) = self.expect(.colon)
     let location = self.parseStringLiteral()
-    // Parsing package requirement.
-    let (unexpectedBeforeRequirementComma, requirementComma): (RawUnexpectedNodesSyntax?, RawTokenSyntax?)
-    let (unexpectedBeforeRequirementLabel, requirementLabel): (RawUnexpectedNodesSyntax?, RawTokenSyntax?)
-    let (unexpectedBeforeRequirementColon, requirementColon): (RawUnexpectedNodesSyntax?, RawTokenSyntax?)
-    let requirement: RawExprSyntax?
-    if locationLabel.tokenKind != .keyword(.path) {
-      (unexpectedBeforeRequirementComma, requirementComma) = self.expect(.comma)
+    let packageDescription: RawPackageAttributeArgumentsSyntax.Description
+    if locationLabel.tokenKind == .keyword(.path) {
+      packageDescription = .local(
+        RawLocalPackageDescriptionSyntax(
+          unexpectedBeforeLocationLabel,
+          label: locationLabel,
+          unexpectedBeforeLocationColon,
+          colon: locationColon,
+          path: location,
+          arena: self.arena
+        )
+      )
+    } else {
+      let (unexpectedBeforeRequirementComma, requirementComma) = self.expect(.comma)
       if self.at(any: [.colon, .keyword(.from), .keyword(.exact), .keyword(.branch), .keyword(.revision)]) {
-        (unexpectedBeforeRequirementLabel, requirementLabel) = self.expectAny([.keyword(.from), .keyword(.exact), .keyword(.branch), .keyword(.revision)], default: .keyword(.from))
-        (unexpectedBeforeRequirementColon, requirementColon) = self.expect(.colon)
-        requirement = self.parseStringLiteral().as(RawExprSyntax.self)
+        let (unexpectedBeforeRequirementLabel, requirementLabel) = self.expectAny([.keyword(.from), .keyword(.exact), .keyword(.branch), .keyword(.revision)], default: .keyword(.from))
+        let (unexpectedBeforeRequirementColon, requirementColon) = self.expect(.colon)
+        let requirement = self.parseStringLiteral().as(RawExprSyntax.self)!
+        packageDescription = .remote(
+          RawRemotePackageDescriptionSyntax(
+            unexpectedBeforeLocationLabel,
+            locationLabel: locationLabel,
+            unexpectedBeforeLocationColon,
+            locationColon: locationColon,
+            location: location,
+            unexpectedBeforeRequirementComma,
+            comma: requirementComma,
+            unexpectedBeforeRequirementLabel,
+            requirementLabel: requirementLabel,
+            unexpectedBeforeRequirementColon,
+            requirementColon: requirementColon,
+            requirement: requirement,
+            arena: self.arena
+          )
+        )
       } else {
-        (unexpectedBeforeRequirementLabel, requirementLabel) = (nil, nil)
-        (unexpectedBeforeRequirementColon, requirementColon) = (nil, nil)
-        requirement = self.parseExpression()
+        let requirement = self.parseExpression()
+        packageDescription = .remote(
+          RawRemotePackageDescriptionSyntax(
+            unexpectedBeforeLocationLabel,
+            locationLabel: locationLabel,
+            unexpectedBeforeLocationColon,
+            locationColon: locationColon,
+            location: location,
+            unexpectedBeforeRequirementComma,
+            comma: requirementComma,
+            requirementLabel: nil,
+            requirementColon: nil,
+            requirement: requirement,
+            arena: self.arena
+          )
+        )
       }
-    } else {
-      (unexpectedBeforeRequirementComma, requirementComma) = (nil, nil)
-      (unexpectedBeforeRequirementLabel, requirementLabel) = (nil, nil)
-      (unexpectedBeforeRequirementColon, requirementColon) = (nil, nil)
-      requirement = nil
     }
-    // Parsing package requirement.
-    let productComma = self.consume(if: .comma)
-    let (unexpectedBeforeProductLabel, productLabel): (RawUnexpectedNodesSyntax?, RawTokenSyntax?)
-    let (unexpectedBeforeProductColon, productColon): (RawUnexpectedNodesSyntax?, RawTokenSyntax?)
-    let productName: RawStringLiteralExprSyntax?
-    if productComma != nil {
-      (unexpectedBeforeProductLabel, productLabel) = self.expect(.keyword(.product))
-      (unexpectedBeforeProductColon, productColon) = self.expect(.colon)
-      productName = self.parseStringLiteral()
+    // Parsing package product
+    let comma = self.consume(if: .comma)
+    let packageProduct: RawPackageProductSyntax?
+    if comma != nil {
+      let (unexpectedBeforeProductLabel, productLabel) = self.expect(.keyword(.product))
+      let (unexpectedBeforeProductColon, productColon) = self.expect(.colon)
+      let productName = self.parseStringLiteral()
+      packageProduct = RawPackageProductSyntax(
+        unexpectedBeforeProductLabel,
+        label: productLabel,
+        unexpectedBeforeProductColon,
+        colon: productColon,
+        name: productName,
+        arena: self.arena
+      )
     } else {
-      (unexpectedBeforeProductLabel, productLabel) = (nil, nil)
-      (unexpectedBeforeProductColon, productColon) = (nil, nil)
-      productName = nil
+      packageProduct = nil
     }
     // Returning @_package argument list
     return RawPackageAttributeArgumentsSyntax(
-      unexpectedBeforeLocationLabel,
-      locationLabel: locationLabel,
-      unexpectedBeforeLocationColon,
-      locationColon: locationColon,
-      location: location,
-      unexpectedBeforeRequirementComma,
-      requirementComma: requirementComma,
-      unexpectedBeforeRequirementLabel,
-      requirementLabel: requirementLabel,
-      unexpectedBeforeRequirementColon,
-      requirementColon: requirementColon,
-      requirement: requirement,
-      productComma: productComma,
-      unexpectedBeforeProductLabel,
-      productLabel: productLabel,
-      unexpectedBeforeProductColon,
-      productColon: productColon,
-      productName: productName,
+      description: packageDescription,
+      comma: comma,
+      product: packageProduct,
       arena: self.arena
     )
   }

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

@@ -353,6 +353,9 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/DeclNameSyntax>
 - <doc:SwiftSyntax/ImplementsAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/PackageAttributeArgumentsSyntax>
+- <doc:SwiftSyntax/PackageProductSyntax>
+- <doc:SwiftSyntax/LocalPackageDescriptionSyntax>
+- <doc:SwiftSyntax/RemotePackageDescriptionSyntax>
 - <doc:SwiftSyntax/ObjCSelectorPieceSyntax>
 - <doc:SwiftSyntax/ObjCSelectorSyntax>
 - <doc:SwiftSyntax/DifferentiableAttributeArgumentsSyntax>