clang-format converts a keyword macro definition to a macro function

[owenpan]

Summary

See https://bugs.llvm.org/show_bug.cgi?id=39719 and discussion: https://reviews.llvm.org/D60362

Also fixes PR40288.

[MyDeveloperDay]

LGTM

clang/lib/Format/UnwrappedLineParser.cpp

808 ↗

(On Diff #195675)

Is this equivalent to saying something that means FormatTok->isKeyWord() ? for those case where the #define <keyword>

[owenpan]

clang/lib/Format/UnwrappedLineParser.cpp

808 ↗

(On Diff #195675)

The condition tests if FormatTok is neither a keyword (true, false, etc.) nor a non-keyword identifier.

cfe/trunk/lib/Format/UnwrappedLineParser.cpp

if (IncludeGuard == IG_Defined && PPBranchLevel == -1 &&
       PeekNext->is(tok::eof) &&
       Style.IndentPPDirectives != FormatStyle::PPDIS_None)
     IncludeGuard = IG_Found;
 }
 
 void UnwrappedLineParser::parsePPDefine() {
   nextToken();
 
-  if (FormatTok->Tok.getKind() != tok::identifier) {
+  if (!FormatTok->Tok.getIdentifierInfo()) {
     IncludeGuard = IG_Rejected;
     IncludeGuardToken = nullptr;
     parsePPUnknown();
     return;
   }
 
   if (IncludeGuard == IG_IfNdefed &&
       IncludeGuardToken->TokenText == FormatTok->TokenText) {

cfe/trunk/unittests/Format/FormatTest.cpp

verifyFormat("#define A(a, b, c)   \\\n"
                getLLVMStyleWithColumns(22));
 
   verifyFormat("#define A void # ## #", getLLVMStyleWithColumns(22));
 }
 
 TEST_F(FormatTest, RespectWhitespaceInMacroDefinitions) {
   EXPECT_EQ("#define A (x)", format("#define A (x)"));
   EXPECT_EQ("#define A(x)", format("#define A(x)"));
+
+  FormatStyle Style = getLLVMStyle();
+  Style.SpaceBeforeParens = FormatStyle::SBPO_Never;
+  verifyFormat("#define true ((foo)1)", Style);
+  Style.SpaceBeforeParens = FormatStyle::SBPO_Always;
+  verifyFormat("#define false((foo)0)", Style);
 }
 
 TEST_F(FormatTest, EmptyLinesInMacroDefinitions) {
   EXPECT_EQ("#define A b;", format("#define A \\\n"
                                    "          \\\n"
                                    "  b;",
                                    getLLVMStyleWithColumns(25)));
   EXPECT_EQ("#define A \\\n"