Skip to content

Commit 409b276

Browse files
rintarorintaro
committed
[ASTGen] Statements
1 parent 614a8e3 commit 409b276

17 files changed

+1218
-253
lines changed

‎include/swift/AST/ASTBridging.h

+197-9
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#ifdef USED_IN_CPP_SOURCE
2525
#include "swift/AST/DiagnosticConsumer.h"
2626
#include "swift/AST/DiagnosticEngine.h"
27+
#include "swift/AST/Stmt.h"
2728
#endif
2829

2930
SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
@@ -198,6 +199,19 @@ struct BridgedASTNode {
198199

199200
SWIFT_NAME("kind")
200201
ASTNodeKind Kind;
202+
203+
#ifdef USED_IN_CPP_SOURCE
204+
swift::ASTNode unbridged() const {
205+
switch (Kind) {
206+
case ASTNodeKindExpr:
207+
return swift::ASTNode(static_cast<swift::Expr *>(Raw));
208+
case ASTNodeKindStmt:
209+
return swift::ASTNode(static_cast<swift::Stmt *>(Raw));
210+
case ASTNodeKindDecl:
211+
return swift::ASTNode(static_cast<swift::Decl *>(Raw));
212+
}
213+
}
214+
#endif
201215
};
202216

203217
// Forward declare the underlying AST node type for each wrapper.
@@ -938,33 +952,196 @@ BridgedUnresolvedMemberExpr BridgedUnresolvedMemberExpr_createParsed(
938952
BridgedASTContext cContext, BridgedSourceLoc cDotLoc,
939953
BridgedDeclNameRef cName, BridgedDeclNameLoc cNameLoc);
940954

955+
SWIFT_NAME("BridgedUnresolvedPatternExpr.createParsed(_:pattern:)")
956+
BridgedUnresolvedPatternExpr
957+
BridgedUnresolvedPatternExpr_createParsed(BridgedASTContext cContext,
958+
BridgedPattern cPattern);
959+
960+
SWIFT_NAME("BridgedExpr.setImplicit(self:)")
961+
void BridgedExpr_setImplicit(BridgedExpr cExpr);
962+
941963
SWIFT_NAME("BridgedExpr.dump(self:)")
942964
void BridgedExpr_dump(BridgedExpr expr);
943965

944966
//===----------------------------------------------------------------------===//
945967
// MARK: Stmts
946968
//===----------------------------------------------------------------------===//
947969

970+
struct BridgedLabeledStmtInfo {
971+
SWIFT_NAME("name")
972+
BridgedIdentifier Name;
973+
SWIFT_NAME("loc")
974+
BridgedSourceLoc Loc;
975+
976+
#ifdef USED_IN_CPP_SOURCE
977+
swift::LabeledStmtInfo unbridged() const {
978+
return {Name.unbridged(), Loc.unbridged()};
979+
}
980+
#endif
981+
};
982+
983+
class BridgedStmtConditionElement {
984+
void *_Nonnull Raw;
985+
986+
public:
987+
#ifdef USED_IN_CPP_SOURCE
988+
BridgedStmtConditionElement(swift::StmtConditionElement elem)
989+
: Raw(elem.getOpaqueValue()) {}
990+
991+
swift::StmtConditionElement unbridged() const {
992+
return swift::StmtConditionElement::fromOpaqueValue(Raw);
993+
}
994+
#endif
995+
};
996+
997+
SWIFT_NAME("BridgedStmtConditionElement.createBoolean(expr:)")
998+
BridgedStmtConditionElement
999+
BridgedStmtConditionElement_createBoolean(BridgedExpr expr);
1000+
1001+
SWIFT_NAME("BridgedStmtConditionElement.createPatternBinding(_:introducerLoc:"
1002+
"pattern:initializer:)")
1003+
BridgedStmtConditionElement BridgedStmtConditionElement_createPatternBinding(
1004+
BridgedASTContext cContext, BridgedSourceLoc cIntroducerLoc,
1005+
BridgedPattern cPattern, BridgedExpr cInitializer);
1006+
1007+
struct BridgedCaseLabelItemInfo {
1008+
SWIFT_NAME("isDefault")
1009+
bool IsDefault;
1010+
SWIFT_NAME("pattern")
1011+
BridgedPattern ThePattern;
1012+
SWIFT_NAME("whereLoc")
1013+
BridgedSourceLoc WhereLoc;
1014+
SWIFT_NAME("guardExpr")
1015+
BridgedNullableExpr GuardExpr;
1016+
};
1017+
9481018
SWIFT_NAME("BridgedBraceStmt.createParsed(_:lBraceLoc:elements:rBraceLoc:)")
9491019
BridgedBraceStmt BridgedBraceStmt_createParsed(BridgedASTContext cContext,
9501020
BridgedSourceLoc cLBLoc,
9511021
BridgedArrayRef elements,
9521022
BridgedSourceLoc cRBLoc);
9531023

