Add support for structs/classes.

Author: zoecarver

include/swift/AST/CASTBridging.h

@@ -128,7 +128,20 @@ void *UnresolvedDotExpr_create(void *ctx, void *base, void *dotLoc, const char *
 
 void *ClosureExpr_create(void *ctx, void *body, void *dc);
 
-    void TopLevelCodeDecl_dump(void *);
+void NominalTypeDecl_setMembers(void *decl, BridgedArrayRef members);
+
+struct DeclContextAndDecl {
+  void *declContext;
+  void *nominalDecl;
+  void *decl;
+};
+
+struct DeclContextAndDecl StructDecl_create(void *ctx, void *loc, const char *name, void *nameLoc,
+                        void *dc);
+struct DeclContextAndDecl ClassDecl_create(void *ctx, void *loc, const char *name, void *nameLoc,
+                       void *dc);
+
+void TopLevelCodeDecl_dump(void *);
 void Expr_dump(void *);
 void Decl_dump(void *);
 void Stmt_dump(void *);

lib/AST/CASTBridging.cpp

@@ -211,6 +211,36 @@ void *ClosureExpr_create(void *ctx, void *body, void *dc) {
   return (Expr *)out;
 }
 
+void NominalTypeDecl_setMembers(void *decl, BridgedArrayRef members) {
+  auto declMembers = getArrayRef<Decl *>(members);
+  for (auto m : declMembers)
+    ((NominalTypeDecl *)decl)->addMember(m);
+}
+
+DeclContextAndDecl StructDecl_create(void *ctx, void *loc, const char *name, void *nameLoc,
+                        void *dc) {
+  ASTContext &Context = *static_cast<ASTContext *>(ctx);
+  auto *out = new (Context) StructDecl(SourceLoc(), // *(SourceLoc *)&loc,
+                                       Identifier::getFromOpaquePointer((void *)name),
+                                       SourceLoc(), // *(SourceLoc *)&nameLoc,
+                                       {}, nullptr,
+                                       (DeclContext *)dc);
+  out->setImplicit(); // TODO: remove this.
+  return {(DeclContext *)out, (NominalTypeDecl *)out, (Decl *)out};
+}
+
+DeclContextAndDecl ClassDecl_create(void *ctx, void *loc, const char *name, void *nameLoc,
+                       void *dc) {
+  ASTContext &Context = *static_cast<ASTContext *>(ctx);
+  auto *out = new (Context) ClassDecl(SourceLoc(), // *(SourceLoc *)&loc,
+                                      Identifier::getFromOpaquePointer((void *)name),
+                                      SourceLoc(), // *(SourceLoc *)&nameLoc,
+                                      {}, nullptr,
+                                      (DeclContext *)dc, false);
+  out->setImplicit(); // TODO: remove this.
+  return {(DeclContext *)out, (NominalTypeDecl *)out, (Decl *)out};
+}
+
 void TopLevelCodeDecl_dump(void *decl) { ((TopLevelCodeDecl *)decl)->dump(); }
 
 void Expr_dump(void *expr) { ((Expr *)expr)->dump(); }

lib/AST/DeclContext.cpp

@@ -882,7 +882,7 @@ void IterableDeclContext::addMember(Decl *member, Decl *hint, bool insertAtHead)
 
 void IterableDeclContext::addMemberSilently(Decl *member, Decl *hint,
                                             bool insertAtHead) const {
-  assert(!isa<AccessorDecl>(member) && "Accessors should not be added here");
+//  assert(!isa<AccessorDecl>(member) && "Accessors should not be added here");
   assert(!member->NextDecl && "Already added to a container");
 
 #ifndef NDEBUG

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

@@ -17,12 +17,15 @@ extension UnsafePointer {
   }
 }
 
+// TODO: :(
+var declContext: UnsafeMutableRawPointer! = nil
+
 struct ASTGenVisitor: SyntaxTransformVisitor {
   let ctx: UnsafeMutableRawPointer
   let base: UnsafePointer<CChar>
 
   // TOOD: we need to be up updating this.
-  var declContext: UnsafeMutableRawPointer
+//  var declContext: UnsafeMutableRawPointer
 
   // TODO: this some how messes up the witness table when I uncomment it locally :/
 //  public func visit<T>(_ node: T?) -> [UnsafeMutableRawPointer]? {
@@ -58,6 +61,48 @@ struct ASTGenVisitor: SyntaxTransformVisitor {
     return out
   }
 
+  public func visit(_ node: MemberDeclListItemSyntax) -> UnsafeMutableRawPointer {
+    visit(Syntax(node.decl))
+  }
+  
+  public func visit(_ node: StructDeclSyntax) -> UnsafeMutableRawPointer {
+    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 out = StructDecl_create(ctx, loc, name, loc, declContext)
+    let oldDeclContext = declContext
+    declContext = out.declContext
+    defer { declContext = oldDeclContext }
+
+    node.members.members.map(self.visit).withBridgedArrayRef { ref in
+      NominalTypeDecl_setMembers(out.nominalDecl, ref)
+    }
+    
+    return out.decl
+  }
+  
+  public func visit(_ node: ClassDeclSyntax) -> UnsafeMutableRawPointer {
+    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 out = ClassDecl_create(ctx, loc, name, loc, declContext)
+    let oldDeclContext = declContext
+    declContext = out.declContext
+    defer { declContext = oldDeclContext }
+
+    node.members.members.map(self.visit).withBridgedArrayRef { ref in
+      NominalTypeDecl_setMembers(out.nominalDecl, ref)
+    }
+    
+    return out.decl
+  }
+  
   public func visit(_ node: ClosureExprSyntax) -> UnsafeMutableRawPointer {
     let statements = node.statements.map(self.visit)
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
@@ -267,14 +312,15 @@ struct ASTGenVisitor: SyntaxTransformVisitor {
 
 @_cdecl("parseTopLevelSwift")
 public func parseTopLevelSwift(
-    buffer: UnsafePointer<CChar>, declContext: UnsafeMutableRawPointer,
+    buffer: UnsafePointer<CChar>, dc: UnsafeMutableRawPointer,
     ctx: UnsafeMutableRawPointer,
     outputContext: UnsafeMutableRawPointer,
     callback: @convention(c) (UnsafeMutableRawPointer, UnsafeMutableRawPointer) -> Void
 ) {
   let syntax = try! Parser.parse(source: String(cString: buffer))
   dump(syntax)
-  ASTGenVisitor(ctx: ctx, base: buffer, declContext: declContext)
+  declContext = dc
+  ASTGenVisitor(ctx: ctx, base: buffer)
     .visit(syntax)
     .forEach { callback($0, outputContext) }
 }