Make ASTGen a swift package

Author: zoecarver

include/swift/AST/CASTBridging.h

@@ -126,6 +126,8 @@ void *SimpleIdentTypeRepr_create(void *ctx, void *loc, const char *id);
 
 void *UnresolvedDotExpr_create(void *ctx, void *base, void *dotLoc, const char *name, void *nameLoc);
 
+void *ClosureExpr_create(void *ctx, void *body, void *dc);
+
     void TopLevelCodeDecl_dump(void *);
 void Expr_dump(void *);
 void Decl_dump(void *);

lib/AST/CASTBridging.cpp

@@ -195,6 +195,22 @@ void *UnresolvedDotExpr_create(void *ctx, void *base, void *dotLoc, const char *
                                          DeclNameLoc(*(SourceLoc *)&nameLoc), false);
 }
 
+void *ClosureExpr_create(void *ctx, void *body, void *dc) {
+  DeclAttributes attributes;
+  SourceRange bracketRange;
+  SourceLoc asyncLoc;
+  SourceLoc throwsLoc;
+  SourceLoc arrowLoc;
+  SourceLoc inLoc;
+
+  ASTContext &Context = *static_cast<ASTContext *>(ctx);
+  auto *out = new (Context) ClosureExpr(attributes, bracketRange, nullptr,
+                                        nullptr, asyncLoc, throwsLoc, arrowLoc,
+                                        inLoc, nullptr, 0, (DeclContext *)dc);
+  out->setBody((BraceStmt *)body, true);
+  return (Expr *)out;
+}
+
 void TopLevelCodeDecl_dump(void *decl) { ((TopLevelCodeDecl *)decl)->dump(); }
 
 void Expr_dump(void *expr) { ((Expr *)expr)->dump(); }

lib/ASTGen/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -4,7 +4,7 @@ set(CMAKE_Swift_ARCHIVE_FINISH "")
 
 if (SWIFT_SWIFT_PARSER)
     add_library(ASTGen
-            ASTGen.swift)
+            Sources/ASTGen/ASTGen.swift)
 
     target_link_libraries(ASTGen PUBLIC
             SwiftSyntax
@@ -18,12 +18,13 @@ if (SWIFT_SWIFT_PARSER)
             "${SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR}/swift")
 else()
     add_library(ASTGen
-            DummyASTGen.swift)
+            Sources/ASTGen/DummyASTGen.swift)
 endif()
 
 set_target_properties(ASTGen PROPERTIES LINKER_LANGUAGE Swift)
 
 target_compile_options(ASTGen PUBLIC
-        "-emit-module-interface")
+        "-emit-module-interface"
+        "-g")
 
 add_dependencies(ASTGen swiftAST)

lib/ASTGen/.swiftpm/xcode/package.xcworkspace/xcuserdata/zoecarver.xcuserdatad/UserInterfaceState.xcuserstate

@@ -0,0 +1,18 @@
+// swift-tools-version: 5.6
+
+import PackageDescription
+
+let package = Package(
+    name: "ASTGen",
+    products: [
+        .library(name: "ASTGen", targets: ["ASTGen"]),
+    ],
+    dependencies: [
+         .package(path: "../../../swift-syntax"),
+    ],
+    targets: [
+        .target(
+            name: "ASTGen",
+            dependencies: ["SwiftSyntax"]),
+    ]
+)

lib/ASTGen/CMakeLists.txt

@@ -57,11 +57,30 @@ struct ASTGenVisitor: SyntaxTransformVisitor {
 
     return out
   }
+  
+  public func visit(_ node: ClosureExprSyntax) -> UnsafeMutableRawPointer {
+    let statements = node.statements.map(self.visit)
+    let loc = self.base.advanced(by: node.position.utf8Offset).raw
+
+    let body = statements.withBridgedArrayRef { ref in
+      BraceStmt_create(ctx, loc, ref, loc)
+    }
+    
+    return ClosureExpr_create(ctx, body, declContext)
+  }
 
   public func visit(_ node: FunctionCallExprSyntax) -> UnsafeMutableRawPointer {
+    // Transform the trailing closure into an argument.
+    if let trailingClosure = node.trailingClosure {
+      let tupleElement = TupleExprElementSyntax(label: nil, colon: nil, expression: ExprSyntax(trailingClosure), trailingComma: nil)
+      
+      return visit(node.addArgument(tupleElement).withTrailingClosure(nil))
+    }
+    
     let args = visit(node.argumentList)
     // TODO: hack
     let callee = visit(node.calledExpression)
+
     return SwiftFunctionCallExpr_create(self.ctx, callee, args)
   }
 
@@ -125,6 +144,10 @@ struct ASTGenVisitor: SyntaxTransformVisitor {
     }
   }
 
+  public func visit(_ node: InitializerClauseSyntax) -> UnsafeMutableRawPointer {
+    visit(node.value)
+  }
+
   public func visit(_ node: VariableDeclSyntax) -> UnsafeMutableRawPointer {
     let pattern = visit(node.bindings.first!.pattern)
     let initializer = visit(node.bindings.first!.initializer!)

lib/ASTGen/Package.resolved

@@ -159,11 +159,11 @@ namespace {
   };
 } // end anonymous namespace
 
-//extern "C" void parseTopLevelSwift(const char *buffer,
-//                                   void *declContext,
-//                                   void *astContext,
-//                                   void *outputContext,
-//                                   void (*)(void *, void *));
+extern "C" void parseTopLevelSwift(const char *buffer,
+                                   void *declContext,
+                                   void *astContext,
+                                   void *outputContext,
+                                   void (*)(void *, void *));
 
 static void appendToVector(void *declPtr, void *vecPtr) {
   auto vec = static_cast<SmallVectorImpl<Decl *> *>(vecPtr);
@@ -184,18 +184,18 @@ void Parser::parseTopLevel(SmallVectorImpl<Decl *> &decls) {
   StringRef contents =
       SourceMgr.extractText(SourceMgr.getRangeForBuffer(L->getBufferID()));
 
-//  if (Context.LangOpts.hasFeature(Feature::SwiftParser)) {
-//    parseTopLevelSwift(contents.data(), CurDeclContext, &Context, &decls, appendToVector);
-//
-//    for (auto decl : decls) {
-//      decl->dump();
-//
-//      if (auto fn = dyn_cast<FuncDecl>(decl))
-//        fn->getBody()->dump();
-//    }
-//
-//    return;
-//  }
+  if (Context.LangOpts.hasFeature(Feature::SwiftParser)) {
+    parseTopLevelSwift(contents.data(), CurDeclContext, &Context, &decls, appendToVector);
+
+    for (auto decl : decls) {
+      decl->dump();
+
+      if (auto fn = dyn_cast<FuncDecl>(decl))
+        fn->getBody()->dump();
+    }
+
+    return;
+  }
 
   // Prime the lexer.
   if (Tok.is(tok::NUM_TOKENS))