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

Diagnostics: Ported tuple mismatch diagnostic to new diagnostic framework

Browse Source
This commit is contained in:
Sam Lazarus
2019-07-23 15:28:53 -04:00
parent b28b44b9c7
commit a3b56c2790
9 changed files with 115 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/Sema/CSSimplify.cpp
View File

@@ -2382,6 +2382,13 @@ bool ConstraintSystem::repairFailures(
getConstraintLocator(locator));
conversionsOrFixes.push_back(fix);
}
if (purpose == CTP_Initialization && lhs->is<TupleType>() &&
rhs->is<TupleType>()) {
auto *fix = AllowTupleTypeMismatch::create(*this, lhs, rhs,
getConstraintLocator(locator));
conversionsOrFixes.push_back(fix);
}
break;
}
@@ -2413,6 +2420,11 @@ bool ConstraintSystem::repairFailures(
conversionsOrFixes.push_back(CollectionElementContextualMismatch::create(
*this, lhs, rhs, getConstraintLocator(locator)));
}
if (lhs->is<TupleType>() && rhs->is<TupleType>()) {
auto *fix = AllowTupleTypeMismatch::create(*this, lhs, rhs,
getConstraintLocator(locator));
conversionsOrFixes.push_back(fix);
}
break;
}
@@ -6951,6 +6963,32 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
return matchTypes(type1, type2, matchKind, subflags, locator);
}
case FixKind::AllowTupleTypeMismatch: {
auto lhs = dyn_cast<TupleType>(type1.getPointer());
auto rhs = dyn_cast<TupleType>(type2.getPointer());
auto lhsLarger = lhs->getElements().size() >= rhs->getElements().size();
auto larger = lhsLarger ? lhs : rhs;
auto smaller = lhsLarger ? rhs : lhs;
if (lhs && rhs && getContextualTypePurpose() == CTP_Initialization) {
// Match up the tuple type elements, and match any
for (unsigned i = 0; i < larger->getElements().size(); ++i) {
auto largerTy = larger->getElement(i).getType();
if (i < smaller->getElements().size()) {
auto smallerTy = smaller->getElement(i).getType();
if (smallerTy->isTypeVariableOrMember() ||
largerTy->isTypeVariableOrMember())
addConstraint(ConstraintKind::Bind, largerTy, smallerTy,
getConstraintLocator(locator));
} else {
addConstraint(ConstraintKind::Defaultable, largerTy,
getASTContext().TheAnyType,
getConstraintLocator(locator));
}
}
}
return recordFix(fix) ? SolutionKind::Error : SolutionKind::Solved;
}
case FixKind::InsertCall:
case FixKind::RemoveReturn:
case FixKind::AddConformance: