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

When we have selector-style syntax for functions, make the argument patterns implicit.

Browse Source 
Argument patterns create pseudo-named patterns, so make them implicit and ignore them when scanning for explicit source information.
Also make sure that the clang importer sets the HasSelectorStyleSignature bit appropriately.

Swift SVN r8803
This commit is contained in:
Argyrios Kyrtzidis
2013-10-01 15:37:46 +00:00
parent 7205b7df0b
commit 097d9a0d0e
4 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Parse/ParsePattern.cpp
View File

@@ -87,11 +87,13 @@ parseSelectorArgument(Parser &P,
assert(ArgPatternRes.isNonNull() &&
"selector argument did not start with an identifier!");
Pattern *ArgPattern = ArgPatternRes.get();
ArgPattern->setImplicit();
// Check that a selector name isn't used multiple times, which would
// lead to the function type having multiple arguments with the same name.
if (NamedPattern *name = dyn_cast<NamedPattern>(ArgPattern)) {
VarDecl *decl = name->getDecl();
decl->setImplicit();
StringRef id = decl->getName().str();
auto prevName = selectorNames.find(id);
if (prevName != selectorNames.end()) {
@@ -132,7 +134,8 @@ parseSelectorArgument(Parser &P,
recoverFromBadSelectorArgument(P);
}
ArgPattern = new (P.Context) TypedPattern(ArgPattern, type.get());
ArgPattern = new (P.Context) TypedPattern(ArgPattern, type.get(),
/*Implicit=*/true);
BodyPattern = new (P.Context) TypedPattern(BodyPattern, type.get());
if (Status.isError())
return Status;
@@ -176,9 +179,10 @@ static Pattern *getFirstSelectorPattern(ASTContext &Context,
const Pattern *argPattern,
SourceLoc loc)
{
Pattern *pattern = new (Context) AnyPattern(loc);
Pattern *pattern = new (Context) AnyPattern(loc, /*Implicit=*/true);
if (auto typed = dyn_cast<TypedPattern>(argPattern)) {
pattern = new (Context) TypedPattern(pattern, typed->getTypeLoc());
pattern = new (Context) TypedPattern(pattern, typed->getTypeLoc(),
/*Implicit=*/true);
}
return pattern;
}
@@ -256,7 +260,8 @@ parseSelectorFunctionArguments(Parser &P,
}
ArgPatterns.push_back(
TuplePattern::create(P.Context, LParenLoc, ArgElts, RParenLoc));
TuplePattern::create(P.Context, LParenLoc, ArgElts, RParenLoc,
/*hasVarArg=*/false,SourceLoc(), /*Implicit=*/true));
BodyPatterns.push_back(
TuplePattern::create(P.Context, LParenLoc, BodyElts, RParenLoc));
return Status;