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

AST: Don't attach trailing where clause requirements to the GenericParamList

Browse Source 
Previously we had two representations for the 'where' clause of a
parsed declaration; if the declaration had generic parameters of
its own, we would store them in the GenericParamList, otherwise
we would store them separately in a TrailingWhereClause instance.

Since the latter is more general and also used for protocols and
extensions, let's just use it for everything and simplify
GenericParamList in the process.
This commit is contained in:
Slava Pestov
2020-07-24 23:54:22 -04:00
parent daf65ce923
commit c46eb22fcd
14 changed files with 84 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Parse/ParseGeneric.cpp
View File

@@ -389,13 +389,9 @@ ParserStatus Parser::parseGenericWhereClause(
}
/// Parse a free-standing where clause attached to a declaration,
/// adding it to a generic parameter list, if any, or to the given
/// generic context representing the declaration.
/// Parse a free-standing where clause attached to a declaration.
ParserStatus Parser::
parseFreestandingGenericWhereClause(GenericContext *genCtx,
GenericParamList *&genericParams,
ParseDeclOptions flags) {
parseFreestandingGenericWhereClause(GenericContext *genCtx) {
assert(Tok.is(tok::kw_where) && "Shouldn't call this without a where");
SmallVector<RequirementRepr, 4> Requirements;
@@ -406,20 +402,8 @@ parseFreestandingGenericWhereClause(GenericContext *genCtx,
if (result.shouldStopParsing() || Requirements.empty())
return result;
if (genericParams) {
// Push the generic arguments back into a local scope so that references will
// find them.
Scope S(this, ScopeKind::Generics);
for (auto pd : genericParams->getParams())
addToScope(pd);
genericParams->addTrailingWhereClause(Context, WhereLoc, Requirements);
} else {
// A where clause against outer generic parameters.
genCtx->setTrailingWhereClause(
TrailingWhereClause::create(Context, WhereLoc, Requirements));
}
genCtx->setTrailingWhereClause(
TrailingWhereClause::create(Context, WhereLoc, Requirements));
return ParserStatus();
}