From: Daniel Jasper <djasper@google.com>
Date: Sun, 31 May 2015 08:51:54 +0000 (+0000)
Subject: clang-format: NFC. Cleanup after r237895.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01b2e8ebeaf38217e4a535dd470df336f1892276;p=clang

clang-format: NFC. Cleanup after r237895.

Specifically adhere to LLVM Coding Standards (no 'else' after
return/break/continue) and remove yet another implementation of
paren counting. We already have enough of those in the
UnwrappedLineParser.

No functional changes intended.

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

diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index 939528fbff..662606cf4c 100644
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -887,9 +887,8 @@ void UnwrappedLineParser::parseStructuralElement() {
       // followed by a curly.
       if (FormatTok->is(TT_JsFatArrow)) {
         nextToken();
-        if (FormatTok->is(tok::l_brace)) {
+        if (FormatTok->is(tok::l_brace))
           parseChildBlock();
-        }
         break;
       }
 
@@ -1019,7 +1018,7 @@ void UnwrappedLineParser::tryToParseJSFunction() {
     return;
 
   // Parse formal parameter list.
-  parseBalanced(tok::l_paren, tok::r_paren);
+  parseParens();
 
   if (FormatTok->is(tok::colon)) {
     // Parse a type definition.
@@ -1027,34 +1026,16 @@ void UnwrappedLineParser::tryToParseJSFunction() {
 
     // Eat the type declaration. For braced inline object types, balance braces,
     // otherwise just parse until finding an l_brace for the function body.
-    if (FormatTok->is(tok::l_brace)) {
-      parseBalanced(tok::l_brace, tok::r_brace);
-    } else {
-      while(FormatTok->isNot(tok::l_brace) && !eof()) {
+    if (FormatTok->is(tok::l_brace))
+      tryToParseBracedList();
+    else
+      while(FormatTok->isNot(tok::l_brace) && !eof())
         nextToken();
-      }
-    }
   }
 
   parseChildBlock();
 }
 
-void UnwrappedLineParser::parseBalanced(tok::TokenKind OpenKind,
-                                        tok::TokenKind CloseKind) {
-  assert(FormatTok->is(OpenKind));
-  nextToken();
-  int Depth = 1;
-  while (Depth > 0 && !eof()) {
-    // Parse the formal parameter list.
-    if (FormatTok->is(OpenKind)) {
-      ++Depth;
-    } else if (FormatTok->is(CloseKind)) {
-      --Depth;
-    }
-    nextToken();
-  }
-}
-
 bool UnwrappedLineParser::tryToParseBracedList() {
   if (FormatTok->BlockKind == BK_Unknown)
     calculateBraceTypes();
@@ -1076,7 +1057,8 @@ bool UnwrappedLineParser::parseBracedList(bool ContinueOnSemicolons) {
       if (FormatTok->is(Keywords.kw_function)) {
         tryToParseJSFunction();
         continue;
-      } else if (FormatTok->is(TT_JsFatArrow)) {
+      }
+      if (FormatTok->is(TT_JsFatArrow)) {
         nextToken();
         // Fat arrows can be followed by simple expressions or by child blocks
         // in curly braces.
diff --git a/lib/Format/UnwrappedLineParser.h b/lib/Format/UnwrappedLineParser.h
index 6a6e56fea0..c2fa029576 100644
--- a/lib/Format/UnwrappedLineParser.h
+++ b/lib/Format/UnwrappedLineParser.h
@@ -107,11 +107,6 @@ private:
   bool tryToParseLambda();
   bool tryToParseLambdaIntroducer();
   void tryToParseJSFunction();
-  /// \brief Parses tokens until encountering the CloseKind token, but balances
-  /// tokens when encountering more OpenKind tokens. Useful for e.g. parsing a
-  /// curly brace delimited block that can contain nested blocks.
-  /// The parser must be positioned on a token of OpenKind.
-  void parseBalanced(tok::TokenKind OpenKind, tok::TokenKind CloseKind);
   void addUnwrappedLine();
   bool eof() const;
   void nextToken();