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

[TypeChecker] Remove redundant invalid label handling logic from matchCallArguments

Browse Source 
Remove leftover redundant empty argument/parameter label matching logic
and move it under `allowFixes` flag while trying to claim the argument.
This commit is contained in:
Pavel Yaskevich
2018-07-22 22:08:25 -07:00
parent 91e330c289
commit 274ce8a6b0
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Sema/CSSimplify.cpp
View File

@@ -241,15 +241,6 @@ matchCallArguments(ArrayRef<AnyFunctionType::Param> args,
return claim(name, i);
}
if (nextArgIdx != numArgs && ignoreNameMismatch) {
auto argLabel = args[nextArgIdx].getLabel();
// Claim this argument if we are asked to ignore labeling failure,
// only if argument doesn't have a label when parameter expected
// it to, or vice versa.
if (name.empty() || argLabel.empty())
return claim(name, nextArgIdx);
}
// If we're not supposed to attempt any fixes, we're done.
if (!allowFixes)
return None;
@@ -260,22 +251,27 @@ matchCallArguments(ArrayRef<AnyFunctionType::Param> args,
// out the issue.
// - The argument might be unnamed, in which case we try to fix the
// problem by adding the name.
// - The argument might have extraneous label, in which case we try to
// fix the problem by removing such label.
// - The keyword argument might be a typo for an actual argument name, in
// which case we should find the closest match to correct to.
// Missing or extraneous label.
if (nextArgIdx != numArgs && ignoreNameMismatch) {
auto argLabel = args[nextArgIdx].getLabel();
// Claim this argument if we are asked to ignore labeling failure,
// only if argument doesn't have a label when parameter expected
// it to, or vice versa.
if (name.empty() || argLabel.empty())
return claim(name, nextArgIdx);
}
// Redundant keyword arguments.
if (claimedWithSameName) {
// FIXME: We can provide better diagnostics here.
return None;
}
// Missing a keyword argument name.
if (nextArgIdx != numArgs && args[nextArgIdx].getLabel().empty() &&
ignoreNameMismatch) {
// Claim the next argument.
return claim(name, nextArgIdx);
}
// Typo correction is handled in a later pass.
return None;
};
@@ -291,7 +287,7 @@ matchCallArguments(ArrayRef<AnyFunctionType::Param> args,
// Claim the next argument with the name of this parameter.
auto claimed = claimNextNamed(param.getLabel(), ignoreNameMismatch);
// If there was no such argument, leave the argument unf
// If there was no such argument, leave the parameter unfulfilled.
if (!claimed) {
haveUnfulfilledParams = true;
return;