---

yaml
---
r: 348836
b: refs/heads/master
c: 9f26b56
h: refs/heads/master

Author: rintaro

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c022ff23e8e21c1031379efec0f9414d58a58623
+refs/heads/master: 9f26b5615f114afeb8bf34be18ed41aa13ec7512
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/Parse/Parser.h

@@ -899,10 +899,6 @@ class Parser {
   parseMatchingTokenSyntax(tok K, Diag<> ErrorDiag, SourceLoc OtherLoc,
                            bool silenceDiag = false);
 
-  llvm::Optional<ParsedTokenSyntax>
-  parseMatchingTokenSyntax(tok K, SourceLoc &TokLoc, Diag<> ErrorDiag,
-                           SourceLoc OtherLoc);
-
   /// Returns the proper location for a missing right brace, parenthesis, etc.
   SourceLoc getLocForMissingMatchingToken() const;
 
@@ -923,7 +919,6 @@ class Parser {
                          llvm::function_ref<ParserStatus()> callback);
   ParserStatus parseListSyntax(tok RightK, SourceLoc LeftLoc,
                                llvm::Optional<ParsedTokenSyntax> &LastComma,
-                               SourceLoc &RightLoc,
                                llvm::Optional<ParsedTokenSyntax> &Right,
                                llvm::SmallVectorImpl<ParsedSyntax>& Junk,
                                bool AllowSepAfterLast, Diag<> ErrorDiag,

trunk/lib/Parse/ParseType.cpp

@@ -976,11 +976,10 @@ ParsedSyntaxResult<ParsedTypeSyntax> Parser::parseTypeTupleBody() {
 
   Optional<ParsedTokenSyntax> Comma;
 
-  SourceLoc RParenLoc;
   Optional<ParsedTokenSyntax> RParen;
 
   ParserStatus Status =
-      parseListSyntax(tok::r_paren, LParenLoc, Comma, RParenLoc, RParen, Junk,
+      parseListSyntax(tok::r_paren, LParenLoc, Comma, RParen, Junk,
                       false, diag::expected_rparen_tuple_type_list, [&]() {
     Optional<BacktrackingScope> Backtracking;
     SmallVector<ParsedSyntax, 0> LocalJunk;

trunk/lib/Parse/Parser.cpp

@@ -1276,18 +1276,6 @@ Parser::parseMatchingTokenSyntax(tok K, Diag<> ErrorDiag, SourceLoc OtherLoc,
   return makeParserError();
 }
 
-Optional<ParsedTokenSyntax>
-Parser::parseMatchingTokenSyntax(tok K, SourceLoc &TokLoc, Diag<> ErrorDiag,
-                                 SourceLoc OtherLoc) {
-  TokLoc = Tok.getLoc();
-  auto result = parseMatchingTokenSyntax(K, ErrorDiag, OtherLoc);
-  if (result.isNull()) {
-    TokLoc = getLocForMissingMatchingToken();
-    return None;
-  }
-  return result.get();
-}
-
 SourceLoc Parser::getLocForMissingMatchingToken() const {
   // At present, use the same location whether it's an error or whether
   // the matching token is missing.
@@ -1333,7 +1321,6 @@ static SyntaxKind getListElementKind(SyntaxKind ListKind) {
 ParserStatus
 Parser::parseListSyntax(tok RightK, SourceLoc LeftLoc,
                         Optional<ParsedTokenSyntax> &LastComma,
-                        SourceLoc &RightLoc,
                         Optional<ParsedTokenSyntax> &Right,
                         SmallVectorImpl<ParsedSyntax>& Junk,
                         bool AllowSepAfterLast, Diag<> ErrorDiag,
@@ -1343,13 +1330,11 @@ Parser::parseListSyntax(tok RightK, SourceLoc LeftLoc,
   };
 
   if (Tok.is(RightK)) {
-    RightLoc = Tok.getLoc();
     Right = consumeTokenSyntax(RightK);
     return makeParserSuccess();
   }
   if (TokIsStringInterpolationEOF()) {
     Tok.setKind(RightK);
-    RightLoc = Tok.getLoc();
     Right = consumeTokenSyntax();
     return makeParserSuccess();
   }
@@ -1372,7 +1357,6 @@ Parser::parseListSyntax(tok RightK, SourceLoc LeftLoc,
     // Just accept the ")" and build the tuple as we usually do.
     if (TokIsStringInterpolationEOF()) {
       Tok.setKind(RightK);
-      RightLoc = Tok.getLoc();
       Right = consumeTokenSyntax();
       return Status;
     }
@@ -1409,20 +1393,10 @@ Parser::parseListSyntax(tok RightK, SourceLoc LeftLoc,
     Status.setIsParseError();
   }
 
-  if (Status.isError()) {
-    // If we've already got errors, don't emit missing RightK diagnostics.
-    if (Tok.is(RightK)) {
-      RightLoc = Tok.getLoc();
-      Right = consumeTokenSyntax(RightK);
-    } else {
-      RightLoc = getLocForMissingMatchingToken();
-    }
-  } else {
-    Right = parseMatchingTokenSyntax(RightK, RightLoc, ErrorDiag, LeftLoc);
-    if (!Right)
-      Status.setIsParseError();
-  }
-
+  auto RightResult = parseMatchingTokenSyntax(RightK, ErrorDiag, LeftLoc,
+                                              Status.isError());
+  Status |= RightResult.getStatus();
+  Right = RightResult.getOrNull();
   return Status;
 }