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

[AST] NFC: Rename IfExpr -> TernaryExpr

Browse Source 
This matches what we call it in SwiftSyntax, and
is just generally clearer.
This commit is contained in:
Hamish Knight
2022-09-28 10:33:31 +01:00
parent a6b58962f8
commit bca941b152
25 changed files with 125 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Sema/ConstraintSystem.cpp
View File

@@ -5202,7 +5202,7 @@ void constraints::simplifyLocator(ASTNode &anchor,
if (auto *condStmt = getAsStmt<LabeledConditionalStmt>(anchor)) {
anchor = &condStmt->getCond().front();
} else {
anchor = castToExpr<IfExpr>(anchor)->getCondExpr();
anchor = castToExpr<TernaryExpr>(anchor)->getCondExpr();
}
path = path.slice(1);
@@ -5216,7 +5216,7 @@ void constraints::simplifyLocator(ASTNode &anchor,
anchor =
branch.forThen() ? ifStmt->getThenStmt() : ifStmt->getElseStmt();
} else {
auto *ifExpr = castToExpr<IfExpr>(anchor);
auto *ifExpr = castToExpr<TernaryExpr>(anchor);
anchor =
branch.forThen() ? ifExpr->getThenExpr() : ifExpr->getElseExpr();
}
@@ -5574,8 +5574,8 @@ static bool shouldHaveDirectCalleeOverload(const CallExpr *callExpr) {
if (isa<ExplicitCastExpr>(fnExpr))
return false;
// No direct callee for an if expr.
if (isa<IfExpr>(fnExpr))
// No direct callee for a ternary expr.
if (isa<TernaryExpr>(fnExpr))
return false;
// Assume that anything else would have a direct callee.