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

Reimplement constraint application for strict keyword arguments.

Browse Source 
Swift SVN r17647
This commit is contained in:
Doug Gregor
2014-05-07 22:36:47 +00:00
parent fd0a78b301
commit 3bd0d6976f
3 changed files with 307 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Sema/CSSimplify.cpp
View File

@@ -37,6 +37,10 @@ void MatchCallArgumentListener::outOfOrderArgument(unsigned argIdx,
unsigned prevArgIdx) {
}
bool MatchCallArgumentListener::relabelArguments(ArrayRef<Identifier> newNames){
return true;
}
/// Produce a score (smaller is better) comparing a parameter name and
/// potentially-typod argument name.
///
@@ -111,12 +115,8 @@ static bool paramIsTrailingClosure(ArrayRef<TupleTypeElt> paramTuple,
return true;
};
/// Compute an argument or parameter type into an array of tuple type elements.
///
/// \param type The type to decompose.
/// \param scalar A \c TupleTypeElt to be used for scratch space for scalars.
static ArrayRef<TupleTypeElt> decomposeArgParamType(Type type,
TupleTypeElt &scalar) {
ArrayRef<TupleTypeElt> constraints::decomposeArgParamType(Type type,
TupleTypeElt &scalar){
switch (type->getKind()) {
case TypeKind::Tuple:
return cast<TupleType>(type.getPointer())->getFields();
@@ -467,6 +467,7 @@ bool constraints::matchCallArguments(
// FIXME: If we had the actual parameters and knew the body names, those
// matches would be best.
potentiallyOutOfOrder = true;
}
// If we have any unfulfilled parameters, check them now.
@@ -501,7 +502,8 @@ bool constraints::matchCallArguments(
argumentBindings[argIdx] = paramIdx;
}
// Walk through the arguments, det
// Walk through the arguments, determining if any were bound to parameters
// out-of-order where it is not permitted.
unsigned prevParamIdx = argumentBindings[0];
for (unsigned argIdx = 1; argIdx != numArgs; ++argIdx) {
unsigned paramIdx = argumentBindings[argIdx];
@@ -523,10 +525,7 @@ bool constraints::matchCallArguments(
param.getDefaultArgKind() != DefaultArgumentKind::None)
continue;
unsigned prevArgIdx = parameterBindings[i].front();
if (prevArgIdx == argIdx)
prevArgIdx = parameterBindings[i+1].front();
unsigned prevArgIdx = parameterBindings[prevParamIdx].front();
listener.outOfOrderArgument(argIdx, prevArgIdx);
return true;
}