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

Parse: Remove the fixit for curried parameter lists, its wrong anyway

Browse Source 
Fixes <rdar://problem/45274153>.
This commit is contained in:
Slava Pestov
2018-10-26 20:58:13 -04:00
parent 80419c711d
commit 3265bffa8f
3 changed files with 13 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/Parse/ParsePattern.cpp
View File

@@ -665,15 +665,9 @@ Parser::parseSingleParameterClause(ParameterContextKind paramContext,
}
/// Parse function arguments.
/// func-arguments:
/// curried-arguments | selector-arguments
/// curried-arguments:
/// parameter-clause+
/// selector-arguments:
/// '(' selector-element ')' (identifier '(' selector-element ')')+
/// selector-element:
/// identifier '(' pattern-atom (':' type)? ('=' expr)? ')'
///
/// Emits a special diagnostic if there are multiple parameter lists,
/// but otherwise is identical to parseSingleParameterClause().
ParserStatus
Parser::parseFunctionArguments(SmallVectorImpl<Identifier> &NamePieces,
ParameterList *&BodyParams,
@@ -687,40 +681,18 @@ Parser::parseFunctionArguments(SmallVectorImpl<Identifier> &NamePieces,
status |= FirstParameterClause;
BodyParams = FirstParameterClause.get();
SmallVector<ParameterList *, 2> AllParams;
AllParams.push_back(BodyParams);
bool MultipleParameterLists = false;
while (Tok.is(tok::l_paren)) {
MultipleParameterLists = true;
auto CurriedParameterClause
= parseSingleParameterClause(ParameterContextKind::Curried);
status |= CurriedParameterClause;
AllParams.push_back(CurriedParameterClause.get());
}
// If the decl uses currying syntax, complain that that syntax has gone away.
if (AllParams.size() > 1) {
SourceRange allPatternsRange(
BodyParams->getStartLoc(),
AllParams.back()->getEndLoc());
auto diag = diagnose(allPatternsRange.Start,
diag::parameter_curry_syntax_removed);
diag.highlight(allPatternsRange);
bool seenArg = false;
for (unsigned i = 0; i < AllParams.size() - 1; i++) {
// Replace ")(" with ", ", so "(x: Int)(y: Int)" becomes
// "(x: Int, y: Int)". But just delete them if they're not actually
// separating any arguments, e.g. in "()(y: Int)".
StringRef replacement(", ");
auto *leftParamList = AllParams[i];
auto *rightParamList = AllParams[i + 1];
if (leftParamList->size() != 0)
seenArg = true;
if (!seenArg || rightParamList->size() == 0)
replacement = "";
diag.fixItReplace(SourceRange(leftParamList->getEndLoc(),
rightParamList->getStartLoc()),
replacement);
}
if (MultipleParameterLists) {
diagnose(BodyParams->getStartLoc(),
diag::parameter_curry_syntax_removed);
}
return status;