averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move single-expr return transform from Parse to Sema

Browse Source 
Rather than doing the transform in the parser, and
then potentially undoing it in Sema, move the
entire transform into Sema. This also lets us
unify the logic between function decls and
closures, and allows ASTGen to benefit from it.
This commit is contained in:
Hamish Knight
2024-01-30 14:08:53 +00:00
parent b1070f20a2
commit f4a6b95d24
9 changed files with 160 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
View File

@@ -1741,9 +1741,19 @@ private:
return RS->isImplicit() && RS->getSourceRange().Start == TargetLoc;
if (auto BS = dyn_cast<BraceStmt>(S)) {
if (BS->getNumElements() == 1) {
if (auto innerS = BS->getFirstElement().dyn_cast<Stmt *>())
return isImplicitReturnBody(innerS);
if (BS->getNumElements() != 1)
return false;
if (auto *innerS = BS->getSingleActiveStatement())
return isImplicitReturnBody(innerS);
// Before pre-checking, the implicit return will not have been
// inserted. Look for a single expression body in a closure.
if (auto *ParentE = getWalker().Parent.getAsExpr()) {
if (isa<ClosureExpr>(ParentE)) {
if (auto *innerE = BS->getSingleActiveExpression())
return innerE->getStartLoc() == TargetLoc;
}
}
}
@@ -1827,17 +1837,16 @@ private:
auto &outParam = outParams.back();
if (auto CE = dyn_cast<ClosureExpr>(E)) {
if (CE->hasSingleExpressionBody() &&
CE->getSingleExpressionBody()->getStartLoc() ==
targetPlaceholderLoc) {
targetPlaceholderIndex = outParams.size() - 1;
if (auto *PHE = dyn_cast<EditorPlaceholderExpr>(
CE->getSingleExpressionBody())) {
outParam.isWrappedWithBraces = true;
ClosureInfo info;
if (scanClosureType(PHE, info))
outParam.placeholderClosure = info;
continue;
if (auto *E = CE->getBody()->getSingleActiveExpression()) {
if (E->getStartLoc() == targetPlaceholderLoc) {
targetPlaceholderIndex = outParams.size() - 1;
if (auto *PHE = dyn_cast<EditorPlaceholderExpr>(E)) {
outParam.isWrappedWithBraces = true;
ClosureInfo info;
if (scanClosureType(PHE, info))
outParam.placeholderClosure = info;
continue;
}
}
}
// else...