ASTGen: Translate protocol declarations

Author: AnthonyLatsis

include/swift/AST/CASTBridging.h

@@ -215,6 +215,11 @@ typedef struct BridgedTypeAttributes {
   void *raw;
 } BridgedTypeAttributes;
 
+struct BridgedIdentifierAndSourceLoc {
+  BridgedIdentifier name;
+  BridgedSourceLoc nameLoc;
+};
+
 #ifdef __cplusplus
 extern "C" {
 
@@ -363,6 +368,13 @@ ClassDecl_create(BridgedASTContext cContext, BridgedDeclContext cDeclContext,
                  void *_Nullable opaqueGenericParamList,
                  BridgedSourceRange cBraceRange);
 
+BridgedDeclContextAndDecl
+ProtocolDecl_create(BridgedASTContext cContext, BridgedDeclContext cDeclContext,
+                    BridgedSourceLoc cProtocolKeywordLoc,
+                    BridgedIdentifier cName, BridgedSourceLoc cNameLoc,
+                    BridgedArrayRef cPrimaryAssociatedTypeNames,
+                    BridgedSourceRange cBraceRange);
+
 void *GenericParamList_create(BridgedASTContext cContext,
                               BridgedSourceLoc cLAngleLoc,
                               BridgedArrayRef params,

lib/AST/CASTBridging.cpp

@@ -591,6 +591,29 @@ ClassDecl_create(BridgedASTContext cContext, BridgedDeclContext cDeclContext,
   return {bridgeDeclContext(decl), static_cast<Decl *>(decl)};
 }
 
+BridgedDeclContextAndDecl
+ProtocolDecl_create(BridgedASTContext cContext, BridgedDeclContext cDeclContext,
+                    BridgedSourceLoc cProtocolKeywordLoc,
+                    BridgedIdentifier cName, BridgedSourceLoc cNameLoc,
+                    BridgedArrayRef cPrimaryAssociatedTypeNames,
+                    BridgedSourceRange cBraceRange) {
+  SmallVector<PrimaryAssociatedTypeName, 2> primaryAssociatedTypeNames;
+  for (auto &pair : convertArrayRef<BridgedIdentifierAndSourceLoc>(
+           cPrimaryAssociatedTypeNames)) {
+    primaryAssociatedTypeNames.emplace_back(convertIdentifier(pair.name),
+                                            convertSourceLoc(pair.nameLoc));
+  }
+
+  ASTContext &context = convertASTContext(cContext);
+  auto *decl = new (context) ProtocolDecl(
+      convertDeclContext(cDeclContext), convertSourceLoc(cProtocolKeywordLoc),
+      convertSourceLoc(cNameLoc), convertIdentifier(cName),
+      context.AllocateCopy(primaryAssociatedTypeNames), {}, nullptr);
+  decl->setBraces(convertSourceRange(cBraceRange));
+
+  return {bridgeDeclContext(decl), static_cast<Decl *>(decl)};
+}
+
 void *OptionalTypeRepr_create(BridgedASTContext cContext, void *base,
                               BridgedSourceLoc cQuestionLoc) {
   ASTContext &context = convertASTContext(cContext);

lib/ASTGen/Sources/ASTGen/Bridge.swift

@@ -76,6 +76,16 @@ extension TokenSyntax {
   func bridgedIdentifierAndSourceLoc(in astgen: ASTGenVisitor) -> (BridgedIdentifier, BridgedSourceLoc) {
     return (self.bridgedIdentifier(in: astgen), astgen.bridgedSourceLoc(for: self))
   }
+
+  /// Obtains a bridged, `ASTContext`-owned copy of this token's text, and its bridged start location in the
+  /// source buffer provided by `astgen`.
+  ///
+  /// - Parameter astgen: The visitor providing the `ASTContext` and source buffer.
+  @inline(__always)
+  func bridgedIdentifierAndSourceLoc(in astgen: ASTGenVisitor) -> BridgedIdentifierAndSourceLoc {
+    let (name, nameLoc) = self.bridgedIdentifierAndSourceLoc(in: astgen)
+    return .init(name: name, nameLoc: nameLoc)
+  }
 }
 
 extension Optional<TokenSyntax> {

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -63,6 +63,29 @@ extension ASTGenVisitor {
 
     return .decl(decl.asDecl)
   }
+
+  func visit(_ node: ProtocolDeclSyntax) -> ASTNode {
+    let (name, nameLoc) = node.name.bridgedIdentifierAndSourceLoc(in: self)
+    let primaryAssociatedTypeNames = node.primaryAssociatedTypeClause?.primaryAssociatedTypes.lazy.map {
+      $0.name.bridgedIdentifierAndSourceLoc(in: self) as BridgedIdentifierAndSourceLoc
+    }
+
+    let decl = ProtocolDecl_create(
+      self.ctx,
+      self.declContext,
+      self.bridgedSourceLoc(for: node.protocolKeyword),
+      name,
+      nameLoc,
+      primaryAssociatedTypeNames.bridgedArray(in: self),
+      BridgedSourceRange(startToken: node.memberBlock.leftBrace, endToken: node.memberBlock.rightBrace, in: self)
+    )
+
+    self.withDeclContext(decl.asDeclContext) {
+      IterableDeclContext_setParsedMembers(self.visit(node.memberBlock.members), decl.asDecl)
+    }
+
+    return .decl(decl.asDecl)
+  }
 }
 
 extension ASTGenVisitor {

test/ASTGen/verify-parse.swift

@@ -81,6 +81,14 @@ func test9(_ value: Any) { }
 
 func test10<T>(t: T) {}
 
+protocol Proto1 {}
+protocol Proto2 {}
+
+protocol
+Proto3 {
+  func method(_ b: Bool)
+}
+
 typealias
 Alias<T>
 =
@@ -89,8 +97,10 @@ String
 struct
 Struct
 <
-  T1,
-  T2
+  T1:
+  Proto1,
+  T2:
+  Proto2
 >
 {
   /*static*/ func method(_ b: Bool) {}