954-
SWIFT_NAME("BridgedIfStmt.createParsed(_:ifKeywordLoc:condition:thenStmt:"
955-
"elseLoc:elseStmt:)")
956-
BridgedIfStmt BridgedIfStmt_createParsed(BridgedASTContext cContext,
957-
BridgedSourceLoc cIfLoc,
958-
BridgedExpr cond,
959-
BridgedBraceStmt then,
960-
BridgedSourceLoc cElseLoc,
961-
BridgedNullableStmt elseStmt);
1024+
SWIFT_NAME("BridgedBreakStmt.createParsed(_:loc:targetName:targetLoc:)")
1025+
BridgedBreakStmt BridgedBreakStmt_createParsed(BridgedDeclContext cDeclContext,
1026+
BridgedSourceLoc cLoc,
1027+
BridgedIdentifier cTargetName,
1028+
BridgedSourceLoc cTargetLoc);
1029+
1030+
SWIFT_NAME("BridgedCaseStmt.createParsedSwitchCase(_:introducerLoc:"
1031+
"caseLabelItems:unknownAttrLoc:terminatorLoc:body:)")
1032+
BridgedCaseStmt BridgedCaseStmt_createParsedSwitchCase(
1033+
BridgedASTContext cContext, BridgedSourceLoc cIntroducerLoc,
1034+
BridgedArrayRef cCaseLabelItems, BridgedSourceLoc cUnknownAttrLoc,
1035+
BridgedSourceLoc cTerminatorLoc, BridgedBraceStmt cBody);
1036+
1037+
SWIFT_NAME(
1038+
"BridgedCaseStmt.createParsedDoCatch(_:catchLoc:caseLabelItems:body:)")
1039+
BridgedCaseStmt BridgedCaseStmt_createParsedDoCatch(
1040+
BridgedASTContext cContext, BridgedSourceLoc cCatchLoc,
1041+
BridgedArrayRef cCaseLabelItems, BridgedBraceStmt cBody);
1042+
1043+
SWIFT_NAME("BridgedContinueStmt.createParsed(_:loc:targetName:targetLoc:)")
1044+
BridgedContinueStmt BridgedContinueStmt_createParsed(
1045+
BridgedDeclContext cDeclContext, BridgedSourceLoc cLoc,
1046+
BridgedIdentifier cTargetName, BridgedSourceLoc cTargetLoc);
1047+
1048+
SWIFT_NAME("BridgedDeferStmt.createParsed(_:deferLoc:)")
1049+
BridgedDeferStmt BridgedDeferStmt_createParsed(BridgedDeclContext cDeclContext,
1050+
BridgedSourceLoc cDeferLoc);
1051+
1052+
SWIFT_NAME("getter:BridgedDeferStmt.tempDecl(self:)")
1053+
BridgedFuncDecl BridgedDeferStmt_getTempDecl(BridgedDeferStmt bridged);
1054+
1055+
SWIFT_NAME("BridgedDiscardStmt.createParsed(_:discardLoc:subExpr:)")
1056+
BridgedDiscardStmt BridgedDiscardStmt_createParsed(BridgedASTContext cContext,
1057+
BridgedSourceLoc cDiscardLoc,
1058+
BridgedExpr cSubExpr);
1059+
1060+
SWIFT_NAME("BridgedDoStmt.createParsed(_:labelInfo:doLoc:body:)")
1061+
BridgedDoStmt BridgedDoStmt_createParsed(BridgedASTContext cContext,
1062+
BridgedLabeledStmtInfo cLabelInfo,
1063+
BridgedSourceLoc cDoLoc,
1064+
BridgedBraceStmt cBody);
9621065

