Merge pull request #1234 from kimdv/kimdv/move-trivia-from-gyn-to-code-gen

Move `Trivia` from gyb to code gen

Author: kimdv

CodeGeneration/Sources/SyntaxSupport/Trivia.swift.gyb

@@ -61,12 +61,12 @@ public let TRIVIAS: [Trivia] = [
 %   ]
 %   if trivia.characters:
 %     spaces = 11
-%     mapped_characters = list(map(lambda x: (' ' * spaces) + 'Character(#"%s"#)' % x, trivia.characters))
+%     mapped_characters = list(map(lambda x: (' ' * spaces) + 'Character("%s")' % x, trivia.characters))
 %     parameters += ['characters: [\n%s\n' % ',\n'.join(mapped_characters) + (' ' * (spaces - 2) + ']')]
 %   end
 %   if trivia.swift_characters:
 %     spaces = 10
-%     mapped_swift_characters = list(map(lambda x: (' ' * spaces) + 'Character(#"%s"#)' % x, trivia.swift_characters))
+%     mapped_swift_characters = list(map(lambda x: (' ' * spaces) + 'Character("%s")' % x, trivia.swift_characters))
 %     parameters += ['swiftCharacters: [\n%s\n' % ',\n'.join(mapped_swift_characters) + (' ' * (spaces - 2) + ']')]
 %   end
 %   if trivia.is_new_line:

CodeGeneration/Sources/SyntaxSupport/gyb_generated/Trivia.swift

@@ -52,62 +52,62 @@ public let TRIVIAS: [Trivia] = [
   Trivia(name: "Space",
          comment: #"A space ' ' character."#,
          characters: [
-           Character(#" "#)
+           Character(" ")
          ],
          swiftCharacters: [
-          Character(#" "#)
+          Character(" ")
         ]),
   Trivia(name: "Tab",
          comment: #"A tab '\t' character."#,
          characters: [
-           Character(#"\t"#)
+           Character("\t")
          ],
          swiftCharacters: [
-          Character(#"\t"#)
+          Character("\t")
         ]),
   Trivia(name: "VerticalTab",
          comment: #"A vertical tab '\v' character."#,
          characters: [
-           Character(#"\v"#)
+           Character("\u{b}")
          ],
          swiftCharacters: [
-          Character(#"\u{2B7F}"#)
+          Character("\u{2B7F}")
         ]),
   Trivia(name: "Formfeed",
          comment: #"A form-feed 'f' character."#,
          characters: [
-           Character(#"\f"#)
+           Character("\u{c}")
          ],
          swiftCharacters: [
-          Character(#"\u{240C}"#)
+          Character("\u{240C}")
         ]),
   Trivia(name: "Newline",
          comment: #"A newline '\n' character."#,
          characters: [
-           Character(#"\n"#)
+           Character("\n")
          ],
          swiftCharacters: [
-          Character(#"\n"#)
+          Character("\n")
         ],
          isNewLine: true),
   Trivia(name: "CarriageReturn",
          comment: #"A newline '\r' character."#,
          characters: [
-           Character(#"\r"#)
+           Character("\r")
          ],
          swiftCharacters: [
-          Character(#"\r"#)
+          Character("\r")
         ],
          isNewLine: true),
   Trivia(name: "CarriageReturnLineFeed",
          comment: #"A newline consists of contiguous '\r' and '\n' characters."#,
          characters: [
-           Character(#"\r"#),
-           Character(#"\n"#)
+           Character("\r"),
+           Character("\n")
          ],
          swiftCharacters: [
-          Character(#"\r"#),
-          Character(#"\n"#)
+          Character("\r"),
+          Character("\n")
         ],
          isNewLine: true),
   Trivia(name: "LineComment",

CodeGeneration/Sources/generate-swiftsyntax/GenerateSwiftSyntax.swift

@@ -73,6 +73,7 @@ struct GenerateSwiftSyntax: ParsableCommand {
       TemplateSpec(sourceFile: syntaxVisitorFile, module: swiftSyntaxDir, filename: "SyntaxVisitor.swift"),
       TemplateSpec(sourceFile: tokenKindFile, module: swiftSyntaxDir, filename: "TokenKind.swift"),
       TemplateSpec(sourceFile: tokensFile, module: swiftSyntaxDir, filename: "Tokens.swift"),
+      TemplateSpec(sourceFile: triviaFile, module: swiftSyntaxDir, filename: "Trivia.swift"),
 
       // SwiftSyntaxBuilder
       TemplateSpec(sourceFile: buildableCollectionNodesFile, module: swiftSyntaxBuilderDir, filename: "BuildableCollectionNodes.swift"),