Enum formatting implementation

Reviewers: djasper, klimek

Reviewed By: klimek

CC: cfe-commits

Differential Revision: http://llvm-reviews.chandlerc.com/D161

llvm-svn: 169272

clang/lib/Format/UnwrappedLineParser.cpp

@@ -99,29 +99,11 @@ void UnwrappedLineParser::parseComment() {
 }
 
 void UnwrappedLineParser::parseStatement() {
-  if (FormatTok.Tok.is(tok::kw_public) || FormatTok.Tok.is(tok::kw_protected) ||
-      FormatTok.Tok.is(tok::kw_private)) {
-    parseAccessSpecifier();
-    return;
-  }
-  if (FormatTok.Tok.is(tok::kw_enum)) {
-    parseEnum();
-    return;
-  }
-  int TokenNumber = 0;
-  do {
-    ++TokenNumber;
   switch (FormatTok.Tok.getKind()) {
-    case tok::semi:
+  case tok::kw_public:
-      nextToken();
+  case tok::kw_protected:
-      addUnwrappedLine();
+  case tok::kw_private:
-      return;
+    parseAccessSpecifier();
-    case tok::l_paren:
-      parseParens();
-      break;
-    case tok::l_brace:
-      parseBlock();
-      addUnwrappedLine();
     return;
   case tok::kw_if:
     parseIfThenElse();
@@ -139,16 +121,37 @@ void UnwrappedLineParser::parseStatement() {
   case tok::kw_case:
     parseCaseLabel();
     return;
-    case tok::raw_identifier:
-      nextToken();
-      break;
   default:
+    break;
+  }
+  int TokenNumber = 0;
+  do {
+    ++TokenNumber;
+    switch (FormatTok.Tok.getKind()) {
+    case tok::kw_enum:
+      parseEnum();
+      return;
+    case tok::semi:
+      nextToken();
+      addUnwrappedLine();
+      return;
+    case tok::l_paren:
+      parseParens();
+      break;
+    case tok::l_brace:
+      parseBlock();
+      addUnwrappedLine();
+      return;
+    case tok::identifier:
       nextToken();
       if (TokenNumber == 1 && FormatTok.Tok.is(tok::colon)) {
         parseLabel();
         return;
       }
       break;
+    default:
+      nextToken();
+      break;
     }
   } while (!eof());
 }
@@ -265,12 +268,35 @@ void UnwrappedLineParser::parseAccessSpecifier() {
 }
 
 void UnwrappedLineParser::parseEnum() {
+  bool HasContents = false;
   do {
+    switch (FormatTok.Tok.getKind()) {
+    case tok::l_brace:
       nextToken();
-    if (FormatTok.Tok.is(tok::semi)) {
+      addUnwrappedLine();
+      ++Line.Level;
+      break;
+    case tok::l_paren:
+      parseParens();
+      break;
+    case tok::comma:
+      nextToken();
+      addUnwrappedLine();
+      break;
+    case tok::r_brace:
+      if (HasContents)
+        addUnwrappedLine();
+      --Line.Level;
+      nextToken();
+      break;
+    case tok::semi:
       nextToken();
       addUnwrappedLine();
       return;
+    default:
+      HasContents = true;
+      nextToken();
+      break;
     }
   } while (!eof());
 }

clang/unittests/Format/FormatTest.cpp

@@ -244,6 +244,21 @@ TEST_F(FormatTest, DoWhile) {
                "while (something());");
 }
 
+TEST_F(FormatTest, Enum) {
+  verifyFormat("enum {\n"
+               "  Zero,\n"
+               "  One = 1,\n"
+               "  Two = One + 1,\n"
+               "  Three = (One + Two),\n"
+               "  Four = (Zero && (One ^ Two)) | (One << Two),\n"
+               "  Five = (One, Two, Three, Four, 5)\n"
+               "};");
+  verifyFormat("enum Enum {\n"
+               "};");
+  verifyFormat("enum {\n"
+               "};");
+}
+
 TEST_F(FormatTest, BreaksDesireably) {
   verifyFormat("if (aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaa) ||\n"
                "    aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaa) ||\n"