diff options
| -rw-r--r-- | clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp | 13 | ||||
| -rw-r--r-- | clang-tools-extra/test/clang-tidy/misc-macro-parentheses.cpp | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp b/clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp index 7d5aca43f58..68997ede2db 100644 --- a/clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp +++ b/clang-tools-extra/clang-tidy/misc/MacroParenthesesCheck.cpp @@ -59,8 +59,8 @@ bool isKeyword(const Token &T) { /// 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 @@ void MacroParenthesesPPCallbacks::argument(const Token &MacroNameTok, 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 @@ void MacroParenthesesPPCallbacks::argument(const Token &MacroNameTok, 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(), "(") diff --git a/clang-tools-extra/test/clang-tidy/misc-macro-parentheses.cpp b/clang-tools-extra/test/clang-tidy/misc-macro-parentheses.cpp index 0c4338f7a55..d298343f990 100644 --- a/clang-tools-extra/test/clang-tidy/misc-macro-parentheses.cpp +++ b/clang-tools-extra/test/clang-tidy/misc-macro-parentheses.cpp @@ -32,6 +32,9 @@ #define GOOD20 void* #define GOOD21(a) case Fred::a: #define GOOD22(a) if (verbose) return a; +#define GOOD23(type) (type::Field) +#define GOOD24(t) std::set<t> s +#define GOOD25(t) std::set<t,t,t> s // These are allowed for now.. #define MAYBE1 *12.34 |
