[clang-tools-extra] r213149 - Avoid adding redundant parens.

[Alexander Kornienko]

Author: alexfh
Date: Wed Jul 16 08:38:48 2014
New Revision: 213149

URL: http://llvm.org/viewvc/llvm-project?rev=213149&view=rev
Log:
Avoid adding redundant parens.

Reviewers: bkramer

Reviewed By: bkramer

Subscribers: cfe-commits, sbenza

Differential Revision: http://reviews.llvm.org/D4534

Modified:
    clang-tools-extra/trunk/clang-tidy/google/AvoidCStyleCastsCheck.cpp
    clang-tools-extra/trunk/test/clang-tidy/avoid-c-style-casts.cpp

Modified: clang-tools-extra/trunk/clang-tidy/google/AvoidCStyleCastsCheck.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/AvoidCStyleCastsCheck.cpp?rev=213149&r1=213148&r2=213149&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/google/AvoidCStyleCastsCheck.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/google/AvoidCStyleCastsCheck.cpp Wed Jul 16 08:38:48 2014
@@ -56,6 +56,7 @@ bool pointedTypesAreEqual(QualType Sourc
   }
   return SourceType.getUnqualifiedType() == DestType.getUnqualifiedType();
 }
+
 void AvoidCStyleCastsCheck::check(const MatchFinder::MatchResult &Result) {
   const auto *CastExpr = Result.Nodes.getNodeAs<CStyleCastExpr>("cast");
 
@@ -85,15 +86,18 @@ void AvoidCStyleCastsCheck::check(const
     diag_builder << ("Use " + CastType + ".").str();
     if (ParenRange.getBegin().isMacroID() || ParenRange.getEnd().isMacroID())
       return;
-    diag_builder << FixItHint::CreateReplacement(
-                        ParenRange,
-                        (CastType + "<" + DestTypeString + ">(").str())
-                 << FixItHint::CreateInsertion(
-                        Lexer::getLocForEndOfToken(
-                            CastExpr->getSubExprAsWritten()->getLocEnd(), 0,
-                            *Result.SourceManager,
-                            Result.Context->getLangOpts()),
-                        ")");
+
+    const Expr *SubExpr = CastExpr->getSubExprAsWritten()->IgnoreImpCasts();
+    std::string CastText = (CastType + "<" + DestTypeString + ">").str();
+    if (!isa<ParenExpr>(SubExpr)) {
+      CastText.push_back('(');
+      diag_builder << FixItHint::CreateInsertion(
+          Lexer::getLocForEndOfToken(SubExpr->getLocEnd(), 0,
+                                     *Result.SourceManager,
+                                     Result.Context->getLangOpts()),
+          ")");
+    }
+    diag_builder << FixItHint::CreateReplacement(ParenRange, CastText);
   };
   // Suggest appropriate C++ cast. See [expr.cast] for cast notation semantics.
   switch (CastExpr->getCastKind()) {

Modified: clang-tools-extra/trunk/test/clang-tidy/avoid-c-style-casts.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/avoid-c-style-casts.cpp?rev=213149&r1=213148&r2=213149&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/clang-tidy/avoid-c-style-casts.cpp (original)
+++ clang-tools-extra/trunk/test/clang-tidy/avoid-c-style-casts.cpp Wed Jul 16 08:38:48 2014
@@ -17,7 +17,7 @@ void f(int a, double b, const char *cpc,
 
   char *pc2 = (char*)(cpc + 33);
   // CHECK-MESSAGES: :[[@LINE-1]]:15: warning: C-style casts are discouraged. Use const_cast. {{.*}}
-  // CHECK-FIXES: char *pc2 = const_cast<char *>((cpc + 33));
+  // CHECK-FIXES: char *pc2 = const_cast<char *>(cpc + 33);
 
   const char &crc = *cpc;
   char &rc = (char&)crc;
@@ -33,6 +33,20 @@ void f(int a, double b, const char *cpc,
   // CHECK-MESSAGES: :[[@LINE-1]]:20: warning: C-style casts are discouraged. Use const_cast. {{.*}}
   // CHECK-FIXES: char ****ppppc = const_cast<char ****>(ppcpcpc);
 
+  char ***pppc = (char***)*(ppcpcpc);
+  // CHECK-MESSAGES: :[[@LINE-1]]:18: warning: C-style casts are discouraged. Use const_cast. {{.*}}
+  // CHECK-FIXES: char ***pppc = const_cast<char ***>(*(ppcpcpc));
+
+  char ***pppc2 = (char***)(*ppcpcpc);
+  // CHECK-MESSAGES: :[[@LINE-1]]:19: warning: C-style casts are discouraged. Use const_cast. {{.*}}
+  // CHECK-FIXES: char ***pppc2 = const_cast<char ***>(*ppcpcpc);
+
+  char *pc5 = (char*)(const char*)(cpv);
+  // CHECK-MESSAGES: :[[@LINE-1]]:15: warning: C-style casts are discouraged. Use const_cast. {{.*}}
+  // CHECK-MESSAGES: :[[@LINE-2]]:22: warning: C-style casts are discouraged. Use reinterpret_cast. {{.*}}
+  // CHECK-FIXES: char *pc5 = const_cast<char *>(reinterpret_cast<const char *>(cpv));
+
+
   int b1 = (int)b;
   // CHECK-MESSAGES: :[[@LINE-1]]:12: warning: C-style casts are discouraged. Use static_cast. [google-readability-casting]
   // CHECK-FIXES: int b1 = static_cast<int>(b);