963-
SWIFT_NAME("BridgedReturnStmt.createParsed(_:returnKeywordLoc:expr:)")
1066+
SWIFT_NAME(
1067+
"BridgedDoCatchStmt.createParsed(_:labelInfo:doLoc:throwsLoc:thrownType:"
1068+
"body:catches:)")
1069+
BridgedDoCatchStmt BridgedDoCatchStmt_createParsed(
1070+
BridgedDeclContext cDeclContext, BridgedLabeledStmtInfo cLabelInfo,
1071+
BridgedSourceLoc cDoLoc, BridgedSourceLoc cThrowsLoc,
1072+
BridgedNullableTypeRepr cThrownType, BridgedStmt cBody,
1073+
BridgedArrayRef cCatches);
1074+
1075+
SWIFT_NAME("BridgedFallthroughStmt.createParsed(_:loc:)")
1076+
BridgedFallthroughStmt
1077+
BridgedFallthroughStmt_createParsed(BridgedASTContext cContext,
1078+
BridgedSourceLoc cLoc);
1079+
1080+
SWIFT_NAME("BridgedForEachStmt.createParsed(_:labelInfo:forLoc:tryLoc:awaitLoc:"
1081+
"pattern:inLoc:sequence:whereLoc:whereExpr:body:)")
1082+
BridgedForEachStmt BridgedForEachStmt_createParsed(
1083+
BridgedASTContext cContext, BridgedLabeledStmtInfo cLabelInfo,
1084+
BridgedSourceLoc cForLoc, BridgedSourceLoc cTryLoc,
1085+
BridgedSourceLoc cAwaitLoc, BridgedPattern cPat, BridgedSourceLoc cInLoc,
1086+
BridgedExpr cSequence, BridgedSourceLoc cWhereLoc,
1087+
BridgedNullableExpr cWhereExpr, BridgedBraceStmt cBody);
1088+
1089+
SWIFT_NAME("BridgedGuardStmt.createParsed(_:guardLoc:conds:body:)")
1090+
BridgedGuardStmt BridgedGuardStmt_createParsed(BridgedASTContext cContext,
1091+
BridgedSourceLoc cGuardLoc,
1092+
BridgedArrayRef cConds,
1093+
BridgedBraceStmt cBody);
1094+
1095+
SWIFT_NAME("BridgedIfStmt.createParsed(_:labelInfo:ifLoc:conditions:then:"
1096+
"elseLoc:else:)")
1097+
BridgedIfStmt BridgedIfStmt_createParsed(
1098+
BridgedASTContext cContext, BridgedLabeledStmtInfo cLabelInfo,
1099+
BridgedSourceLoc cIfLoc, BridgedArrayRef cConds, BridgedBraceStmt cThen,
1100+
BridgedSourceLoc cElseLoc, BridgedNullableStmt cElse);
1101+
1102+
SWIFT_NAME("BridgedRepeatWhileStmt.createParsed(_:labelInfo:repeatLoc:cond:"
1103+
"whileLoc:body:)")
1104+
BridgedRepeatWhileStmt BridgedRepeatWhileStmt_createParsed(
1105+
BridgedASTContext cContext, BridgedLabeledStmtInfo cLabelInfo,
1106+
BridgedSourceLoc cRepeatLoc, BridgedExpr cCond, BridgedSourceLoc cWhileLoc,
1107+
BridgedStmt cBody);
1108+
1109+
SWIFT_NAME("BridgedReturnStmt.createParsed(_:loc:expr:)")
9641110
BridgedReturnStmt BridgedReturnStmt_createParsed(BridgedASTContext cContext,
9651111
BridgedSourceLoc cLoc,
9661112
BridgedNullableExpr expr);
9671113

