averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34620 from AnthonyLatsis/parse-misc

Browse Source 
Parse: Only diagnose dollar-prefixed identifiers that are Swift declarations
This commit is contained in:
Anthony Latsis
2020-12-04 09:09:45 +03:00
committed by GitHub
parent 41f74e48d5 47ce1529f0
commit 413352b77c
10 changed files with 119 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Parse/ParsePattern.cpp
View File

@@ -975,7 +975,7 @@ ParserResult<Pattern> Parser::parsePattern() {
case tok::identifier: {
PatternCtx.setCreateSyntax(SyntaxKind::IdentifierPattern);
Identifier name;
SourceLoc loc = consumeIdentifier(&name);
SourceLoc loc = consumeIdentifier(name, /*diagnoseDollarPrefix=*/true);
if (Tok.isIdentifierOrUnderscore() && !Tok.isContextualDeclKeyword())
diagnoseConsecutiveIDs(name.str(), loc,
introducer == VarDecl::Introducer::Let
@@ -1054,7 +1054,7 @@ Parser::parsePatternTupleElement() {
// If the tuple element has a label, parse it.
if (Tok.is(tok::identifier) && peekToken().is(tok::colon)) {
LabelLoc = consumeIdentifier(&Label);
LabelLoc = consumeIdentifier(Label, /*diagnoseDollarPrefix=*/true);
consumeToken(tok::colon);
}