ASTGen: Translate enum case declarations

Author: AnthonyLatsis

include/swift/AST/CASTBridging.h

@@ -365,6 +365,17 @@ BridgedDeclContextAndDecl EnumDecl_create(
     BridgedArrayRef cInheritedTypes, void *_Nullable opaqueGenericWhereClause,
     BridgedSourceRange cBraceRange);
 
+void *EnumCaseDecl_create(BridgedDeclContext cDeclContext,
+                          BridgedSourceLoc cCaseKeywordLoc,
+                          BridgedArrayRef cElements);
+
+void *EnumElementDecl_create(BridgedASTContext cContext,
+                             BridgedDeclContext cDeclContext,
+                             BridgedIdentifier cName, BridgedSourceLoc cNameLoc,
+                             void *_Nullable opaqueParameterList,
+                             BridgedSourceLoc cEqualsLoc,
+                             void *_Nullable opaqueRawValue);
+
 BridgedDeclContextAndDecl StructDecl_create(
     BridgedASTContext cContext, BridgedDeclContext cDeclContext,
     BridgedSourceLoc cStructKeywordLoc, BridgedIdentifier cName,

lib/AST/CASTBridging.cpp

@@ -556,7 +556,18 @@ void IterableDeclContext_setParsedMembers(BridgedArrayRef bridgedMembers,
                                           void *opaqueDecl) {
   auto *decl = static_cast<Decl *>(opaqueDecl);
   auto &ctx = decl->getASTContext();
-  auto members = convertArrayRef<Decl *>(bridgedMembers);
+
+  SmallVector<Decl *> members;
+  for (auto *decl : convertArrayRef<Decl *>(bridgedMembers)) {
+    members.push_back(decl);
+    // Each enum case element is also part of the members list according to the
+    // legacy parser.
+    if (auto *ECD = dyn_cast<EnumCaseDecl>(decl)) {
+      for (auto *EED : ECD->getElements()) {
+        members.push_back(EED);
+      }
+    }
+  }
 
   ctx.evaluator.cacheOutput(
       ParseMembersRequest{cast<IterableDeclContext>(decl)},
@@ -594,6 +605,42 @@ BridgedDeclContextAndDecl EnumDecl_create(
   return {bridgeDeclContext(decl), static_cast<Decl *>(decl)};
 }
 
+void *EnumCaseDecl_create(BridgedDeclContext cDeclContext,
+                          BridgedSourceLoc cCaseKeywordLoc,
+                          BridgedArrayRef cElements) {
+  auto *decl =
+      EnumCaseDecl::create(convertSourceLoc(cCaseKeywordLoc),
+                           convertArrayRef<EnumElementDecl *>(cElements),
+                           convertDeclContext(cDeclContext));
+
+  return static_cast<Decl *>(decl);
+}
+
+void *EnumElementDecl_create(BridgedASTContext cContext,
+                             BridgedDeclContext cDeclContext,
+                             BridgedIdentifier cName, BridgedSourceLoc cNameLoc,
+                             void *_Nullable opaqueParameterList,
+                             BridgedSourceLoc cEqualsLoc,
+                             void *_Nullable opaqueRawValue) {
+  ASTContext &context = convertASTContext(cContext);
+
+  auto *parameterList = static_cast<ParameterList *>(opaqueParameterList);
+  DeclName declName;
+  {
+    auto identifier = convertIdentifier(cName);
+    if (parameterList) {
+      declName = DeclName(context, identifier, parameterList);
+    } else {
+      declName = identifier;
+    }
+  }
+
+  return new (context) EnumElementDecl(
+      convertSourceLoc(cNameLoc), declName, parameterList,
+      convertSourceLoc(cEqualsLoc), static_cast<LiteralExpr *>(opaqueRawValue),
+      convertDeclContext(cDeclContext));
+}
+
 BridgedDeclContextAndDecl StructDecl_create(
     BridgedASTContext cContext, BridgedDeclContext cDeclContext,
     BridgedSourceLoc cStructKeywordLoc, BridgedIdentifier cName,

lib/ASTGen/Sources/ASTGen/ASTGen.swift

@@ -225,6 +225,15 @@ extension ASTGenVisitor {
     return self.visit(node)
   }
 
+  @inline(__always)
+  func visit(_ node: EnumCaseParameterClauseSyntax?) -> ASTNode? {
+    guard let node else {
+      return nil
+    }
+
+    return self.visit(node)
+  }
+
   @inline(__always)
   func visit(_ node: InheritedTypeListSyntax?) -> BridgedArrayRef {
     guard let node else {

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -158,6 +158,36 @@ extension ASTGenVisitor {
   }
 }
 
+// MARK: - EnumCaseDecl
+
+extension ASTGenVisitor {
+  func visit(_ node: EnumCaseElementSyntax) -> ASTNode {
+    let (name, nameLoc) = node.name.bridgedIdentifierAndSourceLoc(in: self)
+
+    return .decl(
+      EnumElementDecl_create(
+        self.ctx,
+        self.declContext,
+        name,
+        nameLoc,
+        self.visit(node.parameterClause)?.rawValue,
+        self.bridgedSourceLoc(for: node.rawValue?.equal),
+        self.visit(node.rawValue?.value)?.rawValue
+      )
+    )
+  }
+
+  func visit(_ node: EnumCaseDeclSyntax) -> ASTNode {
+    .decl(
+      EnumCaseDecl_create(
+        self.declContext,
+        self.bridgedSourceLoc(for: node.caseKeyword),
+        node.elements.lazy.map { self.visit($0).rawValue }.bridgedArray(in: self)
+      )
+    )
+  }
+}
+
 extension ASTGenVisitor {
   public func visit(_ node: VariableDeclSyntax) -> ASTNode {
     let pattern = visit(node.bindings.first!.pattern).rawValue

test/ASTGen/verify-parse.swift

@@ -105,7 +105,14 @@ Alias<T>
 String where T: Proto1
 
 enum
-Enum<T>: Proto1 where T: Proto1 {
+Enum<T>: Int, Proto1 where T: Proto1 {
+  case
+  a
+    =
+    1
+  case b = 2,
+       c
+
   func method(_ b: Bool) {}
 }