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

Simplify mapParsedParameters/createParam by passing the ParsedParameter

Browse Source 
into it, instead of passing a bunch of pieces into it.  NFC.
This commit is contained in:
Chris Lattner
2016-01-18 08:49:09 -08:00
parent 5f0f26ece2
commit 73ec7006ee
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Parse/ParsePattern.cpp
View File

@@ -308,31 +308,30 @@ mapParsedParameters(Parser &parser,
auto &ctx = parser.Context;
// Local function to create a pattern for a single parameter.
auto createParam = [&](SourceLoc &letVarInOutLoc,
Parser::ParsedParameter::SpecifierKindTy &specifierKind,
Identifier argName, SourceLoc argNameLoc,
Identifier paramName, SourceLoc paramNameLoc,
TypeRepr *type,
const DeclAttributes &Attrs) -> ParamDecl * {
auto createParam = [&](Parser::ParsedParameter &paramInfo,
Identifier argName, SourceLoc argNameLoc,
Identifier paramName, SourceLoc paramNameLoc)
-> ParamDecl * {
auto specifierKind = paramInfo.SpecifierKind;
bool isLet = specifierKind == Parser::ParsedParameter::Let;
auto param = new (ctx) ParamDecl(isLet, argNameLoc, argName,
paramNameLoc, paramName, Type(),
parser.CurDeclContext);
param->getAttrs() = Attrs;
param->getAttrs() = paramInfo.Attrs;
if (argNameLoc.isInvalid() && paramNameLoc.isInvalid())
param->setImplicit();
// If a type was provided, create the typed pattern.
if (type) {
// If a type was provided, create the type for the parameter.
if (auto type = paramInfo.Type) {
// If 'inout' was specified, turn the type into an in-out type.
if (specifierKind == Parser::ParsedParameter::InOut)
type = new (ctx) InOutTypeRepr(type, letVarInOutLoc);
type = new (ctx) InOutTypeRepr(type, paramInfo.LetVarInOutLoc);
param->getTypeLoc() = TypeLoc(type);
} else if (specifierKind == Parser::ParsedParameter::InOut) {
parser.diagnose(letVarInOutLoc, diag::inout_must_have_type);
letVarInOutLoc = SourceLoc();
parser.diagnose(paramInfo.LetVarInOutLoc, diag::inout_must_have_type);
paramInfo.LetVarInOutLoc = SourceLoc();
specifierKind = Parser::ParsedParameter::Let;
}
return param;
@@ -376,10 +375,8 @@ mapParsedParameters(Parser &parser,
paramName = param.SecondName;
// Both names were provided, so pass them in directly.
result = createParam(param.LetVarInOutLoc, param.SpecifierKind,
argName, param.FirstNameLoc,
paramName, param.SecondNameLoc,
param.Type, param.Attrs);
result = createParam(param, argName, param.FirstNameLoc,
paramName, param.SecondNameLoc);
// If the first name is empty and this parameter would not have been
// an API name by default, complain.
@@ -406,10 +403,8 @@ mapParsedParameters(Parser &parser,
argName = param.FirstName;
paramName = param.FirstName;
result = createParam(param.LetVarInOutLoc, param.SpecifierKind,
argName, SourceLoc(),
param.FirstName, param.FirstNameLoc,
param.Type, param.Attrs);
result = createParam(param, argName, SourceLoc(),
param.FirstName, param.FirstNameLoc);
}
// If this parameter had an ellipsis, check whether it's the last parameter.