Return Syntax, rather than SyntaxProtocol, from foldAll

DougGregor · DougGregor · commit c89d32392b38 · 2022-09-13T21:51:40.000-07:00
diff --git a/Sources/SwiftOperators/OperatorTable+Folding.swift b/Sources/SwiftOperators/OperatorTable+Folding.swift
@@ -453,7 +453,7 @@ extension OperatorTable {
   public func foldAll<Node: SyntaxProtocol>(
     _ node: Node,
     errorHandler: OperatorErrorHandler = { throw $0 }
-  ) rethrows -> SyntaxProtocol {
+  ) rethrows -> Syntax {
     return try withoutActuallyEscaping(errorHandler) { errorHandler in
       let folder = SequenceFolder(
         opPrecedence: self, errorHandler: errorHandler
diff --git a/Sources/swift-parser-test/swift-parser-test.swift b/Sources/swift-parser-test/swift-parser-test.swift
@@ -62,7 +62,7 @@ func foldAllSequences(_ tree: SourceFileSyntax) -> (Syntax, [Diagnostic]) {
   var operatorTable = OperatorTable.standardOperators
   operatorTable.addSourceFile(tree, errorHandler: recordOperatorError)
   let resultTree = operatorTable.foldAll(tree, errorHandler: recordOperatorError)
-  return (Syntax(resultTree), diags)
+  return (resultTree, diags)
 }
 
 class VerifyRoundTrip: ParsableCommand {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func foldAllSequences(_ tree: SourceFileSyntax) -> (Syntax, [Diagnostic]) {`
`62`	`62`	`var operatorTable = OperatorTable.standardOperators`
`63`	`63`	`operatorTable.addSourceFile(tree, errorHandler: recordOperatorError)`
`64`	`64`	`let resultTree = operatorTable.foldAll(tree, errorHandler: recordOperatorError)`
`65`		`- return (Syntax(resultTree), diags)`
	`65`	`+ return (resultTree, diags)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`class VerifyRoundTrip: ParsableCommand {`