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

Merge remote-tracking branch 'origin/master' into master-rebranch

Browse Source
This commit is contained in:
swift-ci
2019-09-23 11:04:16 -07:00
parent ae6b193aeb d6c92dcfca
commit 9d28343c96
12 changed files with 226 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/swift/Parse/Parser.h
View File

@@ -876,7 +876,7 @@ public:
///
/// If the input is malformed, this emits the specified error diagnostic.
bool parseToken(tok K, SourceLoc &TokLoc, const Diagnostic &D);
llvm::Optional<ParsedTokenSyntax> parseTokenSyntax(tok K,
llvm::Optional<ParsedTokenSyntax> parseTokenSyntax(tok K, SourceLoc &TokLoc,
const Diagnostic &D);
template<typename ...DiagArgTypes, typename ...ArgTypes>
@@ -896,7 +896,8 @@ public:
SourceLoc OtherLoc);
llvm::Optional<ParsedTokenSyntax>
parseMatchingTokenSyntax(tok K, Diag<> ErrorDiag, SourceLoc OtherLoc);
parseMatchingTokenSyntax(tok K, SourceLoc &TokLoc, Diag<> ErrorDiag,
SourceLoc OtherLoc);
/// Returns the proper location for a missing right brace, parenthesis, etc.
SourceLoc getLocForMissingMatchingToken() const;