1114+
SWIFT_NAME("BridgedSwitchStmt.createParsed(_:labelInfo:switchLoc:subjectExpr:"
1115+
"lBraceLoc:cases:rBraceLoc:)")
1116+
BridgedSwitchStmt BridgedSwitchStmt_createParsed(
1117+
BridgedASTContext cContext, BridgedLabeledStmtInfo cLabelInfo,
1118+
BridgedSourceLoc cSwitchLoc, BridgedExpr cSubjectExpr,
1119+
BridgedSourceLoc cLBraceLoc, BridgedArrayRef cCases,
1120+
BridgedSourceLoc cRBraceLoc);
1121+
1122+
SWIFT_NAME("BridgedThenStmt.createParsed(_:thenLoc:result:)")
1123+
BridgedThenStmt BridgedThenStmt_createParsed(BridgedASTContext cContext,
1124+
BridgedSourceLoc cThenLoc,
1125+
BridgedExpr cResult);
1126+
1127+
SWIFT_NAME("BridgedThrowStmt.createParsed(_:throwLoc:subExpr:)")
1128+
BridgedThrowStmt BridgedThrowStmt_createParsed(BridgedASTContext cContext,
1129+
BridgedSourceLoc cThrowLoc,
1130+
BridgedExpr cSubExpr);
1131+
1132+
SWIFT_NAME("BridgedWhileStmt.createParsed(_:labelInfo:whileLoc:cond:body:)")
1133+
BridgedWhileStmt BridgedWhileStmt_createParsed(
1134+
BridgedASTContext cContext, BridgedLabeledStmtInfo cLabelInfo,
1135+
BridgedSourceLoc cWhileLoc, BridgedArrayRef cCond, BridgedStmt cBody);
1136+
1137+
SWIFT_NAME(
1138+
"BridgedYieldStmt.createParsed(_:yieldLoc:lParenLoc:yields:rParenLoc:)")
1139+
BridgedYieldStmt BridgedYieldStmt_createParsed(BridgedASTContext cContext,
1140+
BridgedSourceLoc cYieldLoc,
1141+
BridgedSourceLoc cLParenLoc,
1142+
BridgedArrayRef cYields,
1143+
BridgedSourceLoc cRParenLoc);
1144+
9681145
SWIFT_NAME("BridgedStmt.dump(self:)")
9691146
void BridgedStmt_dump(BridgedStmt statement);
9701147

@@ -1214,6 +1391,11 @@ BridgedBindingPattern_createParsed(BridgedASTContext cContext,
12141391
BridgedSourceLoc cKeywordLoc, bool isLet,
12151392
BridgedPattern cSubPattern);
12161393

