[Clang-Tidy] Quick fix for bug in bugprone-macro-parentheses 43804

[baloghadamsoftware]

Summary

Applying parentheses for statement leads to compilation error. Bug [[ 43804 | https://bugs.llvm.org/show_bug.cgi?id=43804 ]] is a compilation error suggested by a wrong fix of this checker. This patch is a quick fix for this issue.

[aaron.ballman]

LGTM, but we may have other things to test (or bugs to fix) here.

clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses.cpp

46

I'm surprised that do { /* whatever */ } while (0) is not tested as being good -- that's a very common idiom.

[baloghadamsoftware]

In D70850#1764469, @aaron.ballman wrote:

LGTM, but we may have other things to test (or bugs to fix) here.

Oh yes, this check seems a bit incomplete, more statements are missing, but this particular issue was a showstopper in our internal CI loop. (We had to disable this check because of this.)

clang-tools-extra/clang-tidy/bugprone/MacroParenthesesCheck.cpp

 static bool isSurroundedRight(const Token &T) {
   return T.isOneOf(tok::r_paren, tok::r_brace, tok::r_square, tok::comma,
                    tok::semi);
 }
 
 /// Is given TokenKind a keyword?
 static bool isKeyword(const Token &T) {
   // FIXME: better matching of keywords to avoid false positives.
-  return T.isOneOf(tok::kw_case, tok::kw_const, tok::kw_struct);
+  return T.isOneOf(tok::kw_if, tok::kw_case, tok::kw_const, tok::kw_struct);
 }
 
 /// Warning is written when one of these operators are not within parentheses.
 static bool isWarnOp(const Token &T) {
   // FIXME: 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);

clang-tools-extra/test/clang-tidy/checkers/bugprone-macro-parentheses.cpp

 #define GOOD25(t)         std::set<t,t,t> s
 #define GOOD26(x)         (a->*x)
 #define GOOD27(x)         (a.*x)
 #define GOOD28(x)         namespace x {int b;}
 #define GOOD29(...)       std::cout << __VA_ARGS__;
 #define GOOD30(args...)   std::cout << args;
 #define GOOD31(X)         A*X=2
 #define GOOD32(X)         std::vector<X>
+#define GOOD33(x)         if (!a__##x) a_##x = &f(#x)
 
 // These are allowed for now..
 #define MAYBE1            *12.34
 #define MAYBE2            <<3