<div dir="ltr">On Mon, Sep 2, 2013 at 10:26 AM, Daniel Jasper <span dir="ltr"><<a href="mailto:djasper@google.com" target="_blank">djasper@google.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Mon Sep  2 03:26:29 2013<br>
New Revision: 189743<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=189743&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=189743&view=rev</a><br>
Log:<br>
clang-format: Fix case-indentation in macros.<br>
<br>
Before:<br>
  #define OPERATION_CASE(name)           \<br>
    case OP_name:                        \<br>
    return operations::Operation##name<br>
<br>
After:<br>
  #define OPERATION_CASE(name)           \<br>
    case OP_name:                        \<br>
      return operations::Operation##name<br>
<br>
Modified:<br>
    cfe/trunk/lib/Format/UnwrappedLineParser.cpp<br>
    cfe/trunk/unittests/Format/FormatTest.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/UnwrappedLineParser.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=189743&r1=189742&r2=189743&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=189743&r1=189742&r2=189743&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Format/UnwrappedLineParser.cpp (original)<br>
+++ cfe/trunk/lib/Format/UnwrappedLineParser.cpp Mon Sep  2 03:26:29 2013<br>
@@ -235,8 +235,9 @@ void UnwrappedLineParser::parseLevel(boo<br>
       break;<br>
     case tok::kw_default:<br>
     case tok::kw_case:<br>
-      if (!SwitchLabelEncountered)<br>
-        Line->Level += Style.IndentCaseLabels;<br>
+      if (!SwitchLabelEncountered &&<br>
+          (Style.IndentCaseLabels || (Line->InPPDirective && Line->Level == 1)))<br></blockquote><div><br></div><div>I don't really understand why:</div><div>a) level == 1 (instead of 0); I assume Level always starts with 1 in PPDirectives?</div>
<div>b) why we want to additionally indent only if we're on the outermost level</div><div><br></div><div>A comment would be great :)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

+        ++Line->Level;<br>
       SwitchLabelEncountered = true;<br>
       parseStructuralElement();<br>
       break;<br>
@@ -864,8 +865,6 @@ void UnwrappedLineParser::parseDoWhile()<br>
 }<br>
<br>
 void UnwrappedLineParser::parseLabel() {<br>
-  if (FormatTok->Tok.isNot(tok::colon))<br>
-    return;<br>
   nextToken();<br>
   unsigned OldLineLevel = Line->Level;<br>
   if (Line->Level > 1 || (!Line->InPPDirective && Line->Level > 0))<br>
<br>
Modified: cfe/trunk/unittests/Format/FormatTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=189743&r1=189742&r2=189743&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=189743&r1=189742&r2=189743&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Mon Sep  2 03:26:29 2013<br>
@@ -525,6 +525,10 @@ TEST_F(FormatTest, FormatsSwitchStatemen<br>
                "  case a:          \\\n"<br>
                "    foo = b;       \\\n"<br>
                "  }", getLLVMStyleWithColumns(20));<br>
+  verifyFormat("#define OPERATION_CASE(name)           \\\n"<br>
+               "  case OP_name:                        \\\n"<br>
+               "    return operations::Operation##name\n",<br>
+               getLLVMStyleWithColumns(40));<br>
<br>
   verifyGoogleFormat("switch (x) {\n"<br>
                      "  case 1:\n"<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>