Merge pull request #61812 from zoecarver/smattering-of-astgen-fixes

[astgen] A smattering of ASTGen fixes.

Author: zoecarver

include/swift/AST/CASTBridging.h

@@ -125,14 +125,21 @@ void *SwiftIntegerLiteralExpr_create(void *ctx, const uint8_t *_Nullable string,
 void *SwiftBooleanLiteralExpr_create(void *ctx, _Bool value, void *TokenLoc);
 
 void *SwiftVarDecl_create(void *ctx, BridgedIdentifier _Nullable name,
-                          void *loc, _Bool isStatic, _Bool isLet, void *dc);
+                          void *initExpr, void *loc, _Bool isStatic,
+                          _Bool isLet, void *dc);
 
 void *IfStmt_create(void *ctx, void *ifLoc, void *cond, void *_Nullable then,
                     void *_Nullable elseLoc, void *_Nullable elseStmt);
 
+typedef enum ENUM_EXTENSIBILITY_ATTR(open) ASTNodeKind : long {
+  ASTNodeKindExpr,
+  ASTNodeKindStmt,
+  ASTNodeKindDecl
+} ASTNodeKind;
+
 struct ASTNodeBridged {
   void *ptr;
-  _Bool isExpr; // Must be expr or stmt.
+  ASTNodeKind kind;
 };
 
 void *BraceStmt_create(void *ctx, void *lbloc, BridgedArrayRef elements,
@@ -144,7 +151,8 @@ void *BridgedSourceLoc_advanced(void *loc, long len);
 
 void *ParamDecl_create(void *ctx, void *loc, void *_Nullable argLoc,
                        void *_Nullable argName, void *_Nullable paramLoc,
-                       void *_Nullable paramName, void *declContext);
+                       void *_Nullable paramName, void *_Nullable type,
+                       void *declContext);
 
 void *FuncDecl_create(void *ctx, void *staticLoc, _Bool isStatic, void *funcLoc,
                       BridgedIdentifier name, void *nameLoc, _Bool isAsync,

lib/AST/CASTBridging.cpp

@@ -7,6 +7,7 @@
 #include "swift/AST/GenericParamList.h"
 #include "swift/AST/Identifier.h"
 #include "swift/AST/ParameterList.h"
+#include "swift/AST/Pattern.h"
 #include "swift/AST/Stmt.h"
 #include "swift/AST/TypeRepr.h"
 
@@ -139,11 +140,20 @@ void *SwiftBooleanLiteralExpr_create(void *ctx, bool value, void *TokenLoc) {
 }
 
 void *SwiftVarDecl_create(void *ctx, BridgedIdentifier _Nullable nameId,
-                          void *loc, bool isStatic, bool isLet, void *dc) {
+                          void *initExpr, void *loc, bool isStatic, bool isLet,
+                          void *dc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
-  return new (Context) VarDecl(
+  auto name = (UnresolvedDeclRefExpr *)nameId;
+  auto sourceLoc = getSourceLocFromPointer(loc);
+  auto varDecl = new (Context) VarDecl(
       isStatic, isLet ? VarDecl::Introducer::Let : VarDecl::Introducer::Var,
-      getSourceLocFromPointer(loc), Identifier::getFromOpaquePointer(nameId),
+      sourceLoc, name->getName().getBaseIdentifier(),
+      reinterpret_cast<DeclContext *>(dc));
+  auto pattern = NamedPattern::createImplicit(Context, varDecl);
+  return PatternBindingDecl::create(
+      Context, sourceLoc,
+      isStatic ? StaticSpellingKind::KeywordStatic : StaticSpellingKind::None,
+      sourceLoc, pattern, sourceLoc, (Expr *)initExpr,
       reinterpret_cast<DeclContext *>(dc));
 }
 
@@ -164,12 +174,16 @@ void *BraceStmt_create(void *ctx, void *lbloc, BridgedArrayRef elements,
                        void *rbloc) {
   llvm::SmallVector<ASTNode, 6> nodes;
   for (auto node : getArrayRef<ASTNodeBridged>(elements)) {
-    if (node.isExpr) {
+    if (node.kind == ASTNodeKindExpr) {
       auto expr = (Expr *)node.ptr;
       nodes.push_back(expr);
-    } else {
+    } else if (node.kind == ASTNodeKindStmt) {
       auto stmt = (Stmt *)node.ptr;
       nodes.push_back(stmt);
+    } else {
+      assert(node.kind == ASTNodeKindDecl);
+      auto decl = (Decl *)node.ptr;
+      nodes.push_back(decl);
     }
   }
 
@@ -183,13 +197,17 @@ void *ParamDecl_create(void *ctx, void *loc, void *_Nullable argLoc,
                        BridgedIdentifier _Nullable argName,
                        void *_Nullable paramLoc,
                        BridgedIdentifier _Nullable paramName,
-                       void *declContext) {
+                       void *_Nullable type, void *declContext) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
-  return new (Context) ParamDecl(
+  if (!paramName)
+    paramName = argName;
+  auto paramDecl = new (Context) ParamDecl(
       getSourceLocFromPointer(loc), getSourceLocFromPointer(argLoc),
       Identifier::getFromOpaquePointer(argName),
       getSourceLocFromPointer(paramLoc),
       Identifier::getFromOpaquePointer(paramName), (DeclContext *)declContext);
+  paramDecl->setTypeRepr((TypeRepr *)type);
+  return paramDecl;
 }
 
 void *FuncDecl_create(void *ctx, void *staticLoc, bool isStatic, void *funcLoc,

lib/ASTGen/Sources/ASTGen/ASTGen.swift

@@ -38,9 +38,11 @@ enum ASTNode {
   func bridged() -> ASTNodeBridged {
     switch self {
     case .expr(let e):
-      return ASTNodeBridged(ptr: e, isExpr: true)
+      return ASTNodeBridged(ptr: e, kind: .expr)
     case .stmt(let s):
-      return ASTNodeBridged(ptr: s, isExpr: false)
+      return ASTNodeBridged(ptr: s, kind: .stmt)
+    case .decl(let d):
+      return ASTNodeBridged(ptr: d, kind: .decl)
     default:
       fatalError("Must be expr or stmt.")
     }

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -75,14 +75,18 @@ extension ASTGenVisitor {
     let isLet = node.letOrVarKeyword.tokenKind == .letKeyword
 
     // TODO: don't drop "initializer" on the floor.
-    return .decl(SwiftVarDecl_create(ctx, nil, loc, isStateic, isLet, declContext))
+    return .decl(
+      SwiftVarDecl_create(
+        ctx, pattern, initializer, loc, isStateic,
+        isLet, declContext))
   }
 
   public func visit(_ node: FunctionParameterSyntax) -> ASTNode {
     let loc = self.base.advanced(by: node.position.utf8Offset).raw
 
     let firstName: UnsafeMutableRawPointer?
     let secondName: UnsafeMutableRawPointer?
+    let type: UnsafeMutableRawPointer?
 
     if let nodeFirstName = node.firstName {
       var text = nodeFirstName.text
@@ -102,7 +106,13 @@ extension ASTGenVisitor {
       secondName = nil
     }
 
-    return .decl(ParamDecl_create(ctx, loc, loc, firstName, loc, secondName, declContext))
+    if let typeSyntax = node.type {
+      type = visit(typeSyntax).rawValue
+    } else {
+      type = nil
+    }
+
+    return .decl(ParamDecl_create(ctx, loc, loc, firstName, loc, secondName, type, declContext))
   }
 
   public func visit(_ node: FunctionDeclSyntax) -> ASTNode {

lib/ASTGen/Sources/ASTGen/Stmts.swift

@@ -5,11 +5,12 @@ import SwiftSyntax
 extension ASTGenVisitor {
   public func visit(_ node: CodeBlockSyntax) -> ASTNode {
     let statements = node.statements.map(self.visit).map { $0.bridged() }
-    let loc = self.base.advanced(by: node.position.utf8Offset).raw
+    let startLoc = self.base.advanced(by: node.position.utf8Offset).raw
+    let endLoc = self.base.advanced(by: node.endPosition.utf8Offset).raw
 
     return .stmt(
       statements.withBridgedArrayRef { ref in
-        BraceStmt_create(ctx, loc, ref, loc)
+        BraceStmt_create(ctx, startLoc, ref, endLoc)
       })
   }