[nfc] Run swift-format over Swift ASTGen sources.

Author: zoecarver

lib/ASTGen/Package.swift

@@ -10,31 +10,31 @@
 import PackageDescription
 
 let package = Package(
-    name: "ASTGen",
-    platforms: [
-        .macOS(.v10_15)
-    ],
-    products: [
-        .library(name: "swiftASTGen", targets: ["swiftASTGen"]),
-    ],
-    dependencies: [
-         .package(path: "../../../swift-syntax"),
-    ],
-    targets: [
-        .target(
-            name: "swiftASTGen",
-            dependencies: [
-              .product(name: "SwiftSyntax", package: "swift-syntax"),
-              .product(name: "SwiftParser", package: "swift-syntax"),
-              .product(name: "_SwiftSyntaxMacros", package: "swift-syntax")
-            ],
-            path: ".",
-            exclude: ["CMakeLists.txt"],
-        swiftSettings: [
-          .unsafeFlags([
-            "-I", "../../include/swift/",
-            "-I", "../../include"
-          ])
-        ]),
-    ]
+  name: "ASTGen",
+  platforms: [
+    .macOS(.v10_15)
+  ],
+  products: [
+    .library(name: "swiftASTGen", targets: ["swiftASTGen"])
+  ],
+  dependencies: [
+    .package(path: "../../../swift-syntax")
+  ],
+  targets: [
+    .target(
+      name: "swiftASTGen",
+      dependencies: [
+        .product(name: "SwiftSyntax", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
+        .product(name: "_SwiftSyntaxMacros", package: "swift-syntax"),
+      ],
+      path: ".",
+      exclude: ["CMakeLists.txt"],
+      swiftSettings: [
+        .unsafeFlags([
+          "-I", "../../include/swift/",
+          "-I", "../../include",
+        ])
+      ])
+  ]
 )

lib/ASTGen/Sources/ASTGen/ASTGen.swift

@@ -1,8 +1,7 @@
+import CASTBridging
 import SwiftParser
 import SwiftSyntax
 
-import CASTBridging
-
 extension Array {
   public func withBridgedArrayRef<T>(_ c: (BridgedArrayRef) -> T) -> T {
     withUnsafeBytes { buf in
@@ -22,7 +21,7 @@ enum ASTNode {
   case stmt(UnsafeMutableRawPointer)
   case expr(UnsafeMutableRawPointer)
   case type(UnsafeMutableRawPointer)
-  
+
   var rawValue: UnsafeMutableRawPointer {
     switch self {
     case .decl(let ptr):
@@ -35,7 +34,7 @@ enum ASTNode {
       return ptr
     }
   }
-  
+
   func bridged() -> ASTNodeBridged {
     switch self {
     case .expr(let e):
@@ -61,17 +60,17 @@ class Boxed<Value> {
 
 struct ASTGenVisitor: SyntaxTransformVisitor {
   typealias ResultType = ASTNode
-  
+
   let ctx: UnsafeMutableRawPointer
   let base: UnsafePointer<UInt8>
 
   @Boxed var declContext: UnsafeMutableRawPointer
 
   // TODO: this some how messes up the witness table when I uncomment it locally :/
-//  public func visit<T>(_ node: T?) -> [UnsafeMutableRawPointer]? {
-//    if let node = node { return visit(node) }
-//    return nil
-//  }
+  //  public func visit<T>(_ node: T?) -> [UnsafeMutableRawPointer]? {
+  //    if let node = node { return visit(node) }
+  //    return nil
+  //  }
 
   @_disfavoredOverload
   public func visit(_ node: SourceFileSyntax) -> ASTNode {

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -1,8 +1,7 @@
+import CASTBridging
 import SwiftParser
 import SwiftSyntax
 
-import CASTBridging
-
 extension ASTGenVisitor {
   public func visit(_ node: TypealiasDeclSyntax) -> ASTNode {
     let aliasLoc = self.base.advanced(by: node.typealiasKeyword.position.utf8Offset).raw
@@ -13,7 +12,8 @@ extension ASTGenVisitor {
     }
     let nameLoc = self.base.advanced(by: node.identifier.position.utf8Offset).raw
     let genericParams = node.genericParameterClause.map(self.visit).map { $0.rawValue }
-    let out = TypeAliasDecl_create(self.ctx, self.declContext, aliasLoc, equalLoc, name, nameLoc, genericParams)
+    let out = TypeAliasDecl_create(
+      self.ctx, self.declContext, aliasLoc, equalLoc, name, nameLoc, genericParams)
 
     let oldDeclContext = declContext
     declContext = out.declContext
@@ -43,10 +43,10 @@ extension ASTGenVisitor {
     node.members.members.map(self.visit).withBridgedArrayRef { ref in
       NominalTypeDecl_setMembers(out.nominalDecl, ref)
     }
-    
+
     return .decl(out.decl)
   }
-  
+
   public func visit(_ node: ClassDeclSyntax) -> ASTNode {
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
     var nameText = node.identifier.text
@@ -62,16 +62,16 @@ extension ASTGenVisitor {
     node.members.members.map(self.visit).withBridgedArrayRef { ref in
       NominalTypeDecl_setMembers(out.nominalDecl, ref)
     }
-    
+
     return .decl(out.decl)
   }
-  
+
   public func visit(_ node: VariableDeclSyntax) -> ASTNode {
     let pattern = visit(node.bindings.first!.pattern).rawValue
     let initializer = visit(node.bindings.first!.initializer!).rawValue
-    
+
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
-    let isStateic = false // TODO: compute this
+    let isStateic = false  // TODO: compute this
     let isLet = node.letOrVarKeyword.tokenKind == .letKeyword
 
     // TODO: don't drop "initializer" on the floor.
@@ -80,10 +80,10 @@ extension ASTGenVisitor {
 
   public func visit(_ node: FunctionParameterSyntax) -> ASTNode {
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
-    
+
     let firstName: UnsafeMutableRawPointer?
     let secondName: UnsafeMutableRawPointer?
-    
+
     if let nodeFirstName = node.firstName {
       var text = nodeFirstName.text
       firstName = text.withUTF8 { buf in
@@ -92,7 +92,7 @@ extension ASTGenVisitor {
     } else {
       firstName = nil
     }
-    
+
     if let nodeSecondName = node.secondName {
       var text = nodeSecondName.text
       secondName = text.withUTF8 { buf in
@@ -101,18 +101,18 @@ extension ASTGenVisitor {
     } else {
       secondName = nil
     }
-    
+
     return .decl(ParamDecl_create(ctx, loc, loc, firstName, loc, secondName, declContext))
   }
 
   public func visit(_ node: FunctionDeclSyntax) -> ASTNode {
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
-    
+
     var nameText = node.identifier.text
     let name = nameText.withUTF8 { buf in
       return SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count)
     }
-    
+
     let body: ASTNode?
     if let nodeBody = node.body {
       body = visit(nodeBody)
@@ -126,10 +126,13 @@ extension ASTGenVisitor {
     } else {
       returnType = nil
     }
-    
+
     let params = node.signature.input.parameterList.map { visit($0) }
-    return .decl(params.withBridgedArrayRef { ref in
-      FuncDecl_create(ctx, loc, false, loc, name, loc, false, nil, false, nil, loc, ref, loc, body?.rawValue, returnType?.rawValue, declContext)
-    })
+    return .decl(
+      params.withBridgedArrayRef { ref in
+        FuncDecl_create(
+          ctx, loc, false, loc, name, loc, false, nil, false, nil, loc, ref, loc, body?.rawValue,
+          returnType?.rawValue, declContext)
+      })
   }
 }

lib/ASTGen/Sources/ASTGen/Exprs.swift

@@ -1,28 +1,28 @@
+import CASTBridging
 import SwiftParser
 import SwiftSyntax
 
-import CASTBridging
-
 extension ASTGenVisitor {
   public func visit(_ node: ClosureExprSyntax) -> ASTNode {
     let statements = node.statements.map(self.visit).map { $0.bridged() }
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
 
     let body = statements.withBridgedArrayRef { ref in
-        BraceStmt_create(ctx, loc, ref, loc)
+      BraceStmt_create(ctx, loc, ref, loc)
     }
-    
+
     return .expr(ClosureExpr_create(ctx, body, declContext))
   }
 
   public func visit(_ node: FunctionCallExprSyntax) -> ASTNode {
     // Transform the trailing closure into an argument.
     if let trailingClosure = node.trailingClosure {
-      let tupleElement = TupleExprElementSyntax(label: nil, colon: nil, expression: ExprSyntax(trailingClosure), trailingComma: nil)
-      
+      let tupleElement = TupleExprElementSyntax(
+        label: nil, colon: nil, expression: ExprSyntax(trailingClosure), trailingComma: nil)
+
       return visit(node.addArgument(tupleElement).withTrailingClosure(nil))
     }
-    
+
     let args = visit(node.argumentList).rawValue
     // TODO: hack
     let callee = visit(node.calledExpression).rawValue
@@ -32,7 +32,7 @@ extension ASTGenVisitor {
 
   public func visit(_ node: IdentifierExprSyntax) -> ASTNode {
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
-    
+
     var text = node.identifier.text
     let id = text.withUTF8 { buf in
       return SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count)
@@ -43,35 +43,36 @@ extension ASTGenVisitor {
 
   public func visit(_ node: IdentifierPatternSyntax) -> ASTNode {
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
-    
+
     var text = node.identifier.text
     let id = text.withUTF8 { buf in
       return SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count)
     }
 
     return .expr(SwiftIdentifierExpr_create(ctx, id, loc))
   }
-  
+
   public func visit(_ node: MemberAccessExprSyntax) -> ASTNode {
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
     let base = visit(node.base!).rawValue
     var nameText = node.name.text
     let name = nameText.withUTF8 { buf in
       return SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count)
     }
-    
+
     return .expr(UnresolvedDotExpr_create(ctx, base, loc, name, loc))
   }
 
   public func visit(_ node: TupleExprElementListSyntax) -> ASTNode {
     let elements = node.map(self.visit).map { $0.rawValue }
-    
+
     // TODO: find correct paren locs.
     let lParenLoc = self.base.advanced(by: node.position.utf8Offset).raw
     let rParenLoc = self.base.advanced(by: node.position.utf8Offset).raw
-    
-    return .expr(elements.withBridgedArrayRef { elementsRef in
-      SwiftTupleExpr_create(self.ctx, lParenLoc, elementsRef, rParenLoc)
-    })
+
+    return .expr(
+      elements.withBridgedArrayRef { elementsRef in
+        SwiftTupleExpr_create(self.ctx, lParenLoc, elementsRef, rParenLoc)
+      })
   }
 }

lib/ASTGen/Sources/ASTGen/Generics.swift

@@ -1,16 +1,18 @@
+import CASTBridging
 import SwiftParser
 import SwiftSyntax
 
-import CASTBridging
-
 extension ASTGenVisitor {
   func visit(_ node: GenericParameterClauseSyntax) -> ASTNode {
     let lAngleLoc = self.base.advanced(by: node.leftAngleBracket.position.utf8Offset).raw
-    let whereLoc = node.genericWhereClause.map { self.base.advanced(by: $0.whereKeyword.position.utf8Offset).raw }
+    let whereLoc = node.genericWhereClause.map {
+      self.base.advanced(by: $0.whereKeyword.position.utf8Offset).raw
+    }
     let rAngleLoc = self.base.advanced(by: node.rightAngleBracket.position.utf8Offset).raw
-    return .decl(self.withBridgedParametersAndRequirements(node) { params, reqs in
-      return GenericParamList_create(self.ctx, lAngleLoc, params, whereLoc, reqs, rAngleLoc)
-    })
+    return .decl(
+      self.withBridgedParametersAndRequirements(node) { params, reqs in
+        return GenericParamList_create(self.ctx, lAngleLoc, params, whereLoc, reqs, rAngleLoc)
+      })
   }
 
   func visit(_ node: GenericParameterSyntax) -> ASTNode {
@@ -21,7 +23,10 @@ extension ASTGenVisitor {
     let nameLoc = self.base.advanced(by: node.name.position.utf8Offset).raw
     let ellipsisLoc = node.ellipsis.map { self.base.advanced(by: $0.position.utf8Offset).raw }
 
-    return .decl(GenericTypeParamDecl_create(self.ctx, self.declContext, name, nameLoc, ellipsisLoc, node.indexInParent / 2, ellipsisLoc != nil))
+    return .decl(
+      GenericTypeParamDecl_create(
+        self.ctx, self.declContext, name, nameLoc, ellipsisLoc, node.indexInParent / 2,
+        ellipsisLoc != nil))
   }
 }
 
@@ -41,7 +46,7 @@ extension ASTGenVisitor {
       }
 
       let loweredRequirement = self.visit(requirement)
-      GenericTypeParamDecl_setInheritedType(self.ctx, loweredParameter, loweredRequirement.rawValue);
+      GenericTypeParamDecl_setInheritedType(self.ctx, loweredParameter, loweredRequirement.rawValue)
     }
 
     if let nodeRequirements = node.genericWhereClause?.requirementList {
@@ -51,20 +56,22 @@ extension ASTGenVisitor {
           let firstType = self.visit(conformance.leftTypeIdentifier).rawValue
           let separatorLoc = self.base.advanced(by: conformance.colon.position.utf8Offset).raw
           let secondType = self.visit(conformance.rightTypeIdentifier).rawValue
-          requirements.append(BridgedRequirementRepr(
-            SeparatorLoc: separatorLoc,
-            Kind: .typeConstraint,
-            FirstType: firstType,
-            SecondType: secondType))
+          requirements.append(
+            BridgedRequirementRepr(
+              SeparatorLoc: separatorLoc,
+              Kind: .typeConstraint,
+              FirstType: firstType,
+              SecondType: secondType))
         case .sameTypeRequirement(let sameType):
           let firstType = self.visit(sameType.leftTypeIdentifier).rawValue
           let separatorLoc = self.base.advanced(by: sameType.equalityToken.position.utf8Offset).raw
           let secondType = self.visit(sameType.rightTypeIdentifier).rawValue
-          requirements.append(BridgedRequirementRepr(
-            SeparatorLoc: separatorLoc,
-            Kind: .sameType,
-            FirstType: firstType,
-            SecondType: secondType))
+          requirements.append(
+            BridgedRequirementRepr(
+              SeparatorLoc: separatorLoc,
+              Kind: .sameType,
+              FirstType: firstType,
+              SecondType: secondType))
         case .layoutRequirement(_):
           fatalError("Cannot handle layout requirements!")
         }