As suggested by Chris, use MatchRHSPunctuation instead of manually looking for a...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41321 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Parse/ParseObjc.cpp b/Parse/ParseObjc.cpp
index b1c5366197f8fd28d4230542e0e77cf7af1477b2..3d305668f582eebe2d266150ecff3191c0774fb3 100644 (file)
--- a/Parse/ParseObjc.cpp
+++ b/Parse/ParseObjc.cpp
@@ -677,13 +677,10 @@ Parser::ExprResult Parser::ParseObjCEncodeExpression() {
   
   TypeTy *Ty = ParseTypeName();
   
-  if (Tok.getKind() != tok::r_paren) {
-    Diag(Tok, diag::err_expected_rparen);
-    return true;
-  }
+  SourceLocation RParenLoc = MatchRHSPunctuation(tok::r_paren, LParenLoc);
    
   return Actions.ParseObjCEncodeExpression(EncLoc, LParenLoc, Ty, 
-                                           ConsumeParen());
+                                           RParenLoc);
 }
 
 ///     objc-protocol-expression
@@ -708,12 +705,7 @@ Parser::ExprResult Parser::ParseObjCProtocolExpression()
   // FIXME: Do something with the protocol name
   ConsumeToken();
   
-  if (Tok.getKind() != tok::r_paren) {
-    Diag(Tok, diag::err_expected_rparen);
-    return true;
-  }
-  
-  ConsumeParen();
+  SourceLocation RParenLoc = MatchRHSPunctuation(tok::r_paren, LParenLoc);
 
   // FIXME 
   return 0;