Fine-tune for different kinds of package dependency

Author: stevapple

CodeGeneration/Sources/SyntaxSupport/gyb_generated/AttributeNodes.swift

@@ -202,10 +202,12 @@ public let ATTRIBUTE_NODES: [Node] = [
        children: [
          Child(name: "Description",
                kind: .nodeChoices(choices: [
-                 Child(name: "Remote",
-                       kind: .node(kind: "RemotePackageDescription")),
-                 Child(name: "Local",
-                       kind: .node(kind: "LocalPackageDescription"))
+                 Child(name: "FileSystem",
+                       kind: .node(kind: "FileSystemPackageDescription")),
+                 Child(name: "SourceControl",
+                       kind: .node(kind: "SourceControlPackageDescription")),
+                 Child(name: "Registry",
+                       kind: .node(kind: "RegistryPackageDescription"))
                ])),
          Child(name: "Comma",
                kind: .token(choices: [.token(tokenKind: "CommaToken")]),
@@ -232,7 +234,7 @@ public let ATTRIBUTE_NODES: [Node] = [
                description: "The exact product name from package")
        ]),
 
-  Node(name: "LocalPackageDescription",
+  Node(name: "FileSystemPackageDescription",
        nameForDiagnostics: "local package description",
        description: "The description of a local package",
        kind: "Syntax",
@@ -247,35 +249,61 @@ public let ATTRIBUTE_NODES: [Node] = [
                description: "The package path")
        ]),
 
-  Node(name: "RemotePackageDescription",
+  Node(name: "SourceControlPackageDescription",
+       nameForDiagnostics: "remote package description (source control)",
+       description: "The description of a remote package using source control",
+       kind: "Syntax",
+       children: [
+         Child(name: "Label",
+               kind: .token(choices: [.keyword(text: "url")]),
+               description: "The URL label"),
+         Child(name: "Colon",
+               kind: .token(choices: [.token(tokenKind: "ColonToken")])),
+         Child(name: "URL",
+               kind: .node(kind: "StringLiteralExpr"),
+               description: "The Git URL of package"),
+         Child(name: "Comma",
+               kind: .token(choices: [.token(tokenKind: "CommaToken")]),
+               description: "The comma between the package URL and requirement"),
+         Child(name: "Requirement",
+               kind: .nodeChoices(choices: [
+                 Child(name: "Labeled",
+                       kind: .node(kind: "SourceControlRequirement")),
+                 Child(name: "Range",
+                       kind: .node(kind: "Expr"))
+               ]),
+               description: "Version requirement of the remote package")
+       ]),
+
+  Node(name: "RegistryPackageDescription",
        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: "url")]),
-               description: "The location label."),
-         Child(name: "LocationColon",
+         Child(name: "Label",
+               kind: .token(choices: [.keyword(text: "id")]),
+               description: "The ID label"),
+         Child(name: "Colon",
                kind: .token(choices: [.token(tokenKind: "ColonToken")])),
-         Child(name: "Location",
+         Child(name: "Identifier",
                kind: .node(kind: "StringLiteralExpr"),
-               description: "The URL or identifier of package."),
+               description: "The identifier of package"),
          Child(name: "Comma",
                kind: .token(choices: [.token(tokenKind: "CommaToken")]),
-               description: "The comma between the package location and requirement"),
+               description: "The comma between the package identifier and requirement"),
          Child(name: "Requirement",
                kind: .nodeChoices(choices: [
                  Child(name: "Labeled",
-                       kind: .node(kind: "LabeledPackageRequirement")),
-                 Child(name: "Wildcard",
+                       kind: .node(kind: "RegistryRequirement")),
+                 Child(name: "Range",
                        kind: .node(kind: "Expr"))
                ]),
-               description: "Version requirement of remote package")
+               description: "Version requirement of the remote package")
        ]),
 
