libSyntax: extract meta-information of trivia kinds to syntax_gyb_support. NFC

The existing libSyntax infrastructure uses external python
dictionaries to share logic between C++ and Swift implementations.
This patch teaches trivia kinds to adapt to this infrastructure
 as well.

Author: nkcsgexi

cmake/modules/SwiftHandleGybSources.cmake

@@ -125,6 +125,7 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/StmtNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/TypeNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/Token.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/Trivia.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/Traits.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_sourcekit_support/__init__.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_sourcekit_support/UIDs.py")

include/swift/Syntax/CMakeLists.txt

@@ -9,7 +9,8 @@ set(generated_include_sources
     SyntaxNodes.h.gyb
     SyntaxBuilders.h.gyb
     SyntaxFactory.h.gyb
-    SyntaxVisitor.h.gyb)
+    SyntaxVisitor.h.gyb
+    Trivia.h.gyb)
 
 add_gyb_target(swift-syntax-generated-headers
     "${generated_include_sources}")

include/swift/Syntax/Serialization/SyntaxSerialization.h

@@ -46,64 +46,6 @@ struct ScalarEnumerationTraits<tok> {
   }
 };
 
-/// Serialization traits for TriviaPiece.
-/// - All trivia pieces will have a "kind" key that contains the serialized
-///   name of the trivia kind.
-/// - Comment trivia will have the associated text of the comment under the
-///   "value" key.
-/// - All other trivia will have the associated integer count of their
-///   occurrences under the "value" key.
-template<>
-struct ObjectTraits<syntax::TriviaPiece> {
-  static void mapping(Output &out, syntax::TriviaPiece &value) {
-    auto kind = value.getKind();
-    out.mapRequired("kind", kind);
-    switch (kind) {
-      case syntax::TriviaKind::Space:
-      case syntax::TriviaKind::Tab:
-      case syntax::TriviaKind::VerticalTab:
-      case syntax::TriviaKind::Formfeed:
-      case syntax::TriviaKind::Newline:
-      case syntax::TriviaKind::CarriageReturn:
-      case syntax::TriviaKind::CarriageReturnLineFeed:
-      case syntax::TriviaKind::Backtick: {
-        auto count = value.getCount();
-        out.mapRequired("value", count);
-        break;
-      }
-      case syntax::TriviaKind::LineComment:
-      case syntax::TriviaKind::BlockComment:
-      case syntax::TriviaKind::DocLineComment:
-      case syntax::TriviaKind::DocBlockComment:
-      case syntax::TriviaKind::GarbageText: {
-        auto text = value.getText();
-        out.mapRequired("value", text);
-        break;
-      }
-    }
-  }
-};
-
-/// Serialization traits for TriviaKind.
-template <>
-struct ScalarEnumerationTraits<syntax::TriviaKind> {
-  static void enumeration(Output &out, syntax::TriviaKind &value) {
-    out.enumCase(value, "Space", syntax::TriviaKind::Space);
-    out.enumCase(value, "Tab", syntax::TriviaKind::Tab);
-    out.enumCase(value, "VerticalTab", syntax::TriviaKind::VerticalTab);
-    out.enumCase(value, "Formfeed", syntax::TriviaKind::Formfeed);
-    out.enumCase(value, "Newline", syntax::TriviaKind::Newline);
-    out.enumCase(value, "CarriageReturn", syntax::TriviaKind::CarriageReturn);
-    out.enumCase(value, "CarriageReturnLineFeed", syntax::TriviaKind::CarriageReturnLineFeed);
-    out.enumCase(value, "LineComment", syntax::TriviaKind::LineComment);
-    out.enumCase(value, "BlockComment", syntax::TriviaKind::BlockComment);
-    out.enumCase(value, "DocLineComment", syntax::TriviaKind::DocLineComment);
-    out.enumCase(value, "DocBlockComment", syntax::TriviaKind::DocBlockComment);
-    out.enumCase(value, "Backtick", syntax::TriviaKind::Backtick);
-    out.enumCase(value, "GarbageText", syntax::TriviaKind::GarbageText);
-  }
-};
-
 /// Serialization traits for Trivia.
 /// Trivia will serialize as an array of the underlying TriviaPieces.
 template<>