[cfe-commits] r169390 - /cfe/trunk/lib/Format/Format.cpp

[Daniel Jasper]

Author: djasper
Date: Wed Dec  5 10:24:48 2012
New Revision: 169390

URL: http://llvm.org/viewvc/llvm-project?rev=169390&view=rev
Log:
Remove bad and useless enum to bool conversion.

Modified:
    cfe/trunk/lib/Format/Format.cpp

Modified: cfe/trunk/lib/Format/Format.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- cfe/trunk/lib/Format/Format.cpp (original)
+++ cfe/trunk/lib/Format/Format.cpp Wed Dec  5 10:24:48 2012
@@ -509,11 +509,8 @@
           canBreakBetween(Line.Tokens[i - 1], Line.Tokens[i]);
 
       if (Line.Tokens[i].Tok.is(tok::colon)) {
-        if (Line.Tokens[0].Tok.is(tok::kw_case) || i == e - 1) {
-          Annotation.SpaceRequiredBefore = false;
-        } else {
-          Annotation.SpaceRequiredBefore = TokenAnnotation::TT_ConditionalExpr;
-        }
+        Annotation.SpaceRequiredBefore =
+            Line.Tokens[0].Tok.isNot(tok::kw_case) && i != e - 1;
       } else if (Annotations[i - 1].Type == TokenAnnotation::TT_UnaryOperator) {
         Annotation.SpaceRequiredBefore = false;
       } else if (Annotation.Type == TokenAnnotation::TT_UnaryOperator) {