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

[CS] Add specific accessors for path element info

Browse Source 
This commit replaces the `getValue()` and `getValue2()` members on
`ConstraintLocator::PathElement` with specific accessors for each
expected path component kind. IMO this adds some clarity to the call
sites, especially for `getArgIdx()` and `getParamIdx()`.

In addition, this commit adds a private `getValue` member that can
access a value at a given index, which will make it easier to add a
third value in the future.
This commit is contained in:
Hamish Knight
2019-07-22 22:15:37 +01:00
parent 541a7173ad
commit b5b41a5bbe
7 changed files with 91 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Sema/CSDiagnostics.cpp
View File

@@ -271,8 +271,8 @@ FailureDiagnostic::getFunctionArgApplyInfo(ConstraintLocator *locator) const {
fnInterfaceType = resolveInterfaceType(rawFnType);
}
auto argIdx = applyArgElt->getValue();
auto paramIdx = applyArgElt->getValue2();
auto argIdx = applyArgElt->getArgIdx();
auto paramIdx = applyArgElt->getParamIdx();
return FunctionArgApplyInfo(argExpr, argIdx, getType(argExpr), paramIdx,
fnInterfaceType, fnType, callee);
@@ -1263,7 +1263,7 @@ bool RValueTreatedAsLValueFailure::diagnoseAsError() {
subElementDiagID = diag::cannot_pass_rvalue_inout_subelement;
rvalueDiagID = diag::cannot_pass_rvalue_inout;
if (auto argTuple = dyn_cast<TupleExpr>(argExpr))
diagExpr = argTuple->getElement(lastPathElement.getValue());
diagExpr = argTuple->getElement(lastPathElement.getArgIdx());
else if (auto parens = dyn_cast<ParenExpr>(argExpr))
diagExpr = parens->getSubExpr();
} else {
@@ -2417,7 +2417,7 @@ bool AutoClosureForwardingFailure::diagnoseAsError() {
// We need a raw anchor here because `getAnchor()` is simplified
// to the argument expression.
auto *argExpr = getArgumentExpr(getRawAnchor(), last.getValue());
auto *argExpr = getArgumentExpr(getRawAnchor(), last.getArgIdx());
emitDiagnostic(argExpr->getLoc(), diag::invalid_autoclosure_forwarding)
.highlight(argExpr->getSourceRange())
.fixItInsertAfter(argExpr->getEndLoc(), "()");
@@ -3578,7 +3578,7 @@ bool KeyPathSubscriptIndexHashableFailure::diagnoseAsError() {
auto *KPE = cast<KeyPathExpr>(anchor);
for (auto &elt : locator->getPath()) {
if (elt.isKeyPathComponent()) {
loc = KPE->getComponents()[elt.getValue()].getLoc();
loc = KPE->getComponents()[elt.getKeyPathComponentIdx()].getLoc();
break;
}
}
@@ -3600,7 +3600,7 @@ SourceLoc InvalidMemberRefInKeyPath::getLoc() const {
});
assert(component != locator->getPath().end());
return KPE->getComponents()[component->getValue()].getLoc();
return KPE->getComponents()[component->getKeyPathComponentIdx()].getLoc();
}
return anchor->getLoc();
@@ -3689,7 +3689,7 @@ bool CollectionElementContextualFailure::diagnoseAsError() {
if (isa<DictionaryExpr>(getRawAnchor())) {
const auto &eltLoc = locator->getPath().back();
switch (eltLoc.getValue()) {
switch (eltLoc.getTupleElementIdx()) {
case 0: // key
diagnostic.emplace(emitDiagnostic(anchor->getLoc(),
diag::cannot_convert_dict_key, eltType,