s/parseStatement/parseStructuralElement/g in the UnwrappedLineParser.

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

diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index 52717e17b999db5da1f2b366954d687baaa81c18..00ca3a53347486116255dc49f32a34e5100f2a9c 100644 (file)
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -112,7 +112,7 @@ bool UnwrappedLineParser::parseLevel(bool HasOpeningBrace) {
       }
       break;
     default:
-      parseStatement();
+      parseStructuralElement();
       break;
     }
   } while (!eof());
@@ -196,7 +196,7 @@ void UnwrappedLineParser::parseComments() {
   }
 }
 
-void UnwrappedLineParser::parseStatement() {
+void UnwrappedLineParser::parseStructuralElement() {
   parseComments();
 
   int TokenNumber = 0;
@@ -306,7 +306,7 @@ void UnwrappedLineParser::parseIfThenElse() {
   } else {
     addUnwrappedLine();
     ++Line.Level;
-    parseStatement();
+    parseStructuralElement();
     --Line.Level;
   }
   if (FormatTok.Tok.is(tok::kw_else)) {
@@ -319,7 +319,7 @@ void UnwrappedLineParser::parseIfThenElse() {
     } else {
       addUnwrappedLine();
       ++Line.Level;
-      parseStatement();
+      parseStructuralElement();
       --Line.Level;
     }
   } else if (NeedsUnwrappedLine) {
@@ -350,7 +350,7 @@ void UnwrappedLineParser::parseForOrWhileLoop() {
   } else {
     addUnwrappedLine();
     ++Line.Level;
-    parseStatement();
+    parseStructuralElement();
     --Line.Level;
   }
 }
@@ -363,7 +363,7 @@ void UnwrappedLineParser::parseDoWhile() {
   } else {
     addUnwrappedLine();
     ++Line.Level;
-    parseStatement();
+    parseStructuralElement();
     --Line.Level;
   }
 
@@ -374,7 +374,7 @@ void UnwrappedLineParser::parseDoWhile() {
   }
 
   nextToken();
-  parseStatement();
+  parseStructuralElement();
 }
 
 void UnwrappedLineParser::parseLabel() {
@@ -410,7 +410,7 @@ void UnwrappedLineParser::parseSwitch() {
   } else {
     addUnwrappedLine();
     Line.Level += (Style.IndentCaseLabels ? 2 : 1);
-    parseStatement();
+    parseStructuralElement();
     Line.Level -= (Style.IndentCaseLabels ? 2 : 1);
   }
 }

diff --git a/lib/Format/UnwrappedLineParser.h b/lib/Format/UnwrappedLineParser.h
index c3adc4c79721f741dc345d3f72a8e36071e8e7ee..27c11020554b7f221b21ba5dace9505158868b4a 100644 (file)
--- a/lib/Format/UnwrappedLineParser.h
+++ b/lib/Format/UnwrappedLineParser.h
@@ -117,7 +117,7 @@ private:
   void parsePPDefine();
   void parsePPUnknown();
   void parseComments();
-  void parseStatement();
+  void parseStructuralElement();
   void parseParens();
   void parseIfThenElse();
   void parseForOrWhileLoop();