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

[nfc] allow ErrorTypeRepr to store a ZeroArgDiagnostic

Browse Source 
There are sometimes parsing stuations where we don't want to
emit a parsing error, because of feature guarding. For
example, if a Feature involves new syntax for a type, we
must be able to parse both the true and false sides of an
ifdef guarding that new syntax based on a Feature flag.
This commit is contained in:
Kavon Farvardin
2023-11-12 21:54:55 -08:00
parent b598baf7f8
commit b55c4f1fc9
10 changed files with 58 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Parse/ParseGeneric.cpp
View File

@@ -339,7 +339,7 @@ ParserStatus Parser::parseGenericWhereClause(
ParserResult<TypeRepr> Protocol = parseType();
Status |= Protocol;
if (Protocol.isNull())
Protocol = makeParserResult(new (Context) ErrorTypeRepr(PreviousLoc));
Protocol = makeParserResult(ErrorTypeRepr::create(Context, PreviousLoc));
// Add the requirement.
Requirements.push_back(RequirementRepr::getTypeConstraint(
@@ -358,7 +358,7 @@ ParserStatus Parser::parseGenericWhereClause(
ParserResult<TypeRepr> SecondType = parseType();
Status |= SecondType;
if (SecondType.isNull())
SecondType = makeParserResult(new (Context) ErrorTypeRepr(PreviousLoc));
SecondType = makeParserResult(ErrorTypeRepr::create(Context, PreviousLoc));
// Add the requirement
if (FirstType.hasCodeCompletion()) {
@@ -373,7 +373,7 @@ ParserStatus Parser::parseGenericWhereClause(
// completion token in the TypeRepr.
Requirements.push_back(RequirementRepr::getTypeConstraint(
FirstType.get(), EqualLoc,
new (Context) ErrorTypeRepr(SecondType.get()->getLoc()),
ErrorTypeRepr::create(Context, SecondType.get()->getLoc()),
isRequirementExpansion));
} else {
Requirements.push_back(RequirementRepr::getSameType(
@@ -383,7 +383,7 @@ ParserStatus Parser::parseGenericWhereClause(
} else if (FirstType.hasCodeCompletion()) {
// Recover by adding dummy constraint.
Requirements.push_back(RequirementRepr::getTypeConstraint(
FirstType.get(), PreviousLoc, new (Context) ErrorTypeRepr(PreviousLoc),
FirstType.get(), PreviousLoc, ErrorTypeRepr::create(Context, PreviousLoc),
isRequirementExpansion));
} else {
diagnose(Tok, diag::expected_requirement_delim);