1394+
SWIFT_NAME("BridgedBindingPattern.createImplicitCatch(_:loc:)")
1395+
BridgedBindingPattern
1396+
BridgedBindingPattern_createImplicitCatch(BridgedDeclContext cDeclContext,
1397+
BridgedSourceLoc cLoc);
1398+
12171399
SWIFT_NAME("BridgedExprPattern.createParsed(_:expr:)")
12181400
BridgedExprPattern
12191401
BridgedExprPattern_createParsed(BridgedDeclContext cDeclContext,
@@ -1256,6 +1438,12 @@ SWIFT_NAME("BridgedTypedPattern.createPropagated(_:pattern:type:)")
12561438
BridgedTypedPattern BridgedTypedPattern_createPropagated(
12571439
BridgedASTContext cContext, BridgedPattern cPattern, BridgedTypeRepr cType);
12581440

1441+
SWIFT_NAME("BridgedPattern.setImplicit(self:)")
1442+
void BridgedPattern_setImplicit(BridgedPattern cPattern);
1443+
1444+
SWIFT_NAME("getter:BridgedPattern.boundName(self:)")
1445+
BridgedIdentifier BridgedPattern_getBoundName(BridgedPattern cPattern);
1446+
12591447
//===----------------------------------------------------------------------===//
12601448
// MARK: Misc
12611449
//===----------------------------------------------------------------------===//

‎include/swift/AST/ASTContext.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ class ASTContext final {
522522
}
523523

524524
template <typename Output, typename Range>
525-
ArrayRef<Output> AllocateTransform(
525+
MutableArrayRef<Output> AllocateTransform(
526526
Range &&input,
527527
llvm::function_ref<Output(typename Range::const_reference)> transform,
528528
AllocationArena arena = AllocationArena::Permanent) {

‎include/swift/AST/Pattern.h

+7
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,13 @@ class BindingPattern : public Pattern {
767767
setIntroducer(introducer);
768768
}
769769

770+
static BindingPattern *createParsed(ASTContext &ctx, SourceLoc loc,
771+
VarDecl::Introducer introducer,
772+
Pattern *sub);
773+
774+
/// Create implicit 'let error' pattern for 'catch' statement.
775+
static BindingPattern *createImplicitCatch(DeclContext *dc, SourceLoc loc);
776+
770777
VarDecl::Introducer getIntroducer() const {
771778
return VarDecl::Introducer(Bits.BindingPattern.Introducer);
772779
}

‎include/swift/AST/Stmt.h

+20-4
Original file line numberDiff line numberDiff line change
@@ -363,14 +363,19 @@ class DeferStmt : public Stmt {
363363
/// This is the invocation of the closure, which is to be emitted on any error
364364
/// paths.
365365
Expr *callExpr;
366-
367-
public:
366+
368367
DeferStmt(SourceLoc DeferLoc,
369368
FuncDecl *tempDecl, Expr *callExpr)
370369
: Stmt(StmtKind::Defer, /*implicit*/false),
371370
DeferLoc(DeferLoc), tempDecl(tempDecl),
372371
callExpr(callExpr) {}
373-
372+
373+
public:
374+
/// Create a 'defer' statement. This automatically creates the "temp decl" and
375+
/// the call expression. It's the caller's responsibility to populate the
376+
/// body of the func decl.
377+
static DeferStmt *create(DeclContext *dc, SourceLoc deferLoc);
378+
374379
SourceLoc getDeferLoc() const { return DeferLoc; }
375380

376381
SourceLoc getStartLoc() const { return DeferLoc; }
@@ -390,7 +395,6 @@ class DeferStmt : public Stmt {
390395
/// conditional statements (i.e. `if`, `guard`, `while`).
391396
class alignas(8) ConditionalPatternBindingInfo
392397
: public ASTAllocated<ConditionalPatternBindingInfo> {
393-
public:
394398
/// Location of the var/let/case keyword.
395399
SourceLoc IntroducerLoc;
396400

@@ -1186,6 +1190,18 @@ class CaseStmt final
11861190
NullablePtr<FallthroughStmt> fallthroughStmt);
11871191

11881192
public:
1193+
/// Create a parsed 'case'/'default' for 'switch' statement.
1194+
static CaseStmt *
1195+
createParsedSwitchCase(ASTContext &C, SourceLoc ItemIntroducerLoc,
1196+
ArrayRef<CaseLabelItem> CaseLabelItems,
1197+
SourceLoc UnknownAttrLoc, SourceLoc ColonLoc,
1198+
BraceStmt *Body);
1199+
1200+
/// Create a parsed 'catch' for 'do' statement.
1201+
static CaseStmt *createParsedDoCatch(ASTContext &C, SourceLoc CatchLoc,
1202+
ArrayRef<CaseLabelItem> CaseLabelItems,
1203+
BraceStmt *Body);
1204+
11891205
static CaseStmt *
11901206
create(ASTContext &C, CaseParentKind ParentKind, SourceLoc ItemIntroducerLoc,
11911207
ArrayRef<CaseLabelItem> CaseLabelItems, SourceLoc UnknownAttrLoc,

0 commit comments

Comments
 (0)