Move types that are not syntax node related to separate file Misc.swift.gyb

Author: ahoppen

Sources/SwiftSyntax/Misc.swift.gyb

@@ -0,0 +1,47 @@
+%{
+  # -*- mode: Swift -*-
+  from gyb_syntax_support import *
+  from gyb_syntax_support.Traits import TRAITS
+  NODE_MAP = create_node_map()
+  # Ignore the following admonition it applies to the resulting .swift file only
+}%
+//// Automatically Generated From SyntaxNodes.swift.gyb.
+//// Do Not Edit Directly!
+//===------------ SyntaxNodes.swift - Syntax Node definitions -------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import _InternalSwiftSyntaxParser
+
+extension SyntaxNode {
+  public var isUnknown: Bool { return raw.kind.isUnknown }
+  public var asUnknown: UnknownSyntax? {
+    guard isUnknown else { return nil }
+    return UnknownSyntax(asSyntaxData)
+  }
+% for node in SYNTAX_NODES:
+%   if not node.is_base():
+
+  public var is${node.syntax_kind}: Bool { return raw.kind == .${node.swift_syntax_kind} }
+  public var as${node.syntax_kind}: ${node.name}? {
+    guard is${node.syntax_kind} else { return nil }
+    return ${node.name}(asSyntaxData)
+  }
+%   end
+% end
+}
+
+extension SyntaxParser {
+  static func verifyNodeDeclarationHash() -> Bool {
+    return String(cString: swiftparse_syntax_structure_versioning_identifier()!) ==
+      "${calculate_node_hash()}"
+  }
+}

Sources/SwiftSyntax/SyntaxNodes.swift.gyb

@@ -19,8 +19,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import _InternalSwiftSyntaxParser
-
 %{
 """
 Each Syntax node implements the protocol of a more generic node. For example,
@@ -44,6 +42,7 @@ Each node will have:
 %     # Handled in SyntaxNodesBase.swift.gyb
 %     pass
 %   elif node.collection_element:
+%     # Handled in SyntaxCollections.swift.gyb
 %     pass
 %   else:
 
@@ -212,28 +211,3 @@ extension ${node.name}: CustomReflectable {
 }
 %   end
 % end
-
-extension SyntaxNode {
-  public var isUnknown: Bool { return raw.kind.isUnknown }
-  public var asUnknown: UnknownSyntax? {
-    guard isUnknown else { return nil }
-    return UnknownSyntax(asSyntaxData)
-  }
-% for node in SYNTAX_NODES:
-%   if not node.is_base():
-
-  public var is${node.syntax_kind}: Bool { return raw.kind == .${node.swift_syntax_kind} }
-  public var as${node.syntax_kind}: ${node.name}? {
-    guard is${node.syntax_kind} else { return nil }
-    return ${node.name}(asSyntaxData)
-  }
-%   end
-% end
-}
-
-extension SyntaxParser {
-  static func verifyNodeDeclarationHash() -> Bool {
-    return String(cString: swiftparse_syntax_structure_versioning_identifier()!) ==
-      "${calculate_node_hash()}"
-  }
-}