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

Merge remote-tracking branch 'origin' into swift-3-api-guidelines

Browse Source
This commit is contained in:
Max Moiseev
2015-12-23 10:28:04 -08:00
parent a7339e67ac ff74e8e81c
commit 200be71583
287 changed files with 4144 additions and 2603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Sema/CodeSynthesis.cpp
View File

@@ -448,10 +448,7 @@ static Expr *buildTupleExpr(ASTContext &ctx, ArrayRef<Expr*> args) {
static Expr *buildTupleForwardingRefExpr(ASTContext &ctx,
ArrayRef<TuplePatternElt> params,
ArrayRef<TupleTypeElt> formalIndexTypes) {
assert(params.size() == formalIndexTypes.size());
ArrayRef<TuplePatternElt> params) {
SmallVector<Identifier, 4> labels;
SmallVector<SourceLoc, 4> labelLocs;
SmallVector<Expr *, 4> args;
@@ -459,7 +456,12 @@ static Expr *buildTupleForwardingRefExpr(ASTContext &ctx,
for (unsigned i = 0, e = params.size(); i != e; ++i) {
const Pattern *param = params[i].getPattern();
args.push_back(param->buildForwardingRefExpr(ctx));
labels.push_back(formalIndexTypes[i].getName());
// If this parameter pattern has a name, extract it.
if (auto *np =dyn_cast<NamedPattern>(param->getSemanticsProvidingPattern()))
labels.push_back(np->getBoundName());
else
labels.push_back(Identifier());
labelLocs.push_back(SourceLoc());
}
@@ -497,14 +499,7 @@ static Expr *buildSubscriptIndexReference(ASTContext &ctx, FuncDecl *accessor) {
if (accessorKind == AccessorKind::IsMaterializeForSet)
params = params.slice(1);
// Look for formal subscript labels.
auto subscript = cast<SubscriptDecl>(accessor->getAccessorStorageDecl());
auto indexType = subscript->getIndicesType();
if (auto indexTuple = indexType->getAs<TupleType>()) {
return buildTupleForwardingRefExpr(ctx, params, indexTuple->getElements());
} else {
return buildTupleForwardingRefExpr(ctx, params, TupleTypeElt(indexType));
}
return buildTupleForwardingRefExpr(ctx, params);
}
enum class SelfAccessKind {