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

Eliminate the notion of "selector-style" declarations in the AST.

Browse Source 
We still parse them, but the distinction is no longer meaningful
beyond the parsing stage.



Swift SVN r16445
This commit is contained in:
Doug Gregor
2014-04-17 05:42:58 +00:00
parent 8e597cc695
commit ea647624e3
12 changed files with 15 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Parse/ParsePattern.cpp
View File

@@ -645,11 +645,10 @@ mapParsedParameters(Parser &parser,
ParserStatus
Parser::parseFunctionArguments(SmallVectorImpl<Identifier> &NamePieces,
SmallVectorImpl<Pattern *> &BodyPatterns,
DefaultArgumentInfo &DefaultArgs,
bool &HasSelectorStyleSignature) {
DefaultArgumentInfo &DefaultArgs) {
// Figure out of we have a tuple-like declaration rather than a selector-style
// declaration.
HasSelectorStyleSignature = false;
bool HasSelectorStyleSignature = false;
{
BacktrackingScope BS(*this);
consumeToken(tok::l_paren);
@@ -715,10 +714,7 @@ Parser::parseFunctionSignature(Identifier SimpleName,
DeclName &FullName,
SmallVectorImpl<Pattern *> &bodyPatterns,
DefaultArgumentInfo &defaultArgs,
TypeRepr *&retType,
bool &HasSelectorStyleSignature) {
HasSelectorStyleSignature = false;
TypeRepr *&retType) {
SmallVector<Identifier, 4> NamePieces;
NamePieces.push_back(SimpleName);
FullName = SimpleName;
@@ -726,8 +722,7 @@ Parser::parseFunctionSignature(Identifier SimpleName,
ParserStatus Status;
// We force first type of a func declaration to be a tuple for consistency.
if (Tok.is(tok::l_paren)) {
Status = parseFunctionArguments(NamePieces, bodyPatterns,
defaultArgs, HasSelectorStyleSignature);
Status = parseFunctionArguments(NamePieces, bodyPatterns, defaultArgs);
FullName = DeclName(Context, SimpleName,
llvm::makeArrayRef(NamePieces.begin() + 1,
NamePieces.end()));
@@ -778,10 +773,7 @@ Parser::parseFunctionSignature(Identifier SimpleName,
ParserStatus
Parser::parseConstructorArguments(DeclName &FullName, Pattern *&BodyPattern,
DefaultArgumentInfo &DefaultArgs,
bool &HasSelectorStyleSignature) {
HasSelectorStyleSignature = false;
DefaultArgumentInfo &DefaultArgs) {
// It's just a pattern. Parse it.
if (Tok.is(tok::l_paren)) {
SmallVector<ParsedParameter, 4> params;
@@ -818,10 +810,6 @@ Parser::parseConstructorArguments(DeclName &FullName, Pattern *&BodyPattern,
return makeParserError();
}
// We have the start of a binding name, so this is a selector-style
// declaration.
HasSelectorStyleSignature = true;
// This is not a parenthesis, but we should provide a reasonable source range
// for parameters.
SourceLoc LParenLoc = Tok.getLoc();