Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-21 10:42:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[clang-format] Don't remove parentheses in macro definitions (#81444)

Browse Source 
Closes #81399.

(cherry picked from commit 4af24d4ab76539706bfbceec4b3923426fb1b9e7)
This commit is contained in:
Owen Pan 2024-02-12 19:20:26 -08:00 committed by Tom Stellard
parent 872fe20ddd
commit ab57f6ced6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Format/UnwrappedLineParser.cpp
View File

@ -2515,7 +2515,7 @@ bool UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) {
parseChildBlock(); parseChildBlock();
break; break;
case tok::r_paren: case tok::r_paren:
if (!MightBeStmtExpr && if (!MightBeStmtExpr && !Line->InMacroBody &&
Style.RemoveParentheses > FormatStyle::RPS_Leave) { Style.RemoveParentheses > FormatStyle::RPS_Leave) {
const auto *Prev = LeftParen->Previous; const auto *Prev = LeftParen->Previous;
const auto *Next = Tokens->peekNextToken(); const auto *Next = Tokens->peekNextToken();

2
clang/unittests/Format/FormatTest.cpp
View File

@ -26856,6 +26856,7 @@ TEST_F(FormatTest, RemoveParentheses) {
EXPECT_EQ(Style.RemoveParentheses, FormatStyle::RPS_Leave); EXPECT_EQ(Style.RemoveParentheses, FormatStyle::RPS_Leave);
Style.RemoveParentheses = FormatStyle::RPS_MultipleParentheses; Style.RemoveParentheses = FormatStyle::RPS_MultipleParentheses;
verifyFormat("#define Foo(...) foo((__VA_ARGS__))", Style);
verifyFormat("int x __attribute__((aligned(16))) = 0;", Style); verifyFormat("int x __attribute__((aligned(16))) = 0;", Style);
verifyFormat("decltype((foo->bar)) baz;", Style); verifyFormat("decltype((foo->bar)) baz;", Style);
verifyFormat("class __declspec(dllimport) X {};", verifyFormat("class __declspec(dllimport) X {};",
@ -26890,6 +26891,7 @@ TEST_F(FormatTest, RemoveParentheses) {
verifyFormat("return (({ 0; }));", "return ((({ 0; })));", Style); verifyFormat("return (({ 0; }));", "return ((({ 0; })));", Style);
Style.RemoveParentheses = FormatStyle::RPS_ReturnStatement; Style.RemoveParentheses = FormatStyle::RPS_ReturnStatement;
verifyFormat("#define Return0 return (0);", Style);
verifyFormat("return 0;", "return (0);", Style); verifyFormat("return 0;", "return (0);", Style);
verifyFormat("co_return 0;", "co_return ((0));", Style); verifyFormat("co_return 0;", "co_return ((0));", Style);
verifyFormat("return 0;", "return (((0)));", Style); verifyFormat("return 0;", "return (((0)));", Style);