Rough semantic parsing of @_package arguments

stevapple · stevapple · commit e2cf48502a11 · 2023-01-15T14:01:22.000+08:00
diff --git a/CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift b/CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift
@@ -99,6 +99,7 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("available"),
   KeywordSpec("await"),
   KeywordSpec("before"),
+  KeywordSpec("branch"),
   KeywordSpec("break", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("case", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("catch", isLexerClassified: true, requiresLeadingSpace: true),
@@ -128,10 +129,12 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("fileprivate", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("final"),
   KeywordSpec("for", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("from"),
   KeywordSpec("func", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("get"),
   KeywordSpec("guard", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("higherThan"),
+  KeywordSpec("id"),
   KeywordSpec("if", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("import", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("in", isLexerClassified: true, requiresLeadingSpace: true, requiresTrailingSpace: true),
@@ -169,10 +172,12 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("optional"),
   KeywordSpec("override"),
   KeywordSpec("package"),
+  KeywordSpec("path"),
   KeywordSpec("postfix"),
   KeywordSpec("precedencegroup", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("prefix"),
   KeywordSpec("private", isLexerClassified: true, requiresTrailingSpace: true),
+  KeywordSpec("product"),
   KeywordSpec("Protocol"),
   KeywordSpec("protocol", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("public", isLexerClassified: true, requiresTrailingSpace: true),
@@ -183,6 +188,7 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("rethrows", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("return", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("reverse"),
+  KeywordSpec("revision"),
   KeywordSpec("safe"),
   KeywordSpec("self", isLexerClassified: true),
   KeywordSpec("Self", isLexerClassified: true),
@@ -212,6 +218,7 @@ public let KEYWORDS: [KeywordSpec] = [
   KeywordSpec("unsafe"),
   KeywordSpec("unsafeAddress"),
   KeywordSpec("unsafeMutableAddress"),
+  KeywordSpec("url"),
   KeywordSpec("var", isLexerClassified: true, requiresTrailingSpace: true),
   KeywordSpec("visibility"),
   KeywordSpec("weak"),
diff --git a/CodeGeneration/Sources/SyntaxSupport/gyb_generated/AttributeNodes.swift b/CodeGeneration/Sources/SyntaxSupport/gyb_generated/AttributeNodes.swift
@@ -268,6 +268,7 @@ public let ATTRIBUTE_NODES: [Node] = [
          Child(name: "LocReqComma",
                kind: "CommaToken",
                description: "The comma separating the location and requirement",
+               isOptional: true,
                tokenChoices: [
                  "Comma"
                ]),
diff --git a/Sources/SwiftParser/Attributes.swift b/Sources/SwiftParser/Attributes.swift
@@ -897,20 +897,80 @@ extension Parser {
     )
   }
 
+  enum PackageLocationLabel: RawTokenKindSubset {
+    case id
+    case path
+    case url
+
+    init?(lexeme: Lexer.Lexeme) {
+      switch lexeme {
+      case RawTokenKindMatch(.id): self = .id
+      case RawTokenKindMatch(.path): self = .path
+      case RawTokenKindMatch(.url): self = .url
+      default: return nil
+      }
+    }
+
+    var rawTokenKind: RawTokenKind {
+      switch self {
+      case .id: return .keyword(.id)
+      case .path: return .keyword(.path)
+      case .url: return .keyword(.url)
+      }
+    }
+  }
+
+  enum PackageRequirementLabel: RawTokenKindSubset {
+    case branch
+    case from
+    case revision
+
+    init?(lexeme: Lexer.Lexeme) {
+      switch lexeme {
+      case RawTokenKindMatch(.branch): self = .branch
+      case RawTokenKindMatch(.from): self = .from
+      case RawTokenKindMatch(.revision): self = .revision
+      default: return nil
+      }
+    }
+
+    var rawTokenKind: RawTokenKind {
+      switch self {
+      case .branch: return .keyword(.branch)
+      case .from: return .keyword(.from)
+      case .revision: return .keyword(.revision)
+      }
+    }
+  }
+
   mutating func parsePackageAttributeArguments() -> RawPackageAttributeArgumentsSyntax {
-    let (unexpectedBeforeLocationLabel, locationLabel) = self.parseArgumentLabel()
+    // Parsing package location.
+    let locationLabel = self.consume(ifAnyIn: PackageLocationLabel.self) ?? missingToken(.identifier)
     let (unexpectedBeforeLocationColon, locationColon) = self.expect(.colon)
     let (unexpectedBeforeLocation, location) = self.expect(.stringLiteral)
-    let (unexpectedBeforeLocReqComma, locReqComma) = self.expect(.comma)
-    // FIXME: Requirement label/colon is optional.
-    let (unexpectedBeforeRequirementLabel, requirementLabel) = self.parseArgumentLabel()
-    let (unexpectedBeforeRequirementColon, requirementColon) = self.expect(.colon)
-    // TODO: Semantically parsing according to `locationLabel`.
-    let requirement = self.parseExpression()
-    // FIXME: What about unexpected token before comma?
+    // Parsing package requirement.
+    let (unexpectedBeforeLocReqComma, locReqComma): (RawUnexpectedNodesSyntax?, RawTokenSyntax?)
+    let (unexpectedBeforeRequirementLabel, requirementLabel): (RawUnexpectedNodesSyntax?, RawTokenSyntax?)
+    let (unexpectedBeforeRequirementColon, requirementColon): (RawUnexpectedNodesSyntax?, RawTokenSyntax?)
+    let requirement: RawExprSyntax?
+    if locationLabel.tokenKind != .keyword(.path) {
+      (unexpectedBeforeLocReqComma, locReqComma) = self.expect(.comma)
+      if let label = self.consume(ifAnyIn: PackageRequirementLabel.self) {
+        (unexpectedBeforeRequirementLabel, requirementLabel) = (nil, label)
+        (unexpectedBeforeRequirementColon, requirementColon) = self.expect(.colon)
+      } else {
+        (unexpectedBeforeRequirementLabel, requirementLabel) = (nil, nil)
+        (unexpectedBeforeRequirementColon, requirementColon) = (nil, nil)
+      }
+      requirement = self.parseExpression()
+    } else {
+      (unexpectedBeforeLocReqComma, locReqComma) = (nil, nil)
+      (unexpectedBeforeRequirementLabel, requirementLabel) = (nil, nil)
+      (unexpectedBeforeRequirementColon, requirementColon) = (nil, nil)
+      requirement = nil
+    }
     guard self.at(.comma) else {
       return RawPackageAttributeArgumentsSyntax(
-        unexpectedBeforeLocationLabel,
         locationLabel: locationLabel,
         unexpectedBeforeLocationColon,
         locationColon: locationColon,
@@ -932,11 +992,10 @@ extension Parser {
       )
     }
     let (unexpectedBeforeReqProdComma, reqProdComma) = self.expect(.comma)
-    let (unexpectedBeforeProductLabel, productLabel) = self.parseArgumentLabel()
+    let (unexpectedBeforeProductLabel, productLabel) = self.expect(.keyword(.product))
     let (unexpectedBeforeProductColon, productColon) = self.expect(.colon)
     let (unexpectedBeforeProductName, productName) = self.expect(.stringLiteral)
     return RawPackageAttributeArgumentsSyntax(
-      unexpectedBeforeLocationLabel,
       locationLabel: locationLabel,
       unexpectedBeforeLocationColon,
       locationColon: locationColon,
diff --git a/Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxNodes.swift b/Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxNodes.swift
@@ -11203,7 +11203,7 @@ public struct RawPackageAttributeArgumentsSyntax: RawSyntaxNodeProtocol {
     _ unexpectedBetweenLocationColonAndLocation: RawUnexpectedNodesSyntax? = nil,
     location: RawTokenSyntax,
     _ unexpectedBetweenLocationAndLocReqComma: RawUnexpectedNodesSyntax? = nil,
-    locReqComma: RawTokenSyntax,
+    locReqComma: RawTokenSyntax?,
     _ unexpectedBetweenLocReqCommaAndRequirementLabel: RawUnexpectedNodesSyntax? = nil,
     requirementLabel: RawTokenSyntax?,
     _ unexpectedBetweenRequirementLabelAndRequirementColon: RawUnexpectedNodesSyntax? = nil,
@@ -11231,7 +11231,7 @@ public struct RawPackageAttributeArgumentsSyntax: RawSyntaxNodeProtocol {
       layout[4] = unexpectedBetweenLocationColonAndLocation?.raw
       layout[5] = location.raw
       layout[6] = unexpectedBetweenLocationAndLocReqComma?.raw
-      layout[7] = locReqComma.raw
+      layout[7] = locReqComma?.raw
       layout[8] = unexpectedBetweenLocReqCommaAndRequirementLabel?.raw
       layout[9] = requirementLabel?.raw
       layout[10] = unexpectedBetweenRequirementLabelAndRequirementColon?.raw
@@ -11272,8 +11272,8 @@ public struct RawPackageAttributeArgumentsSyntax: RawSyntaxNodeProtocol {
   public var unexpectedBetweenLocationAndLocReqComma: RawUnexpectedNodesSyntax? {
     layoutView.children[6].map(RawUnexpectedNodesSyntax.init(raw:))
   }
-  public var locReqComma: RawTokenSyntax {
-    layoutView.children[7].map(RawTokenSyntax.init(raw:))!
+  public var locReqComma: RawTokenSyntax? {
+    layoutView.children[7].map(RawTokenSyntax.init(raw:))
   }
   public var unexpectedBetweenLocReqCommaAndRequirementLabel: RawUnexpectedNodesSyntax? {
     layoutView.children[8].map(RawUnexpectedNodesSyntax.init(raw:))
diff --git a/Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxValidation.swift b/Sources/SwiftSyntax/Raw/gyb_generated/RawSyntaxValidation.swift
@@ -1663,7 +1663,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
     assertNoError(kind, 4, verify(layout[4], as: RawUnexpectedNodesSyntax?.self))
     assertNoError(kind, 5, verify(layout[5], as: RawTokenSyntax.self))
     assertNoError(kind, 6, verify(layout[6], as: RawUnexpectedNodesSyntax?.self))
-    assertNoError(kind, 7, verify(layout[7], as: RawTokenSyntax.self))
+    assertNoError(kind, 7, verify(layout[7], as: RawTokenSyntax?.self))
     assertNoError(kind, 8, verify(layout[8], as: RawUnexpectedNodesSyntax?.self))
     assertNoError(kind, 9, verify(layout[9], as: RawTokenSyntax?.self))
     assertNoError(kind, 10, verify(layout[10], as: RawUnexpectedNodesSyntax?.self))
diff --git a/Sources/SwiftSyntax/generated/Keyword.swift b/Sources/SwiftSyntax/generated/Keyword.swift
@@ -149,6 +149,8 @@ public enum Keyword: StaticString {
   
   case before
   
+  case branch
+  
   case `break`
   
   case `case`
@@ -207,6 +209,8 @@ public enum Keyword: StaticString {
   
   case `for`
   
+  case from
+  
   case `func`
   
   case get
@@ -215,6 +219,8 @@ public enum Keyword: StaticString {
   
   case higherThan
   
+  case id
+  
   case `if`
   
   case `import`
@@ -289,6 +295,8 @@ public enum Keyword: StaticString {
   
   case package
   
+  case path
+  
   case postfix
   
   case `precedencegroup`
@@ -297,6 +305,8 @@ public enum Keyword: StaticString {
   
   case `private`
   
+  case product
+  
   case `Protocol`
   
   case `protocol`
@@ -317,6 +327,8 @@ public enum Keyword: StaticString {
   
   case reverse
   
+  case revision
+  
   case safe
   
   case `self`
@@ -375,6 +387,8 @@ public enum Keyword: StaticString {
   
   case unsafeMutableAddress
   
+  case url
+  
   case `var`
   
   case visibility
@@ -401,6 +415,8 @@ public enum Keyword: StaticString {
         self = .`as`
       case "do": 
         self = .`do`
+      case "id": 
+        self = .id
       case "if": 
         self = .`if`
       case "in": 
@@ -432,6 +448,8 @@ public enum Keyword: StaticString {
         self = .spi
       case "try": 
         self = .`try`
+      case "url": 
+        self = .url
       case "var": 
         self = .`var`
       case "wrt": 
@@ -451,6 +469,8 @@ public enum Keyword: StaticString {
         self = .`else`
       case "enum": 
         self = .`enum`
+      case "from": 
+        self = .from
       case "func": 
         self = .`func`
       case "init": 
@@ -463,6 +483,8 @@ public enum Keyword: StaticString {
         self = .objc
       case "open": 
         self = .open
+      case "path": 
+        self = .path
       case "safe": 
         self = .safe
       case "self": 
@@ -539,6 +561,8 @@ public enum Keyword: StaticString {
         self = ._local
       case "before": 
         self = .before
+      case "branch": 
+        self = .branch
       case "deinit": 
         self = .`deinit`
       case "didSet": 
@@ -598,6 +622,8 @@ public enum Keyword: StaticString {
         self = .postfix
       case "private": 
         self = .`private`
+      case "product": 
+        self = .product
       case "reasync": 
         self = .reasync
       case "renamed": 
@@ -657,6 +683,8 @@ public enum Keyword: StaticString {
         self = .required
       case "rethrows": 
         self = .`rethrows`
+      case "revision": 
+        self = .revision
       case "Sendable": 
         self = .Sendable
       default: 
diff --git a/Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift b/Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift
@@ -5181,7 +5181,7 @@ public enum SyntaxFactory {
     }
   }
   @available(*, deprecated, message: "Use initializer on PackageAttributeArgumentsSyntax")
-  public static func makePackageAttributeArguments(_ unexpectedBeforeLocationLabel: UnexpectedNodesSyntax? = nil, locationLabel: TokenSyntax, _ unexpectedBetweenLocationLabelAndLocationColon: UnexpectedNodesSyntax? = nil, locationColon: TokenSyntax, _ unexpectedBetweenLocationColonAndLocation: UnexpectedNodesSyntax? = nil, location: TokenSyntax, _ unexpectedBetweenLocationAndLocReqComma: UnexpectedNodesSyntax? = nil, locReqComma: TokenSyntax, _ unexpectedBetweenLocReqCommaAndRequirementLabel: UnexpectedNodesSyntax? = nil, requirementLabel: TokenSyntax?, _ unexpectedBetweenRequirementLabelAndRequirementColon: UnexpectedNodesSyntax? = nil, requirementColon: TokenSyntax?, _ unexpectedBetweenRequirementColonAndRequirement: UnexpectedNodesSyntax? = nil, requirement: ExprSyntax?, _ unexpectedBetweenRequirementAndReqProdComma: UnexpectedNodesSyntax? = nil, reqProdComma: TokenSyntax?, _ unexpectedBetweenReqProdCommaAndProductLabel: UnexpectedNodesSyntax? = nil, productLabel: TokenSyntax?, _ unexpectedBetweenProductLabelAndProductColon: UnexpectedNodesSyntax? = nil, productColon: TokenSyntax?, _ unexpectedBetweenProductColonAndProductName: UnexpectedNodesSyntax? = nil, productName: TokenSyntax?, _ unexpectedAfterProductName: UnexpectedNodesSyntax? = nil) -> PackageAttributeArgumentsSyntax {
+  public static func makePackageAttributeArguments(_ unexpectedBeforeLocationLabel: UnexpectedNodesSyntax? = nil, locationLabel: TokenSyntax, _ unexpectedBetweenLocationLabelAndLocationColon: UnexpectedNodesSyntax? = nil, locationColon: TokenSyntax, _ unexpectedBetweenLocationColonAndLocation: UnexpectedNodesSyntax? = nil, location: TokenSyntax, _ unexpectedBetweenLocationAndLocReqComma: UnexpectedNodesSyntax? = nil, locReqComma: TokenSyntax?, _ unexpectedBetweenLocReqCommaAndRequirementLabel: UnexpectedNodesSyntax? = nil, requirementLabel: TokenSyntax?, _ unexpectedBetweenRequirementLabelAndRequirementColon: UnexpectedNodesSyntax? = nil, requirementColon: TokenSyntax?, _ unexpectedBetweenRequirementColonAndRequirement: UnexpectedNodesSyntax? = nil, requirement: ExprSyntax?, _ unexpectedBetweenRequirementAndReqProdComma: UnexpectedNodesSyntax? = nil, reqProdComma: TokenSyntax?, _ unexpectedBetweenReqProdCommaAndProductLabel: UnexpectedNodesSyntax? = nil, productLabel: TokenSyntax?, _ unexpectedBetweenProductLabelAndProductColon: UnexpectedNodesSyntax? = nil, productColon: TokenSyntax?, _ unexpectedBetweenProductColonAndProductName: UnexpectedNodesSyntax? = nil, productName: TokenSyntax?, _ unexpectedAfterProductName: UnexpectedNodesSyntax? = nil) -> PackageAttributeArgumentsSyntax {
     let layout: [RawSyntax?] = [
       unexpectedBeforeLocationLabel?.raw,
       locationLabel.raw,
@@ -5190,7 +5190,7 @@ public enum SyntaxFactory {
       unexpectedBetweenLocationColonAndLocation?.raw,
       location.raw,
       unexpectedBetweenLocationAndLocReqComma?.raw,
-      locReqComma.raw,
+      locReqComma?.raw,
       unexpectedBetweenLocReqCommaAndRequirementLabel?.raw,
       requirementLabel?.raw,
       unexpectedBetweenRequirementLabelAndRequirementColon?.raw,
@@ -5227,7 +5227,7 @@ public enum SyntaxFactory {
         nil,
         RawSyntax.makeMissingToken(kind: TokenKind.stringLiteral(""), arena: arena),
         nil,
-        RawSyntax.makeMissingToken(kind: TokenKind.comma, arena: arena),
+        nil,
         nil,
         nil,
         nil,
diff --git a/Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxNodes.swift b/Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxNodes.swift
diff --git a/Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift b/Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift
diff --git a/gyb_syntax_support/AttributeNodes.py b/gyb_syntax_support/AttributeNodes.py