-  Node(name: "LabeledPackageRequirement",
-       nameForDiagnostics: "labeled package requirement",
-       description: "Labeled requirement of a remote package",
+  Node(name: "SourceControlRequirement",
+       nameForDiagnostics: "labeled package requirement (source control)",
+       description: "Labeled requirement of a source-control package",
        kind: "Syntax",
        children: [
          Child(name: "Label",
@@ -290,6 +318,23 @@ public let ATTRIBUTE_NODES: [Node] = [
                description: "Requirement description of remote package")
        ]),
 
+  Node(name: "RegistryRequirement",
+       nameForDiagnostics: "labeled package requirement (registry)",
+       description: "Labeled requirement of a registry package",
+       kind: "Syntax",
+       children: [
+         Child(name: "Label",
+               kind: .token(choices: [.keyword(text: "exact"), .keyword(text: "from")]),
+               description: "The requirement label",
+               isOptional: true),
+         Child(name: "Colon",
+               kind: .token(choices: [.token(tokenKind: "ColonToken")]),
+               isOptional: true),
+         Child(name: "Requirement",
+               kind: .node(kind: "StringLiteralExpr"),
+               description: "Requirement description of remote package")
+       ]),
+
   Node(name: "ObjCSelectorPiece",
        nameForDiagnostics: "Objective-C selector piece",
        description: "A piece of an Objective-C selector. Either consisting of just an identifier for a nullary selector, an identifier and a colon for a labeled argument or just a colon for an unlabeled argument",

Sources/SwiftParser/Attributes.swift

@@ -879,9 +879,11 @@ extension Parser {
     let (unexpectedBeforeLocationColon, locationColon) = self.expect(.colon)
     let location = self.parseStringLiteral()
     let packageDescription: RawPackageAttributeArgumentsSyntax.Description
-    if locationLabel.tokenKind == .keyword(.path) {
-      packageDescription = .local(
-        RawLocalPackageDescriptionSyntax(
+    // Parsing package requirement
+    switch locationLabel.tokenKind {
+    case .keyword(.path):
+      packageDescription = .fileSystem(
+        RawFileSystemPackageDescriptionSyntax(
           unexpectedBeforeLocationLabel,
           label: locationLabel,
           unexpectedBeforeLocationColon,
@@ -890,16 +892,15 @@ extension Parser {
           arena: self.arena
         )
       )
-    } else {
+    case .keyword(.id):
       let (unexpectedBeforeRequirementComma, requirementComma) = self.expect(.comma)
-      // Parsing package requirement
-      let packageRequirement: RawRemotePackageDescriptionSyntax.Requirement
-      if self.at(any: [.colon, .keyword(.from), .keyword(.exact), .keyword(.branch), .keyword(.revision)]) {
-        let (unexpectedBeforeRequirementLabel, requirementLabel) = self.expectAny([.keyword(.from), .keyword(.exact), .keyword(.branch), .keyword(.revision)], default: .keyword(.from))
+      let registryRequirement: RawRegistryPackageDescriptionSyntax.Requirement
+      if self.at(any: [.colon, .keyword(.exact), .keyword(.from)]) {
+        let (unexpectedBeforeRequirementLabel, requirementLabel) = self.expectAny([.keyword(.from), .keyword(.exact)], default: .keyword(.from))
         let (unexpectedBeforeRequirementColon, requirementColon) = self.expect(.colon)
         let requirement = self.parseStringLiteral()
-        packageRequirement = .labeled(
-          RawLabeledPackageRequirementSyntax(
+        registryRequirement = .labeled(
+          RawRegistryRequirementSyntax(
             unexpectedBeforeRequirementLabel,
             label: requirementLabel,
             unexpectedBeforeRequirementColon,
@@ -910,18 +911,55 @@ extension Parser {
         )
       } else {
         let requirement = self.parseExpression()
-        packageRequirement = .wildcard(requirement)
+        registryRequirement = .range(requirement)
       }
-      packageDescription = .remote(
-        RawRemotePackageDescriptionSyntax(
+      packageDescription = .registry(
+        RawRegistryPackageDescriptionSyntax(
           unexpectedBeforeLocationLabel,
-          locationLabel: locationLabel,
+          label: locationLabel,
           unexpectedBeforeLocationColon,
-          locationColon: locationColon,
-          location: location,
+          colon: locationColon,
+          identifier: location,
+          unexpectedBeforeRequirementComma,
+          comma: requirementComma,
+          requirement: registryRequirement,
+          arena: self.arena
+        )
+      )
+    case .keyword(.url):
+      // FIXME: Default to handling as source-control for now
+      fallthrough
+    default:
+      let (unexpectedBeforeRequirementComma, requirementComma) = self.expect(.comma)
+      let sourceControlRequirement: RawSourceControlPackageDescriptionSyntax.Requirement
+      if self.at(any: [.colon, .keyword(.branch), .keyword(.exact), .keyword(.from), .keyword(.revision)]) {
+        let (unexpectedBeforeRequirementLabel, requirementLabel) = self.expectAny([.keyword(.branch), .keyword(.exact), .keyword(.from), .keyword(.revision)], default: .keyword(.from))
+        let (unexpectedBeforeRequirementColon, requirementColon) = self.expect(.colon)
+        let requirement = self.parseStringLiteral()
+        sourceControlRequirement = .labeled(
+          RawSourceControlRequirementSyntax(
+            unexpectedBeforeRequirementLabel,
+            label: requirementLabel,
+            unexpectedBeforeRequirementColon,
+            colon: requirementColon,
+            requirement: requirement,
+            arena: self.arena
+          )
+        )
+      } else {
+        let requirement = self.parseExpression()
+        sourceControlRequirement = .range(requirement)
+      }
+      packageDescription = .sourceControl(
+        RawSourceControlPackageDescriptionSyntax(
+          unexpectedBeforeLocationLabel,
+          label: locationLabel,
+          unexpectedBeforeLocationColon,
+          colon: locationColon,
+          url: location,
           unexpectedBeforeRequirementComma,
           comma: requirementComma,
-          requirement: packageRequirement,
+          requirement: sourceControlRequirement,
           arena: self.arena
         )
       )

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

@@ -354,9 +354,11 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
 - <doc:SwiftSyntax/ImplementsAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/PackageAttributeArgumentsSyntax>
 - <doc:SwiftSyntax/PackageProductSyntax>
-- <doc:SwiftSyntax/LocalPackageDescriptionSyntax>
-- <doc:SwiftSyntax/RemotePackageDescriptionSyntax>
-- <doc:SwiftSyntax/LabeledPackageRequirementSyntax>
+- <doc:SwiftSyntax/FileSystemPackageDescriptionSyntax>
+- <doc:SwiftSyntax/SourceControlPackageDescriptionSyntax>
+- <doc:SwiftSyntax/RegistryPackageDescriptionSyntax>
+- <doc:SwiftSyntax/SourceControlRequirementSyntax>
+- <doc:SwiftSyntax/RegistryRequirementSyntax>
 - <doc:SwiftSyntax/ObjCSelectorPieceSyntax>
 - <doc:SwiftSyntax/ObjCSelectorSyntax>
 - <doc:SwiftSyntax/DifferentiableAttributeArgumentsSyntax>