Merge pull request #41 from nkcsgexi/comments-verifier

nkcsgexi · web-flow · commit 90042821ded2 · 2018-11-15T10:38:09.000-08:00
NFC: make SyntaxVerifier more swifty.
diff --git a/Sources/SwiftSyntax/SyntaxRewriter.swift.gyb b/Sources/SwiftSyntax/SyntaxRewriter.swift.gyb
@@ -270,7 +270,7 @@ public enum SyntaxVerifierError: Error, CustomStringConvertible {
 
 public class SyntaxVerifier: SyntaxVisitor {
 
-  var UnknownNodes: [Syntax] = []
+  var unknownNodes: [Syntax] = []
 
   override public func shouldVisit(_ node: SyntaxKind) -> Bool {
     return node.isUnknown
@@ -282,13 +282,13 @@ public class SyntaxVerifier: SyntaxVisitor {
 
   override public func visitPre(_ node: Syntax) {
     assert(node.isUnknown)
-    UnknownNodes.append(node)
+    unknownNodes.append(node)
   }
 
   private func verify(_ node: Syntax) throws {
     node.walk(self)
-    if !UnknownNodes.isEmpty {
-      throw SyntaxVerifierError.unknownSyntaxFound(node: UnknownNodes.first!)
+    if let unknownNode = unknownNodes.first {
+      throw SyntaxVerifierError.unknownSyntaxFound(node: unknownNode)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ public enum SyntaxVerifierError: Error, CustomStringConvertible {`
`270`	`270`
`271`	`271`	`public class SyntaxVerifier: SyntaxVisitor {`
`272`	`272`
`273`		`- var UnknownNodes: [Syntax] = []`
	`273`	`+ var unknownNodes: [Syntax] = []`
`274`	`274`
`275`	`275`	`override public func shouldVisit(_ node: SyntaxKind) -> Bool {`
`276`	`276`	`return node.isUnknown`
`@@ -282,13 +282,13 @@ public class SyntaxVerifier: SyntaxVisitor {`
`282`	`282`
`283`	`283`	`override public func visitPre(_ node: Syntax) {`
`284`	`284`	`assert(node.isUnknown)`
`285`		`- UnknownNodes.append(node)`
	`285`	`+ unknownNodes.append(node)`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`private func verify(_ node: Syntax) throws {`
`289`	`289`	`node.walk(self)`
`290`		`- if !UnknownNodes.isEmpty {`
`291`		`- throw SyntaxVerifierError.unknownSyntaxFound(node: UnknownNodes.first!)`
	`290`	`+ if let unknownNode = unknownNodes.first {`
	`291`	`+ throw SyntaxVerifierError.unknownSyntaxFound(node: unknownNode)`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`