[astgen] Support labeled tuples.

Author: zoecarver

include/swift/AST/CASTBridging.h

@@ -110,6 +110,8 @@ void *ReturnStmt_create(void *ctx, void *loc, void *_Nullable expr);
 void *SwiftSequenceExpr_create(void *ctx, BridgedArrayRef exprs);
 
 void *SwiftTupleExpr_create(void *ctx, void *lparen, BridgedArrayRef subs,
+                            BridgedArrayRef names,
+                            BridgedArrayRef nameLocs,
                             void *rparen);
 
 void *SwiftFunctionCallExpr_create(void *ctx, void *fn, void *args);

lib/AST/CASTBridging.cpp

@@ -87,10 +87,14 @@ void *SwiftSequenceExpr_create(void *ctx, BridgedArrayRef exprs) {
 }
 
 void *SwiftTupleExpr_create(void *ctx, void *lparen, BridgedArrayRef subs,
+                            BridgedArrayRef names,
+                            BridgedArrayRef nameLocs,
                             void *rparen) {
+  auto &Context = *static_cast<ASTContext *>(ctx);
   return TupleExpr::create(
-      *static_cast<ASTContext *>(ctx), getSourceLocFromPointer(lparen),
-      getArrayRef<Expr *>(subs), {}, {}, getSourceLocFromPointer(rparen),
+      Context, getSourceLocFromPointer(lparen),
+      getArrayRef<Expr *>(subs), getArrayRef<Identifier>(names),
+      getArrayRef<SourceLoc>(nameLocs), getSourceLocFromPointer(rparen),
       /*Implicit*/ false);
 }
 

lib/ASTGen/Sources/ASTGen/Exprs.swift

@@ -24,7 +24,6 @@ extension ASTGenVisitor {
     }
 
     let args = visit(node.argumentList).rawValue
-    // TODO: hack
     let callee = visit(node.calledExpression).rawValue
 
     return .expr(SwiftFunctionCallExpr_create(self.ctx, callee, args))
@@ -65,13 +64,28 @@ extension ASTGenVisitor {
 
   public func visit(_ node: TupleExprElementListSyntax) -> ASTNode {
     let elements = node.map { self.visit($0).rawValue }
+    let labels: [BridgedIdentifier] = node.enumerated().map { (idx, e) in
+      var name = e.label?.text ?? "\(idx)"
+      return name.withUTF8 { buf in
+        SwiftASTContext_getIdentifier(ctx, buf.baseAddress, buf.count)
+      }
+    }
+    let labelLocs = node.map {
+      let pos = $0.label?.position ?? $0.position
+      return base.advanced(by: pos.utf8Offset).raw
+    }
 
     let lParenLoc = self.base.advanced(by: node.position.utf8Offset).raw
     let rParenLoc = self.base.advanced(by: node.endPosition.utf8Offset).raw
 
     return .expr(
       elements.withBridgedArrayRef { elementsRef in
-        SwiftTupleExpr_create(self.ctx, lParenLoc, elementsRef, rParenLoc)
+        labels.withBridgedArrayRef { labelsRef in
+          labelLocs.withBridgedArrayRef { labelLocRef in
+            SwiftTupleExpr_create(self.ctx, lParenLoc, elementsRef, labelsRef,
+                                  labelLocRef, rParenLoc)
+          }
+        }
       })
   }
 }