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

[NFC] Rename argNumber to avoid confusion with numArgs.

Browse Source
This commit is contained in:
Amritpan Kaur
2021-08-31 09:28:52 -07:00
parent 5d2c887b97
commit 9a4572e17f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Sema/CSSimplify.cpp
View File

@@ -282,19 +282,19 @@ static bool matchCallArgumentsImpl(
// requiring further checking at the end.
bool potentiallyOutOfOrder = false;
// Local function that claims the argument at \c argNumber, returning the
// Local function that claims the argument at \c argIdx, returning the
// index of the claimed argument. This is primarily a helper for
// \c claimNextNamed.
auto claim = [&](Identifier expectedName, unsigned argNumber,
auto claim = [&](Identifier expectedName, unsigned argIdx,
bool ignoreNameClash = false) -> unsigned {
// Make sure we can claim this argument.
assert(argNumber != numArgs && "Must have a valid index to claim");
assert(!claimedArgs[argNumber] && "Argument already claimed");
assert(argIdx != numArgs && "Must have a valid index to claim");
assert(!claimedArgs[argIdx] && "Argument already claimed");
auto argLabel = args[argNumber].getLabel();
auto argLabel = args[argIdx].getLabel();
if (!actualArgNames.empty()) {
// We're recording argument names; record this one.
actualArgNames[argNumber] = expectedName;
actualArgNames[argIdx] = expectedName;
} else if (argLabel != expectedName && !ignoreNameClash &&
!(argLabel.str().startswith("$") &&
argLabel.str().drop_front() == expectedName.str())) {
@@ -313,12 +313,12 @@ static bool matchCallArgumentsImpl(
}
// Record this argument name.
actualArgNames[argNumber] = expectedName;
actualArgNames[argIdx] = expectedName;
}
claimedArgs[argNumber] = true;
claimedArgs[argIdx] = true;
++numClaimedArgs;
return argNumber;
return argIdx;
};
// Local function that skips over any claimed arguments.