Kill TokenSpec.associatedValueClass

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/TokenSpec.swift

@@ -12,37 +12,40 @@
 
 /// Represents the specification for a Token in the TokenSyntax file.
 public struct TokenSpec {
+  public enum Kind {
+    case punctuation
+    /// The `keyword` TokenKind that contains the actual keyword as an associated value
+    case keyword
+    case other
+  }
+
   public let name: String
   public let nameForDiagnostics: String
   public let text: String?
-  public let isPunctuation: Bool
-  public let associatedValueClass: String?
+  public let kind: Kind
 
   public var swiftKind: String {
     return lowercaseFirstWord(name: self.name)
   }
 
-  private init(
+  fileprivate init(
     name: String,
     nameForDiagnostics: String,
     text: String? = nil,
-    isPunctuation: Bool,
-    associatedValueClass: String? = nil
+    kind: Kind
   ) {
     self.name = name
     self.nameForDiagnostics = nameForDiagnostics
     self.text = text
-    self.isPunctuation = isPunctuation
-    self.associatedValueClass = associatedValueClass
+    self.kind = kind
   }
 
   static func punctuator(name: String, text: String) -> TokenSpec {
     return TokenSpec(
       name: name,
       nameForDiagnostics: text,
       text: text,
-      isPunctuation: true,
-      associatedValueClass: nil
+      kind: .punctuation
     )
   }
 
@@ -51,20 +54,17 @@ public struct TokenSpec {
       name: name,
       nameForDiagnostics: text,
       text: text,
-      isPunctuation: false,
-      associatedValueClass: nil
+      kind: .other
     )
   }
 
-  static func other(name: String, nameForDiagnostics: String, text: String? = nil, associatedValueClass: String? = nil) -> TokenSpec {
+  static func other(name: String, nameForDiagnostics: String, text: String? = nil) -> TokenSpec {
     TokenSpec(
       name: name,
       nameForDiagnostics: nameForDiagnostics,
       text: text,
-      isPunctuation: false,
-      associatedValueClass: associatedValueClass
+      kind: .other
     )
-
   }
 }
 
@@ -86,7 +86,7 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
   .other(name: "Identifier", nameForDiagnostics: "identifier"),
   .punctuator(name: "InfixQuestionMark", text: "?"),
   .other(name: "IntegerLiteral", nameForDiagnostics: "integer literal"),
-  .other(name: "Keyword", nameForDiagnostics: "keyword", associatedValueClass: "Keyword"),
+  TokenSpec(name: "Keyword", nameForDiagnostics: "keyword", text: nil, kind: .keyword),
   .punctuator(name: "LeftAngle", text: "<"),
   .punctuator(name: "LeftBrace", text: "{"),
   .punctuator(name: "LeftParen", text: "("),

CodeGeneration/Sources/Utils/SyntaxBuildableChild.swift

@@ -71,7 +71,7 @@ public extension Child {
     if token.text != nil {
       return ExprSyntax(".\(raw: token.swiftKind)Token()")
     }
-    guard case .token(let choices, _, _) = kind, choices.count == 1, token.associatedValueClass != nil else {
+    guard case .token(let choices, _, _) = kind, choices.count == 1, token.kind == .keyword else {
       return nil
     }
     var textChoice: String

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TokenKindFile.swift

@@ -25,8 +25,8 @@ let tokenKindFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
     for token in SYNTAX_TOKENS {
       // Tokens that don't have a set text have an associated value that
       // contains their text.
-      if let associatedValueClass = token.associatedValueClass {
-        DeclSyntax("case \(raw: token.swiftKind)(\(raw: associatedValueClass))")
+      if token.kind == .keyword {
+        DeclSyntax("case \(raw: token.swiftKind)(Keyword)")
       } else if token.text == nil {
         DeclSyntax("case \(raw: token.swiftKind)(String)")
       } else {
@@ -43,7 +43,7 @@ let tokenKindFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
     ) {
       try SwitchExprSyntax("switch self") {
         for token in SYNTAX_TOKENS {
-          if token.associatedValueClass != nil {
+          if token.kind == .keyword {
             SwitchCaseSyntax("case .\(raw: token.swiftKind)(let assoc):") {
               StmtSyntax("return String(syntaxText: assoc.defaultText)")
             }
@@ -69,7 +69,7 @@ let tokenKindFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
     ) {
       try SwitchExprSyntax("switch self") {
         for token in SYNTAX_TOKENS {
-          if token.associatedValueClass != nil {
+          if token.kind == .keyword {
             SwitchCaseSyntax("case .\(raw: token.swiftKind)(let assoc):") {
               StmtSyntax("return assoc.defaultText")
             }
@@ -99,7 +99,7 @@ let tokenKindFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
       try SwitchExprSyntax("switch self") {
         for token in SYNTAX_TOKENS {
           SwitchCaseSyntax("case .\(raw: token.swiftKind):") {
-            StmtSyntax("return \(raw: token.isPunctuation)")
+            StmtSyntax("return \(raw: token.kind == .punctuation)")
           }
         }
       }
@@ -177,7 +177,7 @@ let tokenKindFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
       try! SwitchExprSyntax("switch self") {
         for token in SYNTAX_TOKENS {
           SwitchCaseSyntax("case .\(raw: token.swiftKind):") {
-            StmtSyntax("return \(raw: token.isPunctuation)")
+            StmtSyntax("return \(raw: token.kind == .punctuation)")
           }
         }
       }

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TokensFile.swift

@@ -35,11 +35,11 @@ let tokensFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
           }
           """
         )
-      } else if let associatedValueClass = token.associatedValueClass {
+      } else if token.kind == .keyword {
         DeclSyntax(
           """
           public static func \(raw: token.swiftKind)(
-            _ value: \(raw: associatedValueClass),
+            _ value: Keyword,
             leadingTrivia: Trivia = [],
             trailingTrivia: Trivia = [],
             presence: SourcePresence = .present