Remove AvailabilitySpecSource

It’s no longer needed

Author: ahoppen

Sources/SwiftParser/Attributes.swift

@@ -149,10 +149,8 @@ extension Parser {
 
     let argument: RawAttributeSyntax.Argument
     do {
-      if self.peek().rawTokenKind == .integerLiteral {
-        argument = .availability(self.parseAvailabilitySpecList(from: .available))
-      } else if self.peek().rawTokenKind == .floatingLiteral {
-        argument = .availability(self.parseAvailabilitySpecList(from: .available))
+      if self.peek().rawTokenKind == .integerLiteral || self.peek().rawTokenKind == .floatingLiteral {
+        argument = .availability(self.parseAvailabilitySpecList())
       } else {
         argument = .availability(self.parseExtendedAvailabilitySpecList())
       }
@@ -181,10 +179,8 @@ extension Parser {
 
     let argument: RawAttributeSyntax.Argument
     do {
-      if self.peek().rawTokenKind == .integerLiteral {
-        argument = .availability(self.parseAvailabilitySpecList(from: .available))
-      } else if self.peek().rawTokenKind == .floatingLiteral {
-        argument = .availability(self.parseAvailabilitySpecList(from: .available))
+      if self.peek().rawTokenKind == .integerLiteral || self.peek().rawTokenKind == .floatingLiteral {
+        argument = .availability(self.parseAvailabilitySpecList())
       } else {
         argument = .availability(self.parseExtendedAvailabilitySpecList())
       }
@@ -641,7 +637,7 @@ extension Parser {
       case (.availability, let handle)?:
         let ident = self.eat(handle)
         let (unexpectedBeforeColon, colon) = self.expect(.colon)
-        let availability = self.parseAvailabilitySpecList(from: .available)
+        let availability = self.parseAvailabilitySpecList()
         let (unexpectedBeforeSemi, semi) = self.expect(.semicolon)
         elements.append(
           .availabilityEntry(

Sources/SwiftParser/Availability.swift

@@ -13,32 +13,22 @@
 @_spi(RawSyntax) import SwiftSyntax
 
 extension Parser {
-  enum AvailabilitySpecSource {
-    case available
-    case unavailable
-    case macro
-  }
-
   /// Parse a list of availability arguments.
   ///
   /// Grammar
   /// =======
   ///
   ///     availability-arguments → availability-argument | availability-argument , availability-arguments
-  mutating func parseAvailabilitySpecList(
-    from source: AvailabilitySpecSource
-  ) -> RawAvailabilitySpecListSyntax {
+  mutating func parseAvailabilitySpecList() -> RawAvailabilitySpecListSyntax {
     var elements = [RawAvailabilityArgumentSyntax]()
     do {
       var keepGoing: RawTokenSyntax? = nil
       var availablityArgumentProgress = LoopProgressCondition()
       repeat {
         let entry: RawAvailabilityArgumentSyntax.Entry
-        switch source {
-        case .available where self.at(.identifier),
-          .unavailable where self.at(.identifier):
+        if self.at(.identifier) {
           entry = .availabilityVersionRestriction(self.parseAvailabilityMacro())
-        default:
+        } else {
           entry = self.parseAvailabilitySpec()
         }
 

Sources/SwiftParser/Statements.swift

@@ -357,27 +357,21 @@ extension Parser {
   @_spi(RawSyntax)
   public mutating func parsePoundAvailableConditionElement() -> RawConditionElementSyntax.Condition {
     assert(self.at(any: [.poundAvailableKeyword, .poundUnavailableKeyword]))
-    let kind: AvailabilitySpecSource = self.at(.poundAvailableKeyword) ? .available : .unavailable
     let keyword = self.consumeAnyToken()
     let (unexpectedBeforeLParen, lparen) = self.expect(.leftParen)
-    let spec = self.parseAvailabilitySpecList(from: kind)
+    let spec = self.parseAvailabilitySpecList()
     let (unexpectedBeforeRParen, rparen) = self.expect(.rightParen)
-    switch kind {
-    case .available, .unavailable:
-      return .availability(
-        RawAvailabilityConditionSyntax(
-          availabilityKeyword: keyword,
-          unexpectedBeforeLParen,
-          leftParen: lparen,
-          availabilitySpec: spec,
-          unexpectedBeforeRParen,
-          rightParen: rparen,
-          arena: self.arena
-        )
+    return .availability(
+      RawAvailabilityConditionSyntax(
+        availabilityKeyword: keyword,
+        unexpectedBeforeLParen,
+        leftParen: lparen,
+        availabilitySpec: spec,
+        unexpectedBeforeRParen,
+        rightParen: rparen,
+        arena: self.arena
       )
-    case .macro:
-      fatalError("Macros are not allowed in this position!")
-    }
+    )
   }
 
   /// Parse a `#_hasSymbol` condition.