ASTGen: Handle member types with non-identifier qualifiers

Author: AnthonyLatsis

include/swift/AST/CASTBridging.h

@@ -242,7 +242,8 @@ void *ProtocolTypeRepr_create(void *ctx, void *baseType, void *protoLoc);
 void *PackExpansionTypeRepr_create(void *ctx, void *base, void *repeatLoc);
 void *TupleTypeRepr_create(void *ctx, BridgedArrayRef elements, void *lParenLoc,
                            void *rParenLoc);
-void *DeclRefTypeRepr_create(void *ctx, BridgedArrayRef bridgedComponents);
+void *MemberTypeRepr_create(void *ctx, void *baseComponent,
+                            BridgedArrayRef bridgedMemberComponents);
 void *GenericIdentTypeRepr_create(void *ctx, BridgedIdentifier name,
                                   void *nameLoc, BridgedArrayRef genericArgs,
                                   void *lAngle, void *rAngle);

lib/AST/CASTBridging.cpp

@@ -497,14 +497,13 @@ void *TupleTypeRepr_create(void *ctx, BridgedArrayRef elements, void *lParenLoc,
                                SourceRange{lParen, rParen});
 }
 
-void *DeclRefTypeRepr_create(void *ctx, BridgedArrayRef bridgedComponents) {
+void *MemberTypeRepr_create(void *ctx, void *baseComponent,
+                            BridgedArrayRef bridgedMemberComponents) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
-  auto components = getArrayRef<IdentTypeRepr *>(bridgedComponents);
-  if (components.size() == 1) {
-    return components.front();
-  }
+  auto memberComponents = getArrayRef<IdentTypeRepr *>(bridgedMemberComponents);
 
-  return MemberTypeRepr::create(Context, components);
+  return MemberTypeRepr::create(Context, (TypeRepr *)baseComponent,
+                                memberComponents);
 }
 
 void *CompositionTypeRepr_create(void *ctx, BridgedArrayRef types,

lib/ASTGen/Sources/ASTGen/Types.swift

@@ -28,41 +28,40 @@ extension ASTGenVisitor {
   }
 
   public func visit(_ node: MemberTypeIdentifierSyntax) -> ASTNode {
-    var path = [(TokenSyntax, GenericArgumentClauseSyntax?)]()
-    var memberRef: Syntax? = Syntax(node)
-    while let nestedMember = memberRef?.as(MemberTypeIdentifierSyntax.self) {
-      path.append((nestedMember.name, nestedMember.genericArgumentClause))
-      memberRef = Syntax(nestedMember.baseType)
-    }
+    // Gather the member components, in decreasing depth order.
+    var reverseMemberComponents = [UnsafeMutableRawPointer]()
 
-    if let base = memberRef?.as(SimpleTypeIdentifierSyntax.self) {
-      path.append((base.name, base.genericArgumentClause))
-    }
+    var baseType = Syntax(node)
+    while let memberType = baseType.as(MemberTypeIdentifierSyntax.self) {
+      let nameToken = memberType.name
+      let generics = memberType.genericArgumentClause
 
-    var elements = [UnsafeMutableRawPointer]()
-    for (pathElement, generics) in path.reversed() {
-      var nameText = pathElement.text
+      var nameText = nameToken.text
       let name = nameText.withUTF8 { buf in
         return SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count)
       }
-      let nameLoc = self.base.advanced(by: pathElement.position.utf8Offset).raw
+      let nameLoc = self.base.advanced(by: nameToken.position.utf8Offset).raw
 
       if let generics = generics {
         let lAngle = self.base.advanced(by: generics.leftAngleBracket.position.utf8Offset).raw
         let rAngle = self.base.advanced(by: generics.rightAngleBracket.position.utf8Offset).raw
-        elements.append(
+        reverseMemberComponents.append(
           generics.arguments.map({ self.visit($0.argumentType) }).withBridgedArrayRef {
             genericArgs in
             GenericIdentTypeRepr_create(self.ctx, name, nameLoc, genericArgs, lAngle, rAngle)
           })
       } else {
-        elements.append(SimpleIdentTypeRepr_create(self.ctx, nameLoc, name))
+        reverseMemberComponents.append(SimpleIdentTypeRepr_create(self.ctx, nameLoc, name))
       }
+
+      baseType = Syntax(memberType.baseType)
     }
 
+    let baseComponent = visit(baseType).rawValue
+
     return .type(
-      elements.withBridgedArrayRef { elements in
-        return DeclRefTypeRepr_create(self.ctx, elements)
+      reverseMemberComponents.reversed().withBridgedArrayRef { memberComponents in
+        return MemberTypeRepr_create(self.ctx, baseComponent, memberComponents)
       })
   }