Fix a few minor inconsistencies in TokenSpecSets

Author: ahoppen

Sources/SwiftParser/Attributes.swift

@@ -32,6 +32,7 @@ extension Parser {
   /// Compiler-known attributes that take arguments.
   enum DeclarationAttributeWithSpecialSyntax: TokenSpecSet {
     case _alignment
+    case _backDeploy
     case _cdecl
     case _documentation
     case _dynamicReplacement
@@ -66,7 +67,7 @@ extension Parser {
     init?(lexeme: Lexer.Lexeme) {
       switch lexeme {
       case TokenSpec(._alignment): self = ._alignment
-      case TokenSpec(._backDeploy): self = .backDeployed
+      case TokenSpec(._backDeploy): self = ._backDeploy
       case TokenSpec(._cdecl): self = ._cdecl
       case TokenSpec(._documentation): self = ._documentation
       case TokenSpec(._dynamicReplacement): self = ._dynamicReplacement
@@ -105,6 +106,7 @@ extension Parser {
     var spec: TokenSpec {
       switch self {
       case ._alignment: return .keyword(._alignment)
+      case ._backDeploy: return .keyword(._backDeploy)
       case ._cdecl: return .keyword(._cdecl)
       case ._documentation: return .keyword(._documentation)
       case ._dynamicReplacement: return .keyword(._dynamicReplacement)
@@ -223,7 +225,7 @@ extension Parser {
       return parseAttribute(argumentMode: .required) { parser in
         return .availability(parser.parseAvailabilityArgumentSpecList())
       }
-    case .backDeployed:
+    case .backDeployed, ._backDeploy:
       return parseAttribute(argumentMode: .required) { parser in
         return .backDeployedArguments(parser.parseBackDeployedArguments())
       }

Sources/SwiftParser/Specifiers.swift

@@ -42,7 +42,7 @@ public enum AsyncEffectSpecifier: TokenSpecSet {
   var spec: TokenSpec {
     switch self {
     case .async: return .keyword(.async)
-    case .await: return .keyword(.await)
+    case .await: return TokenSpec(.await, allowAtStartOfLine: false)
     case .reasync: return .keyword(.reasync)
     }
   }
@@ -79,9 +79,9 @@ public enum ThrowsEffectSpecifier: TokenSpecSet {
   var spec: TokenSpec {
     switch self {
     case .rethrows: return .keyword(.rethrows)
-    case .throw: return .keyword(.throw)
+    case .throw: return TokenSpec(.throw, allowAtStartOfLine: false)
     case .throws: return .keyword(.throws)
-    case .try: return .keyword(.try)
+    case .try: return TokenSpec(.try, allowAtStartOfLine: false)
     }
   }
 }
@@ -186,7 +186,7 @@ extension RawDeclEffectSpecifiersSyntax: RawEffectSpecifiersTrait {
 
     var spec: TokenSpec {
       switch self {
-      case .await: return .keyword(.await)
+      case .await: return TokenSpec(.await, allowAtStartOfLine: false)
       }
     }
   }
@@ -225,8 +225,8 @@ extension RawDeclEffectSpecifiersSyntax: RawEffectSpecifiersTrait {
 
     var spec: TokenSpec {
       switch self {
-      case .try: return .keyword(.try)
-      case .throw: return .keyword(.throw)
+      case .try: return TokenSpec(.try, allowAtStartOfLine: false)
+      case .throw: return TokenSpec(.throw, allowAtStartOfLine: false)
       }
     }
   }
@@ -267,7 +267,7 @@ extension RawTypeEffectSpecifiersSyntax: RawEffectSpecifiersTrait {
 
     var spec: TokenSpec {
       switch self {
-      case .await: return .keyword(.await)
+      case .await: return TokenSpec(.await, allowAtStartOfLine: false)
       case .reasync: return .keyword(.reasync)
       }
     }
@@ -307,8 +307,8 @@ extension RawTypeEffectSpecifiersSyntax: RawEffectSpecifiersTrait {
     var spec: TokenSpec {
       switch self {
       case .rethrows: return .keyword(.rethrows)
-      case .try: return .keyword(.try)
-      case .throw: return .keyword(.throw)
+      case .try: return TokenSpec(.try, allowAtStartOfLine: false)
+      case .throw: return TokenSpec(.throw, allowAtStartOfLine: false)
       }
     }
   }

Sources/SwiftParser/TokenConsumer.swift

@@ -106,6 +106,7 @@ extension TokenConsumer {
   @inline(__always)
   mutating func at<SpecSet: TokenSpecSet>(anyIn specSet: SpecSet.Type) -> (SpecSet, TokenConsumptionHandle)? {
     if let matchedKind = SpecSet(lexeme: self.currentToken) {
+      assert(matchedKind.spec ~= self.currentToken)
       return (
         matchedKind,
         TokenConsumptionHandle(spec: matchedKind.spec)