[clang-tidy] Fix false positives in the macro parentheses checker
Summary:
There were false positives in C++ code where macro argument was a type.
Reviewers: alexfh
Differential Revision: http://reviews.llvm.org/D10801
llvm-svn: 240938
diff --git a/clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp b/clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp
index 7d5aca4..68997ed 100644
--- a/clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp
@@ -59,8 +59,8 @@
/// Warning is written when one of these operators are not within parentheses.
bool isWarnOp(const Token &T) {
- /// \TODO This is an initial list of operators. It can be tweaked later to
- /// get more positives or perhaps avoid some false positive.
+ /// \TODO This is an initial list of operators. It can be tweaked later to
+ /// get more positives or perhaps avoid some false positive.
return T.isOneOf(tok::plus, tok::minus, tok::star, tok::slash, tok::percent,
tok::amp, tok::pipe, tok::caret);
}
@@ -151,6 +151,10 @@
if (Prev.isOneOf(tok::period, tok::arrow, tok::coloncolon))
continue;
+ // Argument is a namespace or class.
+ if (Next.is(tok::coloncolon))
+ continue;
+
// String concatenation.
if (isStringLiteral(Prev.getKind()) || isStringLiteral(Next.getKind()))
continue;
@@ -173,6 +177,11 @@
if (Prev.isOneOf(tok::equal, tok::kw_return) && Next.is(tok::semi))
continue;
+ // C++ template parameters.
+ if (PP->getLangOpts().CPlusPlus && Prev.isOneOf(tok::comma, tok::less) &&
+ Next.isOneOf(tok::comma, tok::greater))
+ continue;
+
Check->diag(Tok.getLocation(), "macro argument should be enclosed in "
"parentheses")
<< FixItHint::CreateInsertion(Tok.getLocation(), "(")